diff --git a/client/src/components/ContactSelecetList.js b/client/src/components/ContactSelecetList.js
index baa4b2a20..ed10398c2 100644
--- a/client/src/components/ContactSelecetList.js
+++ b/client/src/components/ContactSelecetList.js
@@ -1,42 +1,47 @@
 import React, { useCallback, useState, useEffect, useMemo } from 'react';
 import { FormattedMessage as T } from 'react-intl';
-import { ListSelect } from 'components';
-import { MenuItem } from '@blueprintjs/core';
+import { MenuItem, Button } from '@blueprintjs/core';
+import { Select } from '@blueprintjs/select';
 import classNames from 'classnames';
 import { CLASSES } from 'common/classes';
 
 export default function ContactSelecetList({
   contactsList,
+  initialContactId,
   selectedContactId,
+  selectedContactType,
   defaultSelectText = <T id={'select_contact'} />,
   onContactSelected,
   popoverFill = false,
-  ...restProps
+  disabled = false,
 }) {
-  const [selecetedContact, setSelectedContact] = useState(null);
-
-  // Filter Contact List
-  const FilterContacts = (query, contact, index, exactMatch) => {
-    const normalizedTitle = contact.display_name.toLowerCase();
-    const normalizedQuery = query.toLowerCase();
-    if (exactMatch) {
-      return normalizedTitle === normalizedQuery;
-    } else {
-      return (
-        `${contact.display_name} ${normalizedTitle}`.indexOf(normalizedQuery) >=
-        0
-      );
-    }
-  };
- 
-  const onContactSelect = useCallback(
-    (contact) => {
-      setSelectedContact({ ...contact });
-      onContactSelected && onContactSelected(contact);
-    },
-    [setSelectedContact, onContactSelected],
+  const contacts = useMemo(
+    () =>
+      contactsList.map((contact) => ({
+        ...contact,
+        _id: `${contact.id}_${contact.contact_type}`,
+      })),
+    [contactsList],
   );
 
+  const initialContact = useMemo(
+    () => contacts.find((a) => a.id === initialContactId),
+    [initialContactId, contacts],
+  );
+
+  const [selecetedContact, setSelectedContact] = useState(
+    initialContact || null,
+  );
+
+  useEffect(() => {
+    if (typeof selectedContactId !== 'undefined') {
+      const account = selectedContactId
+        ? contacts.find((a) => a.id === selectedContactId)
+        : null;
+      setSelectedContact(account);
+    }
+  }, [selectedContactId, contacts, setSelectedContact]);
+
   const handleContactRenderer = useCallback(
     (contact, { handleClick }) => (
       <MenuItem
@@ -48,21 +53,48 @@ export default function ContactSelecetList({
     [],
   );
 
+  const onContactSelect = useCallback(
+    (contact) => {
+      setSelectedContact({ ...contact });
+      onContactSelected && onContactSelected(contact);
+    },
+    [setSelectedContact, onContactSelected],
+  );
+
+  // Filter Contact List
+  const filterContacts = (query, contact, index, exactMatch) => {
+    const normalizedTitle = contact.display_name.toLowerCase();
+    const normalizedQuery = query.toLowerCase();
+    if (exactMatch) {
+      return normalizedTitle === normalizedQuery;
+    } else {
+      return (
+        `${contact.display_name} ${normalizedTitle}`.indexOf(normalizedQuery) >=
+        0
+      );
+    }
+  };
+
   return (
-    <ListSelect
-      items={contactsList}
-      selectedItemProp={'id'}
-      selectedItem={selectedContactId}
-      labelProp={'display_name'}
-      defaultText={defaultSelectText}
-      onItemSelect={onContactSelect}
-      itemPredicate={FilterContacts}
+    <Select
+      items={contacts}
+      noResults={<MenuItem disabled={true} text="No results." />}
       itemRenderer={handleContactRenderer}
+      itemPredicate={filterContacts}
+      filterable={true}
+      disabled={disabled}
+      onItemSelect={onContactSelect}
       popoverProps={{ minimal: true, usePortal: !popoverFill }}
       className={classNames(CLASSES.FORM_GROUP_LIST_SELECT, {
         [CLASSES.SELECT_LIST_FILL_POPOVER]: popoverFill,
       })}
-      {...restProps}
-    />
+    >
+      <Button
+        disabled={disabled}
+        text={
+          selecetedContact ? selecetedContact.display_name : defaultSelectText
+        }
+      />
+    </Select>
   );
 }
diff --git a/client/src/components/ContactsListField.js b/client/src/components/ContactsListField.js
deleted file mode 100644
index 6668b9de5..000000000
--- a/client/src/components/ContactsListField.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import React, { useCallback, useMemo } from 'react';
-import { MenuItem } from '@blueprintjs/core';
-import classNames from 'classnames';
-import { CLASSES } from 'common/classes';
-import ListSelect from 'components/ListSelect';
-import { FormattedMessage as T } from 'react-intl';
-
-export default function ContactsListField({
-  contacts,
-  onContactSelected,
-  selectedContactId,
-  selectedContactType,
-  defautlSelectText = <T id={'select_contact'} />,
-  popoverFill = false,
-}) {
-  // Contact item of select accounts field.
-  const contactRenderer = useCallback(
-    (item, { handleClick, modifiers, query }) => (
-      <MenuItem text={item.display_name} key={item.id} onClick={handleClick} />
-    ),
-    [],
-  );
-
-  const onContactSelect = useCallback(
-    (contact) => {
-      onContactSelected && onContactSelected(contact);
-    },
-    [onContactSelected],
-  );
-
-  const items = useMemo(
-    () =>
-      contacts.map((contact) => ({
-        ...contact,
-        _id: `${contact.id}_${contact.contact_type}`,
-      })),
-    [contacts],
-  );
-
-  return (
-    <ListSelect
-      items={items}
-      noResults={<MenuItem disabled={true} text="No results." />}
-      itemRenderer={contactRenderer}
-      filterable={true}
-      onItemSelect={onContactSelect}
-      labelProp={'display_name'}
-      selectedItem={`${selectedContactId}_${selectedContactType}`}
-      selectedItemProp={'_id'}
-      defaultText={defautlSelectText}
-      popoverProps={{ minimal: true, usePortal: !popoverFill }}
-      className={classNames(CLASSES.FORM_GROUP_LIST_SELECT, {
-        [CLASSES.SELECT_LIST_FILL_POPOVER]: popoverFill,
-      })}
-    />
-  );
-}
diff --git a/client/src/components/CurrencySelectList.js b/client/src/components/CurrencySelectList.js
index 03cb8cce9..d45d3e08a 100644
--- a/client/src/components/CurrencySelectList.js
+++ b/client/src/components/CurrencySelectList.js
@@ -1,16 +1,17 @@
 import React, { useCallback, useState } from 'react';
 import { FormattedMessage as T } from 'react-intl';
+import { CLASSES } from 'common/classes';
 import classNames from 'classnames';
-import { ListSelect } from 'components';
-import { MenuItem } from '@blueprintjs/core';
+import { MenuItem, Button } from '@blueprintjs/core';
+import { Select } from '@blueprintjs/select';
 
 export default function CurrencySelectList({
   currenciesList,
   selectedCurrencyCode,
   defaultSelectText = <T id={'select_currency_code'} />,
   onCurrencySelected,
-  className,
-  ...restProps
+  popoverFill = false,
+  disabled = false,
 }) {
   const [selectedCurrency, setSelectedCurrency] = useState(null);
 
@@ -45,19 +46,37 @@ export default function CurrencySelectList({
     );
   }, []);
 
+  useEffect(() => {
+    if (typeof selectedCurrencyCode !== 'undefined') {
+      const currency = selectedCurrencyCode
+        ? currenciesList.find((a) => a.currency_code === selectedCurrencyCode)
+        : null;
+      setSelectedCurrency(currency);
+    }
+  }, [selectedCurrencyCode, currenciesList, setSelectedCurrency]);
+
   return (
-    <ListSelect
+    <Select
       items={currenciesList}
-      selectedItemProp={'currency_code'}
-      selectedItem={selectedCurrencyCode}
-      labelProp={'currency_code'}
-      defaultText={defaultSelectText}
-      onItemSelect={onCurrencySelect}
-      itemPredicate={filterCurrencies}
       itemRenderer={currencyCodeRenderer}
-      popoverProps={{ minimal: true }}
-      className={classNames('form-group--select-list', className)}
-      {...restProps}
-    />
+      itemPredicate={filterCurrencies}
+      onItemSelect={onCurrencySelect}
+      filterable={true}
+      popoverProps={{
+        minimal: true,
+        usePortal: !popoverFill,
+        inline: popoverFill,
+      }}
+      className={classNames('form-group--select-list', {
+        [CLASSES.SELECT_LIST_FILL_POPOVER]: popoverFill,
+      })}
+    >
+      <Button
+        disabled={disabled}
+        text={
+          selectedCurrency ? selectedCurrency.currency_code : defaultSelectText
+        }
+      />
+    </Select>
   );
 }
diff --git a/client/src/components/DataTableCells/ContactsListFieldCell.js b/client/src/components/DataTableCells/ContactsListFieldCell.js
index 0c3cd966f..16eb5286b 100644
--- a/client/src/components/DataTableCells/ContactsListFieldCell.js
+++ b/client/src/components/DataTableCells/ContactsListFieldCell.js
@@ -1,20 +1,23 @@
 import React, { useState, useCallback, useMemo } from 'react';
-import { FormGroup, Intent, Classes } from "@blueprintjs/core";
+import { FormGroup, Intent, Classes } from '@blueprintjs/core';
 import classNames from 'classnames';
-import ContactsListField from 'components/ContactsListField';
+import { ContactSelecetList } from 'components';
 
 export default function ContactsListCellRenderer({
   column: { id },
   row: { index, original },
   cell: { value },
-  payload: { contacts, updateData, errors }
+  payload: { contacts, updateData, errors },
 }) {
-  const handleContactSelected = useCallback((contact) => {
-    updateData(index, {
-      contact_id: contact.id,
-      contact_type: contact.contact_type,
-    });
-  }, [updateData, index, id]);
+  const handleContactSelected = useCallback(
+    (contact) => {
+      updateData(index, {
+        contact_id: contact.id,
+        contact_type: contact.contact_type,
+      });
+    },
+    [updateData, index, id],
+  );
 
   const error = errors?.[index]?.[id];
 
@@ -27,12 +30,12 @@ export default function ContactsListCellRenderer({
         Classes.FILL,
       )}
     >
-      <ContactsListField
-        contacts={contacts}
-        onContactSelected={handleContactSelected} 
+      <ContactSelecetList
+        contactsList={contacts}
+        onContactSelected={handleContactSelected}
         selectedContactId={original?.contact_id}
         selectedContactType={original?.contact_type}
       />
     </FormGroup>
   );
-}
\ No newline at end of file
+}
diff --git a/client/src/containers/Accounting/MakeJournalEntriesFooter.js b/client/src/containers/Accounting/MakeJournalEntriesFooter.js
new file mode 100644
index 000000000..be7e06005
--- /dev/null
+++ b/client/src/containers/Accounting/MakeJournalEntriesFooter.js
@@ -0,0 +1,199 @@
+import React from 'react';
+import {
+  Intent,
+  Button,
+  ButtonGroup,
+  Popover,
+  PopoverInteractionKind,
+  Position,
+  Menu,
+  MenuItem,
+} from '@blueprintjs/core';
+import { FormattedMessage as T } from 'react-intl';
+import { CLASSES } from 'common/classes';
+import classNames from 'classnames';
+import { saveInvoke } from 'utils';
+import { If, Icon } from 'components';
+
+/**
+ * Make Journal floating actions bar.
+ */
+export default function MakeJournalEntriesFooter({
+  isSubmitting,
+  onSubmitClick,
+  onCancelClick,
+  manualJournalId,
+  onSubmitForm,
+  onResetForm,
+  manualJournalPublished,
+}) {
+  const handleSubmitPublishBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: true,
+    });
+  };
+
+  const handleSubmitPublishAndNewBtnClick = (event) => {
+    onSubmitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+      resetForm: true,
+    });
+  };
+
+  const handleSubmitPublishContinueEditingBtnClick = (event) => {
+    onSubmitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+    });
+  };
+
+  const handleSubmitDraftBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: false,
+    });
+  };
+
+  const handleSubmitDraftAndNewBtnClick = (event) => {
+    onSubmitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: false,
+      resetForm: true,
+    });
+  };
+
+  const handleSubmitDraftContinueEditingBtnClick = (event) => {
+    onSubmitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: false,
+    });
+  };
+
+  const handleCancelBtnClick = (event) => {
+    saveInvoke(onCancelClick, event);
+  };
+
+  const handleClearBtnClick = (event) => {
+    // saveInvoke(onClearClick, event);
+    onResetForm();
+  };
+
+  return (
+    <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
+      {/* ----------- Save And Publish ----------- */}
+      <If condition={!manualJournalId || !manualJournalPublished}>
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            intent={Intent.PRIMARY}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save_publish'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'publish_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'publish_continue_editing'} />}
+                  onClick={handleSubmitPublishContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+        {/* ----------- Save As Draft ----------- */}
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            className={'ml1'}
+            type="submit"
+            onClick={handleSubmitDraftBtnClick}
+            text={<T id={'save_as_draft'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitDraftAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'save_continue_editing'} />}
+                  onClick={handleSubmitDraftContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+      {/* ----------- Save and New ----------- */}
+      <If condition={manualJournalId && manualJournalPublished}>
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            intent={Intent.PRIMARY}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+      {/* ----------- Clear & Reset----------- */}
+      <Button
+        className={'ml1'}
+        disabled={isSubmitting}
+        onClick={handleClearBtnClick}
+        text={manualJournalId ? <T id={'reset'} /> : <T id={'clear'} />}
+      />
+      {/* ----------- Cancel ----------- */}
+      <Button
+        className={'ml1'}
+        onClick={handleCancelBtnClick}
+        text={<T id={'cancel'} />}
+      />
+    </div>
+  );
+}
diff --git a/client/src/containers/Accounting/MakeJournalEntriesForm.js b/client/src/containers/Accounting/MakeJournalEntriesForm.js
index d05ad1a4c..3f49897fc 100644
--- a/client/src/containers/Accounting/MakeJournalEntriesForm.js
+++ b/client/src/containers/Accounting/MakeJournalEntriesForm.js
@@ -17,6 +17,11 @@ import MakeJournalEntriesField from './MakeJournalEntriesField';
 import MakeJournalNumberWatcher from './MakeJournalNumberWatcher';
 import MakeJournalFormFooter from './MakeJournalFormFooter';
 
+import {
+  CreateMakeJournalFormSchema,
+  EditMakeJournalFormSchema,
+} from './MakeJournalEntriesForm.schema';
+
 import withJournalsActions from 'containers/Accounting/withJournalsActions';
 import withManualJournalDetail from 'containers/Accounting/withManualJournalDetail';
 import withAccountsActions from 'containers/Accounts/withAccountsActions';
@@ -83,8 +88,8 @@ function MakeJournalEntriesForm({
   onFormSubmit,
   onCancelForm,
 }) {
+  const isNewMode = !manualJournalId;
   const { formatMessage } = useIntl();
-  const isNewMode = manualJournalId;
 
   const journalNumber = isNewMode
     ? `${journalNumberPrefix}-${journalNextNumber}`
diff --git a/client/src/containers/Accounting/MakeJournalEntriesForm.schema.js b/client/src/containers/Accounting/MakeJournalEntriesForm.schema.js
index fb1add89f..546c899b5 100644
--- a/client/src/containers/Accounting/MakeJournalEntriesForm.schema.js
+++ b/client/src/containers/Accounting/MakeJournalEntriesForm.schema.js
@@ -4,7 +4,7 @@ import { DATATYPES_LENGTH } from 'common/dataTypes';
 
 const Schema = Yup.object().shape({
   journal_number: Yup.string()
-    .required()
+    // .required()
     .min(1)
     .max(DATATYPES_LENGTH.STRING)
     .label(formatMessage({ id: 'journal_number_' })),
@@ -17,8 +17,9 @@ const Schema = Yup.object().shape({
     .required()
     .label(formatMessage({ id: 'date' })),
   currency_code: Yup.string().max(3),
-  reference: Yup.string().min(1).max(DATATYPES_LENGTH.STRING),
+  reference: Yup.string().nullable().min(1).max(DATATYPES_LENGTH.STRING),
   description: Yup.string().min(1).max(DATATYPES_LENGTH.STRING),
+  status: Yup.boolean(),
   entries: Yup.array().of(
     Yup.object().shape({
       credit: Yup.number().decimalScale(13).nullable(),
diff --git a/client/src/containers/Accounting/ManualJournalsEmptyStatus.js b/client/src/containers/Accounting/ManualJournalsEmptyStatus.js
index d77d998a7..d002cb3ab 100644
--- a/client/src/containers/Accounting/ManualJournalsEmptyStatus.js
+++ b/client/src/containers/Accounting/ManualJournalsEmptyStatus.js
@@ -21,7 +21,7 @@ export default function ManualJournalsEmptyStatus() {
             intent={Intent.PRIMARY}
             large={true}
             onClick={() => {
-              history.push('/invoices/new');
+              history.push('/make-journal-entry');
             }}
           >
             Make journal
diff --git a/client/src/containers/Customers/CustomerFinancialPanel.js b/client/src/containers/Customers/CustomerFinancialPanel.js
index 295479938..398afb136 100644
--- a/client/src/containers/Customers/CustomerFinancialPanel.js
+++ b/client/src/containers/Customers/CustomerFinancialPanel.js
@@ -3,6 +3,7 @@ import classNames from 'classnames';
 import { FormGroup, Position, Classes, ControlGroup } from '@blueprintjs/core';
 import { DateInput } from '@blueprintjs/datetime';
 import { FastField, ErrorMessage } from 'formik';
+import moment from 'moment';
 import {
   MoneyInputGroup,
   InputPrependText,
@@ -27,7 +28,6 @@ function CustomerFinancialPanel({
 
   customerId,
 }) {
-
   return (
     <div className={'tab-panel--financial'}>
       <Row>
@@ -44,6 +44,12 @@ function CustomerFinancialPanel({
               >
                 <DateInput
                   {...momentFormatter('YYYY/MM/DD')}
+                  onChange={(date) => {
+                    form.setFieldValue(
+                      'opening_balance_at',
+                      moment(date).format('YYYY-MM-DD'),
+                    );
+                  }}
                   value={tansformDateValue(value)}
                   popoverProps={{ position: Position.BOTTOM, minimal: true }}
                   disabled={customerId}
@@ -55,7 +61,7 @@ function CustomerFinancialPanel({
           {/*------------ Opening balance  -----------*/}
           <FastField name={'opening_balance'}>
             {({
-              form: { values },
+              form,
               field,
               field: { value },
               meta: { error, touched },
@@ -70,12 +76,14 @@ function CustomerFinancialPanel({
                 inline={true}
               >
                 <ControlGroup>
-                  <InputPrependText text={values.currency_code} />
+                  <InputPrependText text={form.values.currency_code} />
                   <MoneyInputGroup
                     value={value}
                     inputGroupProps={{ fill: true }}
                     disabled={customerId}
-                    {...field}
+                    onChange={(balance) => {
+                      form.setFieldValue('opening_balance', balance);
+                    }}
                   />
                 </ControlGroup>
               </FormGroup>
diff --git a/client/src/containers/Customers/CustomerFloatingActions.js b/client/src/containers/Customers/CustomerFloatingActions.js
index a22a9aefe..9110306b5 100644
--- a/client/src/containers/Customers/CustomerFloatingActions.js
+++ b/client/src/containers/Customers/CustomerFloatingActions.js
@@ -78,20 +78,20 @@ export default function CustomerFloatingActions({
             rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
           />
         </Popover>
-        {/* ----------- Clear & Reset----------- */}
-        <Button
-          className={'ml1'}
-          disabled={isSubmitting}
-          onClick={handleClearBtnClick}
-          text={customerId ? <T id={'reset'} /> : <T id={'clear'} />}
-        />
-        {/* ----------- Cancel  ----------- */}
-        <Button
-          className={'ml1'}
-          onClick={handleCancelBtnClick}
-          text={<T id={'cancel'} />}
-        />
       </ButtonGroup>
+      {/* ----------- Clear & Reset----------- */}
+      <Button
+        className={'ml1'}
+        disabled={isSubmitting}
+        onClick={handleClearBtnClick}
+        text={customerId ? <T id={'reset'} /> : <T id={'clear'} />}
+      />
+      {/* ----------- Cancel  ----------- */}
+      <Button
+        className={'ml1'}
+        onClick={handleCancelBtnClick}
+        text={<T id={'cancel'} />}
+      />
     </div>
   );
 }
diff --git a/client/src/containers/Customers/CustomerFormAfterPrimarySection.js b/client/src/containers/Customers/CustomerFormAfterPrimarySection.js
index b79012ac7..09b2ec694 100644
--- a/client/src/containers/Customers/CustomerFormAfterPrimarySection.js
+++ b/client/src/containers/Customers/CustomerFormAfterPrimarySection.js
@@ -61,7 +61,7 @@ export default function CustomerFormAfterPrimarySection({}) {
             label={<T id={'website'} />}
             inline={true}
           >
-            <InputGroup {...field} />
+            <InputGroup placeholder={'http://'} {...field} />
           </FormGroup>
         )}
       </FastField>
diff --git a/client/src/containers/Customers/CustomerTable.js b/client/src/containers/Customers/CustomerTable.js
index e8595d6a8..87158ad16 100644
--- a/client/src/containers/Customers/CustomerTable.js
+++ b/client/src/containers/Customers/CustomerTable.js
@@ -137,7 +137,9 @@ const CustomerTable = ({
       {
         id: 'receivable_balance',
         Header: formatMessage({ id: 'receivable_balance' }),
-        accessor: (r) => <Money amount={r.closing_balance} currency={'USD'} />,
+        accessor: (r) => (
+          <Money amount={r.closing_balance} currency={r.currency_code} />
+        ),
         className: 'receivable_balance',
         width: 100,
       },
@@ -189,7 +191,6 @@ const CustomerTable = ({
     customersCurrentViewId === -1,
     customers.length === 0,
   ].every((condition) => condition === true);
-
   return (
     <div className={classNames(CLASSES.DASHBOARD_DATATABLE)}>
       <LoadingIndicator loading={customersLoading && !isLoadedBefore}>
diff --git a/client/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryForm.js b/client/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryForm.js
index 9bc21b0a0..09dad964b 100644
--- a/client/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryForm.js
+++ b/client/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryForm.js
@@ -62,7 +62,7 @@ export default function ItemCategoryForm({
           {({ field, field: { value }, meta: { error, touched } }) => (
             <FormGroup
               label={<T id={'category_name'} />}
-              labelInfo={FieldRequiredHint}
+              labelInfo={<FieldRequiredHint />}
               className={'form-group--category-name'}
               intent={inputIntent({ error, touched })}
               helperText={<ErrorMessage name="name" />}
diff --git a/client/src/containers/Expenses/ExpenseDataTable.js b/client/src/containers/Expenses/ExpenseDataTable.js
index 6430ec87c..a8eea0755 100644
--- a/client/src/containers/Expenses/ExpenseDataTable.js
+++ b/client/src/containers/Expenses/ExpenseDataTable.js
@@ -124,7 +124,7 @@ function ExpensesDataTable({
           text={formatMessage({ id: 'view_details' })}
         />
         <MenuDivider />
-        <If condition={!expense.published}>
+        <If condition={!expense.is_published}>
           <MenuItem
             icon={<Icon icon={'arrow-to-top'} size={16} />}
             text={formatMessage({ id: 'publish_expense' })}
@@ -209,7 +209,7 @@ function ExpensesDataTable({
         id: 'publish',
         Header: formatMessage({ id: 'publish' }),
         accessor: (r) => {
-          return r.published ? (
+          return !!r.is_published ? (
             <Tag minimal={true}>
               <T id={'published'} />
             </Tag>
diff --git a/client/src/containers/Expenses/ExpenseFloatingActions.js b/client/src/containers/Expenses/ExpenseFloatingActions.js
index c9fdf5c11..e66af0918 100644
--- a/client/src/containers/Expenses/ExpenseFloatingActions.js
+++ b/client/src/containers/Expenses/ExpenseFloatingActions.js
@@ -14,7 +14,7 @@ import { FormattedMessage as T } from 'react-intl';
 import { CLASSES } from 'common/classes';
 import classNames from 'classnames';
 import { saveInvoke } from 'utils';
-import { Icon } from 'components';
+import { Icon, If } from 'components';
 
 /**
  * Expense form floating actions.
@@ -25,11 +25,18 @@ export default function ExpenseFloatingFooter({
   onCancelClick,
   onDraftClick,
   onClearClick,
-  onSubmitAndNewClick,
   onSubmitForm,
   onResetForm,
   expense,
+  expensePublished,
 }) {
+  const handleSubmitPublishBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: true,
+    });
+  };
+
   const handleSubmitPublishAndNewBtnClick = (event) => {
     onSubmitForm();
     saveInvoke(onSubmitClick, event, {
@@ -47,6 +54,13 @@ export default function ExpenseFloatingFooter({
     });
   };
 
+  const handleSubmitDraftBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: false,
+    });
+  };
+
   const handleSubmitDraftAndNewBtnClick = (event) => {
     onSubmitForm();
     saveInvoke(onSubmitClick, event, {
@@ -60,107 +74,129 @@ export default function ExpenseFloatingFooter({
     onSubmitForm();
     saveInvoke(onSubmitClick, event, {
       redirect: false,
-      publish: true,
+      publish: false,
     });
   };
 
+  const handleCancelBtnClick = (event) => {
+    saveInvoke(onCancelClick, event);
+  };
+
+  const handleClearBtnClick = (event) => {
+    // saveInvoke(onClearClick, event);
+    onResetForm();
+  };
+
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
-      <ButtonGroup>
-        {/* ----------- Save And Publish ----------- */}
-        <Button
-          disabled={isSubmitting}
-          intent={Intent.PRIMARY}
-          type="submit"
-          onClick={(event) => {
-            saveInvoke(onSubmitClick, event, {
-              redirect: true,
-              publish: true,
-            });
-          }}
-          text={
-            expense && expense.id ? (
-              <T id={'edit'} />
-            ) : (
-              <T id={'save_publish'} />
-            )
-          }
-        />
-        <Popover
-          content={
-            <Menu>
-              <MenuItem
-                text={<T id={'publish_and_new'} />}
-                onClick={handleSubmitPublishAndNewBtnClick}
-              />
-              <MenuItem
-                text={<T id={'publish_continue_editing'} />}
-                onClick={handleSubmitPublishContinueEditingBtnClick}
-              />
-            </Menu>
-          }
-          minimal={true}
-          interactionKind={PopoverInteractionKind.CLICK}
-          position={Position.BOTTOM_LEFT}
-        >
+      {/* ----------- Save And Publish ----------- */}
+      <If condition={!expense || !expensePublished}>
+        <ButtonGroup>
           <Button
+            disabled={isSubmitting}
             intent={Intent.PRIMARY}
-            rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save_publish'} />}
           />
-        </Popover>
-
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'publish_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'publish_continue_editing'} />}
+                  onClick={handleSubmitPublishContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
         {/* ----------- Save As Draft ----------- */}
-        <Button
-          disabled={isSubmitting}
-          className={'ml1'}
-          type="submit"
-          onClick={(event) => {
-            saveInvoke(onSubmitClick, event, {
-              redirect: true,
-              publish: false,
-            });
-          }}
-          text={<T id={'save_as_draft'} />}
-        />
-        <Popover
-          content={
-            <Menu>
-              <MenuItem
-                text={<T id={'save_and_new'} />}
-                onClick={handleSubmitDraftAndNewBtnClick}
-              />
-              <MenuItem
-                text={<T id={'save_continue_editing'} />}
-                onClick={handleSubmitDraftContinueEditingBtnClick}
-              />
-            </Menu>
-          }
-          minimal={true}
-          interactionKind={PopoverInteractionKind.CLICK}
-          position={Position.BOTTOM_LEFT}
-        >
-          <Button rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />} />
-        </Popover>
-
-        {/* ----------- Clear ----------- */}
-        <Button
-          className={'ml1'}
-          disabled={isSubmitting}
-          onClick={(event) => {
-            onResetForm();
-            saveInvoke(onClearClick, event);
-          }}
-          text={expense && expense.id ? <T id={'reset'} /> : <T id={'clear'} />}
-        />
-        {/* ----------- Cancel ----------- */}
-        <Button
-          className={'ml1'}
-          onClick={(event) => {
-            saveInvoke(onCancelClick, event);
-          }}
-          text={<T id={'cancel'} />}
-        />
-      </ButtonGroup>
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            className={'ml1'}
+            type="submit"
+            onClick={handleSubmitDraftBtnClick}
+            text={<T id={'save_as_draft'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitDraftAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'save_continue_editing'} />}
+                  onClick={handleSubmitDraftContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+      {/* ----------- Save and New ----------- */}
+      <If condition={expense && expensePublished}>
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            intent={Intent.PRIMARY}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+      {/* ----------- Clear & Reset----------- */}
+      <Button
+        className={'ml1'}
+        disabled={isSubmitting}
+        onClick={handleClearBtnClick}
+        text={expense ? <T id={'reset'} /> : <T id={'clear'} />}
+      />
+      {/* ----------- Cancel ----------- */}
+      <Button
+        className={'ml1'}
+        onClick={handleCancelBtnClick}
+        text={<T id={'cancel'} />}
+      />
     </div>
   );
 }
diff --git a/client/src/containers/Expenses/ExpenseForm.schema.js b/client/src/containers/Expenses/ExpenseForm.schema.js
index 6d78a8e45..8a5a6fd74 100644
--- a/client/src/containers/Expenses/ExpenseForm.schema.js
+++ b/client/src/containers/Expenses/ExpenseForm.schema.js
@@ -22,7 +22,7 @@ const Schema = Yup.object().shape({
     .max(DATATYPES_LENGTH.TEXT)
     .nullable()
     .label(formatMessage({ id: 'description' })),
-  publish: Yup.boolean().label(formatMessage({ id: 'publish' })),
+  is_published: Yup.boolean(),
   categories: Yup.array().of(
     Yup.object().shape({
       index: Yup.number().min(1).max(DATATYPES_LENGTH.INT_10).nullable(),
diff --git a/client/src/containers/Items/ItemForm.schema.js b/client/src/containers/Items/ItemForm.schema.js
index 3d7b7a6aa..0046d403f 100644
--- a/client/src/containers/Items/ItemForm.schema.js
+++ b/client/src/containers/Items/ItemForm.schema.js
@@ -17,14 +17,14 @@ const Schema = Yup.object().shape({
     .max(DATATYPES_LENGTH.STRING)
     .label(formatMessage({ id: 'item_type_' })),
   code: Yup.string().trim().min(0).max(DATATYPES_LENGTH.STRING),
-  cost_price: Yup.number().when(['purchasable'], {
+  cost_price: Yup.number().min(0).when(['purchasable'], {
     is: true,
     then: Yup.number()
       .required()
       .label(formatMessage({ id: 'cost_price_' })),
     otherwise: Yup.number().nullable(true),
   }),
-  sell_price: Yup.number().when(['sellable'], {
+  sell_price: Yup.number().min(0).when(['sellable'], {
     is: true,
     then: Yup.number()
       .required()
diff --git a/client/src/containers/Purchases/Bill/BillFloatingActions.js b/client/src/containers/Purchases/Bill/BillFloatingActions.js
index c71848ea5..dbbecbc2e 100644
--- a/client/src/containers/Purchases/Bill/BillFloatingActions.js
+++ b/client/src/containers/Purchases/Bill/BillFloatingActions.js
@@ -1,62 +1,201 @@
 import React from 'react';
-import { Intent, Button } from '@blueprintjs/core';
+import {
+  Intent,
+  Button,
+  ButtonGroup,
+  Popover,
+  PopoverInteractionKind,
+  Position,
+  Menu,
+  MenuItem,
+} from '@blueprintjs/core';
 import { FormattedMessage as T } from 'react-intl';
+import { CLASSES } from 'common/classes';
+import classNames from 'classnames';
+import { useFormikContext } from 'formik';
 import { saveInvoke } from 'utils';
+import { If, Icon } from 'components';
 
+/**
+ * Bill floating actions bar.
+ */
 export default function BillFloatingActions({
   isSubmitting,
   onSubmitClick,
-  onSubmitAndNewClick,
   onCancelClick,
   onClearClick,
   billId,
+  billPublished,
 }) {
+  const { resetForm, submitForm } = useFormikContext();
+  const handleSubmitPublishBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: true,
+    });
+  };
+
+  const handleSubmitPublishAndNewBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+      resetForm: true,
+    });
+  };
+
+  const handleSubmitPublishContinueEditingBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+    });
+  };
+
+  const handleSubmitDraftBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: false,
+    });
+  };
+
+  const handleSubmitDraftAndNewBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: false,
+      resetForm: true,
+    });
+  };
+
+  const handleSubmitDraftContinueEditingBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: false,
+    });
+  };
+
+  const handleCancelBtnClick = (event) => {
+    saveInvoke(onCancelClick, event);
+  };
+
+  const handleClearBtnClick = (event) => {
+    // saveInvoke(onClearClick, event);
+    resetForm();
+  };
+
   return (
-    <div className={'form__floating-footer'}>
-      <Button
-        disabled={isSubmitting}
-        loading={isSubmitting}
-        intent={Intent.PRIMARY}
-        type="submit"
-        onClick={(event) => {
-          saveInvoke(onSubmitClick, event);
-        }}
-      >
-        {billId ? <T id={'edit'} /> : <T id={'save'} />}
-      </Button>
-
-      <Button
-        disabled={isSubmitting}
-        loading={isSubmitting}
-        intent={Intent.PRIMARY}
-        className={'ml1'}
-        type="submit"
-        onClick={(event) => {
-          saveInvoke(onSubmitAndNewClick, event);
-        }}
-      >
-        <T id={'save_new'} />
-      </Button>
+    <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
+      {/* ----------- Save And Publish ----------- */}
+      <If condition={!billId || !billPublished}>
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            intent={Intent.PRIMARY}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save_publish'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'publish_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'publish_continue_editing'} />}
+                  onClick={handleSubmitPublishContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+        {/* ----------- Save As Draft ----------- */}
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            className={'ml1'}
+            type="submit"
+            onClick={handleSubmitDraftBtnClick}
+            text={<T id={'save_as_draft'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitDraftAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'save_continue_editing'} />}
+                  onClick={handleSubmitDraftContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+      {/* ----------- Save and New ----------- */}
+      <If condition={billId && billPublished}>
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            intent={Intent.PRIMARY}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
 
+      {/* ----------- Clear & Reset----------- */}
       <Button
         className={'ml1'}
         disabled={isSubmitting}
-        onClick={(event) => {
-          saveInvoke(onClearClick, event);
-        }}
-      >
-        <T id={'clear'} />
-      </Button>
-
+        onClick={handleClearBtnClick}
+        text={billId ? <T id={'reset'} /> : <T id={'clear'} />}
+      />
+      {/* ----------- Cancel ----------- */}
       <Button
         className={'ml1'}
-        type="submit"
-        onClick={(event) => {
-          saveInvoke(onCancelClick, event);
-        }}
-      >
-        <T id={'close'} />
-      </Button>
+        onClick={handleCancelBtnClick}
+        text={<T id={'cancel'} />}
+      />
     </div>
   );
 }
diff --git a/client/src/containers/Purchases/Bill/BillForm.js b/client/src/containers/Purchases/Bill/BillForm.js
index 6198f4eb8..1ea41fd59 100644
--- a/client/src/containers/Purchases/Bill/BillForm.js
+++ b/client/src/containers/Purchases/Bill/BillForm.js
@@ -46,6 +46,9 @@ const defaultInitialValues = {
   entries: [...repeatValue(defaultBill, MIN_LINES_NUMBER)],
 };
 
+/**
+ * Bill form.
+ */
 function BillForm({
   //#WithMedia
   requestSubmitMedia,
@@ -75,12 +78,12 @@ function BillForm({
   const isNewMode = !billId;
 
   useEffect(() => {
-    if (bill && bill.id) {
+    if (!isNewMode) {
       changePageTitle(formatMessage({ id: 'edit_bill' }));
     } else {
       changePageTitle(formatMessage({ id: 'new_bill' }));
     }
-  }, [changePageTitle, bill, formatMessage]);
+  }, [changePageTitle, isNewMode, formatMessage]);
 
   // Initial values in create and edit mode.
   const initialValues = useMemo(
@@ -146,8 +149,8 @@ function BillForm({
         message: formatMessage(
           {
             id: isNewMode
-              ? 'the_bill_has_been_successfully_created'
-              : 'the_bill_has_been_successfully_edited',
+              ? 'the_bill_has_been_successfully_created' :
+              'the_bill_has_been_successfully_edited',
           },
           { number: values.bill_number },
         ),
@@ -155,11 +158,13 @@ function BillForm({
       });
       setSubmitting(false);
 
-      resetForm();
       changePageSubtitle('');
 
       if (submitPayload.redirect) {
-        history.go('/bills');
+        history.push('/bills');
+      }
+      if (submitPayload.resetForm) {
+        resetForm();
       }
     };
     // Handle the request error.
@@ -167,7 +172,7 @@ function BillForm({
       handleErrors(errors, { setErrors });
       setSubmitting(false);
     };
-    if (isNewMode) {
+    if (bill && bill.id) {
       requestEditBill(bill.id, form).then(onSuccess).catch(onError);
     } else {
       requestSubmitBill(form).then(onSuccess).catch(onError);
@@ -190,9 +195,12 @@ function BillForm({
     [changePageSubtitle],
   );
 
-  const handleSubmitClick = useCallback(() => {
-    setSubmitPayload({ redirect: true });
-  }, [setSubmitPayload]);
+  const handleSubmitClick = useCallback(
+    (event, payload) => {
+      setSubmitPayload({ ...payload });
+    },
+    [setSubmitPayload],
+  );
 
   const handleCancelClick = useCallback(() => {
     history.goBack();
@@ -209,7 +217,7 @@ function BillForm({
         initialValues={initialValues}
         onSubmit={handleFormSubmit}
       >
-        {({ isSubmitting, values }) => (
+        {({ isSubmitting }) => (
           <Form>
             <BillFormHeader onBillNumberChanged={handleBillNumberChanged} />
             <BillFormBody defaultBill={defaultBill} />
@@ -220,8 +228,9 @@ function BillForm({
             <BillFloatingActions
               isSubmitting={isSubmitting}
               billId={billId}
+              billPublished={true}
               onSubmitClick={handleSubmitClick}
-              onCancelForm={handleCancelClick}
+              onCancelClick={handleCancelClick}
             />
           </Form>
         )}
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentMadeFloatingActions.js b/client/src/containers/Purchases/PaymentMades/PaymentMadeFloatingActions.js
index 8befdee8e..7b4363e14 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentMadeFloatingActions.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeFloatingActions.js
@@ -1,9 +1,19 @@
 import React from 'react';
-import { Intent, Button } from '@blueprintjs/core';
+import {
+  Intent,
+  Button,
+  ButtonGroup,
+  Popover,
+  PopoverInteractionKind,
+  Position,
+  Menu,
+  MenuItem,
+} from '@blueprintjs/core';
 import { FormattedMessage as T } from 'react-intl';
 import classNames from 'classnames';
-
 import { CLASSES } from 'common/classes';
+import { saveInvoke } from 'utils';
+import { Icon } from 'components';
 
 /**
  * Payment made floating actions bar.
@@ -13,56 +23,85 @@ export default function PaymentMadeFloatingActions({
   onSubmitClick,
   onCancelClick,
   onClearBtnClick,
+  onSubmitForm,
+  paymentMadeId,
 }) {
+  const handleSubmitBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+    });
+  };
+
   const handleClearBtnClick = (event) => {
     onClearBtnClick && onClearBtnClick(event);
   };
 
-  const handleSubmitClick = (event) => {
-    onSubmitClick && onSubmitClick(event, { redirect: true });
-  };
-
-  const handleCancelClick = (event) => {
+  const handleCancelBtnClick = (event) => {
     onCancelClick && onCancelClick(event);
+    saveInvoke(onCancelClick, event);
   };
 
+  const handleSubmitAndNewClick = (event) => {
+    onSubmitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+    });
+  };
+
+  const handleSubmitContinueEditingBtnClick = (event) => {
+    onSubmitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+    });
+  };
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
-      <Button
-        disabled={isSubmitting}
-        intent={Intent.PRIMARY}
-        type="submit"
-        onClick={handleSubmitClick}
-      >
-        <T id={'save_send'} />
-      </Button>
-
-      <Button
-        disabled={isSubmitting}
-        intent={Intent.PRIMARY}
-        className={'ml1'}
-        name={'save'}
-        type="submit"
-        onClick={handleSubmitClick}
-      >
-        <T id={'save'} />
-      </Button>
-
+      {/* ----------- Save and New ----------- */}
+      <ButtonGroup>
+        <Button
+          disabled={isSubmitting}
+          intent={Intent.PRIMARY}
+          type="submit"
+          onClick={handleSubmitBtnClick}
+          text={paymentMadeId ? <T id={'edit'} /> : <T id={'save'} />}
+        />
+        <Popover
+          content={
+            <Menu>
+              <MenuItem
+                text={<T id={'save_and_new'} />}
+                onClick={handleSubmitAndNewClick}
+              />
+              <MenuItem
+                text={<T id={'save_continue_editing'} />}
+                onClick={handleSubmitContinueEditingBtnClick}
+              />
+            </Menu>
+          }
+          minimal={true}
+          interactionKind={PopoverInteractionKind.CLICK}
+          position={Position.BOTTOM_LEFT}
+        >
+          <Button
+            intent={Intent.PRIMARY}
+            rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+          />
+        </Popover>
+      </ButtonGroup>
+      {/* ----------- Clear & Reset----------- */}
       <Button
         className={'ml1'}
         disabled={isSubmitting}
         onClick={handleClearBtnClick}
-      >
-        <T id={'clear'} />
-      </Button>
-
+        text={paymentMadeId ? <T id={'reset'} /> : <T id={'clear'} />}
+      />
+      {/* ----------- Cancel  ----------- */}
       <Button
         className={'ml1'}
-        type="submit"
-        onClick={handleCancelClick}
-      >
-        <T id={'close'} />
-      </Button>
+        onClick={handleCancelBtnClick}
+        text={<T id={'cancel'} />}
+      />
     </div>
   );
 }
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentMadeForm.js b/client/src/containers/Purchases/PaymentMades/PaymentMadeForm.js
index a2fcb6adb..a75a3a778 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentMadeForm.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeForm.js
@@ -81,6 +81,7 @@ function PaymentMadeForm({
   const [clearLinesAlert, setClearLinesAlert] = useState(false);
   const [clearFormAlert, setClearFormAlert] = useState(false);
   const [fullAmount, setFullAmount] = useState(null);
+  const [submitPayload, setSubmitPayload] = useState({});
 
   const [localPaymentEntries, setLocalPaymentEntries] = useState(
     paymentMadeEntries,
@@ -155,8 +156,13 @@ function PaymentMadeForm({
         intent: Intent.SUCCESS,
       });
       setSubmitting(false);
-      resetForm();
+      // resetForm();
       changePageSubtitle('');
+
+      if (submitPayload.redirect) {
+        history.push('/payment-mades');
+      }
+
     };
 
     const onError = (errors) => {
@@ -187,6 +193,7 @@ function PaymentMadeForm({
     values,
     handleSubmit,
     isSubmitting,
+    submitForm,
   } = useFormik({
     validationSchema,
     initialValues,
@@ -300,6 +307,14 @@ function PaymentMadeForm({
     [values.entries],
   );
 
+  const handleSubmitClick = useCallback(
+    (event, payload) => {
+      setSubmitPayload({ ...payload });
+    },
+    [setSubmitPayload],
+  );
+
+
   return (
     <div
       className={classNames(
@@ -379,8 +394,11 @@ function PaymentMadeForm({
 
         <PaymentMadeFloatingActions
           isSubmitting={isSubmitting}
+          paymentMadeId={paymentMadeId}
+          onSubmitClick={handleSubmitClick}
           onCancelClick={handleCancelClick}
           onClearBtnClick={handleClearBtnClick}
+          onSubmitForm={submitForm}
         />
 
         {/* <Dragzone
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentMadeList.js b/client/src/containers/Purchases/PaymentMades/PaymentMadeList.js
index a7986f4d8..ff4e9eb99 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentMadeList.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeList.js
@@ -87,7 +87,7 @@ function PaymentMadeList({
   }, [deletePaymentMade, requestDeletePaymentMade, formatMessage]);
 
   const handleEditPaymentMade = useCallback((payment) => {
-    history.push(`/payment-made/${payment.id}/edit`);
+    history.push(`/payment-mades/${payment.id}/edit`);
   });
 
   // Calculates the selected rows count.
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentMadesEmptyStatus.js b/client/src/containers/Purchases/PaymentMades/PaymentMadesEmptyStatus.js
index 781a804cd..8ed4582af 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentMadesEmptyStatus.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadesEmptyStatus.js
@@ -21,7 +21,7 @@ export default function PaymentMadesEmptyStatus() {
             intent={Intent.PRIMARY}
             large={true}
             onClick={() => {
-              history.push('/payment-made/new');
+              history.push('/payment-mades/new');
             }}
           >
             New bill payment
diff --git a/client/src/containers/Sales/Estimate/EstimateFloatingActions.js b/client/src/containers/Sales/Estimate/EstimateFloatingActions.js
index d56def74d..d6df854ff 100644
--- a/client/src/containers/Sales/Estimate/EstimateFloatingActions.js
+++ b/client/src/containers/Sales/Estimate/EstimateFloatingActions.js
@@ -14,7 +14,7 @@ import { CLASSES } from 'common/classes';
 import classNames from 'classnames';
 import { useFormikContext } from 'formik';
 import { saveInvoke } from 'utils';
-import { Icon } from 'components';
+import { If, Icon } from 'components';
 
 /**
  * Estimate floating actions bar.
@@ -25,12 +25,55 @@ export default function EstimateFloatingActions({
   onCancelClick,
   onClearClick,
   estimateId,
+  estimatePublished,
 }) {
   const { resetForm, submitForm } = useFormikContext();
 
-  const handleSubmitBtnClick = (event) => {
+  const handleSubmitPublishBtnClick = (event) => {
     saveInvoke(onSubmitClick, event, {
       redirect: true,
+      publish: true
+    });
+  };
+
+  const handleSubmitPublishAndNewBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+      resetForm: true,
+    });
+  };
+
+  const handleSubmitPublishContinueEditingBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+    });
+  };
+
+  const handleSubmitDraftBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: false,
+    });
+  };
+
+  const handleSubmitDraftAndNewBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: false,
+      resetForm: true,
+    });
+  };
+
+  const handleSubmitDraftContinueEditingBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: false,
     });
   };
 
@@ -43,56 +86,117 @@ export default function EstimateFloatingActions({
     resetForm();
   };
 
-  const handleSubmitAndNewClick = (event) => {
-    submitForm();
-    saveInvoke(onSubmitClick, event, {
-      redirect: false,
-    });
-  };
-
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
-      <ButtonGroup>
-        {/* ----------- Save and New ----------- */}
-        <Button
-          disabled={isSubmitting}
-          intent={Intent.PRIMARY}
-          type="submit"
-          onClick={handleSubmitBtnClick}
-          text={estimateId ? <T id={'edit'} /> : <T id={'save'} />}
-        />
-        <Popover
-          content={
-            <Menu>
-              <MenuItem
-                text={<T id={'save_and_new'} />}
-                onClick={handleSubmitAndNewClick}
-              />
-            </Menu>
-          }
-          minimal={true}
-          interactionKind={PopoverInteractionKind.CLICK}
-          position={Position.BOTTOM_LEFT}
-        >
+      {/* ----------- Save And Publish ----------- */}
+      <If condition={!estimateId || !estimatePublished}>
+        <ButtonGroup>
           <Button
+            disabled={isSubmitting}
             intent={Intent.PRIMARY}
-            rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save_publish'} />}
           />
-        </Popover>
-        {/* ----------- Clear & Reset----------- */}
-        <Button
-          className={'ml1'}
-          disabled={isSubmitting}
-          onClick={handleClearBtnClick}
-          text={estimateId ? <T id={'reset'} /> : <T id={'clear'} />}
-        />
-        {/* ----------- Cancel  ----------- */}
-        <Button
-          className={'ml1'}
-          onClick={handleCancelBtnClick}
-          text={<T id={'cancel'} />}
-        />
-      </ButtonGroup>
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'publish_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'publish_continue_editing'} />}
+                  onClick={handleSubmitPublishContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+        {/* ----------- Save As Draft ----------- */}
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            className={'ml1'}
+            type="submit"
+            onClick={handleSubmitDraftBtnClick}
+            text={<T id={'save_as_draft'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitDraftAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'save_continue_editing'} />}
+                  onClick={handleSubmitDraftContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+      {/* ----------- Save and New ----------- */}
+      <If condition={estimateId && estimatePublished}>
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            intent={Intent.PRIMARY}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+
+      {/* ----------- Clear & Reset----------- */}
+      <Button
+        className={'ml1'}
+        disabled={isSubmitting}
+        onClick={handleClearBtnClick}
+        text={estimateId ? <T id={'reset'} /> : <T id={'clear'} />}
+      />
+      {/* ----------- Cancel ----------- */}
+      <Button
+        className={'ml1'}
+        onClick={handleCancelBtnClick}
+        text={<T id={'cancel'} />}
+      />
     </div>
   );
 }
diff --git a/client/src/containers/Sales/Estimate/EstimateForm.js b/client/src/containers/Sales/Estimate/EstimateForm.js
index efdce14bf..73818f69a 100644
--- a/client/src/containers/Sales/Estimate/EstimateForm.js
+++ b/client/src/containers/Sales/Estimate/EstimateForm.js
@@ -103,9 +103,9 @@ const EstimateForm = ({
     : estimateNextNumber;
 
   useEffect(() => {
-    const transNumber = !isNewMode ? estimate.estimate_number  : estimateNumber;
+    const transNumber = !isNewMode ? estimate.estimate_number : estimateNumber;
 
-    if (isNewMode) {
+    if (!isNewMode) {
       changePageTitle(formatMessage({ id: 'edit_estimate' }));
     } else {
       changePageTitle(formatMessage({ id: 'new_estimate' }));
@@ -199,11 +199,13 @@ const EstimateForm = ({
         intent: Intent.SUCCESS,
       });
       setSubmitting(false);
-      resetForm();
 
       if (submitPayload.redirect) {
         history.push('/estimates');
       }
+      if (submitPayload.resetForm) {
+        resetForm();
+      }
     };
 
     const onError = (errors) => {
@@ -267,8 +269,8 @@ const EstimateForm = ({
               estimateId={estimateId}
               onSubmitClick={handleSubmitClick}
               onCancelClick={handleCancelClick}
+              estimatePublished={true}
             />
-      
           </Form>
         )}
       </Formik>
diff --git a/client/src/containers/Sales/Estimate/EstimateForm.schema.js b/client/src/containers/Sales/Estimate/EstimateForm.schema.js
index 4cecb3d3c..a7830d9cc 100644
--- a/client/src/containers/Sales/Estimate/EstimateForm.schema.js
+++ b/client/src/containers/Sales/Estimate/EstimateForm.schema.js
@@ -14,7 +14,6 @@ const Schema = Yup.object().shape({
     .required()
     .label(formatMessage({ id: 'expiration_date_' })),
   estimate_number: Yup.string()
-    .nullable()
     .max(DATATYPES_LENGTH.STRING)
     .label(formatMessage({ id: 'estimate_number_' })),
   reference: Yup.string().min(1).max(DATATYPES_LENGTH.STRING).nullable(),
diff --git a/client/src/containers/Sales/Invoice/InvoiceFloatingActions.js b/client/src/containers/Sales/Invoice/InvoiceFloatingActions.js
index 0004df237..7a50896e9 100644
--- a/client/src/containers/Sales/Invoice/InvoiceFloatingActions.js
+++ b/client/src/containers/Sales/Invoice/InvoiceFloatingActions.js
@@ -14,8 +14,7 @@ import { FormattedMessage as T } from 'react-intl';
 import { CLASSES } from 'common/classes';
 import classNames from 'classnames';
 import { saveInvoke } from 'utils';
-import { Icon } from 'components';
-
+import { If, Icon } from 'components';
 
 /**
  * Invoice floating actions bar.
@@ -26,151 +25,178 @@ export default function InvoiceFloatingActions({
   onCancelClick,
   onClearClick,
   invoice,
+  invoicePublished,
 }) {
   const { resetForm, submitForm } = useFormikContext();
 
-  const handleSubmitPublishAndNewBtnClick = useCallback(
-    (event) => {
-      submitForm();
-      saveInvoke(onSubmitClick, event, {
-        redirect: false,
-        publish: true,
-        resetForm: true,
-      });
-    },
-    [submitForm],
-  );
+  const handleSubmitPublishBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: true
+    });
+  };
 
-  const handleSubmitPublishContinueEditingBtnClick = useCallback(
-    (event) => {
-      submitForm();
-      saveInvoke(onSubmitClick, event, {
-        redirect: false,
-        publish: true,
-      });
-    },
-    [submitForm],
-  );
+  const handleSubmitPublishAndNewBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+      resetForm: true,
+    });
+  };
 
-  const handleSubmitDraftAndNewBtnClick = useCallback(
-    (event) => {
-      submitForm();
-      saveInvoke(onSubmitClick, event, {
-        redirect: false,
-        publish: false,
-        resetForm: true,
-      });
-    },
-    [submitForm],
-  );
+  const handleSubmitPublishContinueEditingBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+    });
+  };
 
-  const handleSubmitDraftContinueEditingBtnClick = useCallback(
-    (event) => {
-      submitForm();
-      saveInvoke(onSubmitClick, event, {
-        redirect: false,
-        publish: true,
-      });
-    },
-    [submitForm],
-  );
+  const handleSubmitDraftBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: false,
+    });
+  };
+
+  const handleSubmitDraftAndNewBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: false,
+      resetForm: true,
+    });
+  };
+
+  const handleSubmitDraftContinueEditingBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: false,
+    });
+  };
+
+  const handleCancelBtnClick = (event) => {
+    saveInvoke(onCancelClick, event);
+  };
+
+  const handleClearBtnClick = (event) => {
+    // saveInvoke(onClearClick, event);
+    resetForm();
+  };
 
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
-      <ButtonGroup>
-        {/* ----------- Save And Publish ----------- */}
-        <Button
-          disabled={isSubmitting}
-          intent={Intent.PRIMARY}
-          type="submit"
-          onClick={(event) => {
-            saveInvoke(onSubmitClick, event, {
-              redirect: true,
-              publish: true,
-            });
-          }}
-          text={
-            invoice && invoice.id ? (
-              <T id={'edit'} />
-            ) : (
-              <T id={'save_publish'} />
-            )
-          }
-        />
-        <Popover
-          content={
-            <Menu>
-              <MenuItem
-                text={<T id={'publish_and_new'} />}
-                onClick={handleSubmitPublishAndNewBtnClick}
-              />
-              <MenuItem
-                text={<T id={'publish_continue_editing'} />}
-                onClick={handleSubmitPublishContinueEditingBtnClick}
-              />
-            </Menu>
-          }
-          minimal={true}
-          interactionKind={PopoverInteractionKind.CLICK}
-          position={Position.BOTTOM_LEFT}
-        >
+      {/* ----------- Save And Publish ----------- */}
+      <If condition={!invoice || !invoicePublished}>
+        <ButtonGroup>
           <Button
+            disabled={isSubmitting}
             intent={Intent.PRIMARY}
-            rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save_publish'} />}
           />
-        </Popover>
-
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'publish_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'publish_continue_editing'} />}
+                  onClick={handleSubmitPublishContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
         {/* ----------- Save As Draft ----------- */}
-        <Button
-          disabled={isSubmitting}
-          className={'ml1'}
-          type="submit"
-          onClick={(event) => {
-            saveInvoke(onSubmitClick, event, {
-              redirect: true,
-              publish: false,
-            });
-          }}
-          text={<T id={'save_as_draft'} />}
-        />
-        <Popover
-          content={
-            <Menu>
-              <MenuItem
-                text={<T id={'save_and_new'} />}
-                onClick={handleSubmitDraftAndNewBtnClick}
-              />
-              <MenuItem
-                text={<T id={'save_continue_editing'} />}
-                onClick={handleSubmitDraftContinueEditingBtnClick}
-              />
-            </Menu>
-          }
-          minimal={true}
-          interactionKind={PopoverInteractionKind.CLICK}
-          position={Position.BOTTOM_LEFT}
-        >
-          <Button rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />} />
-        </Popover>
-        {/* ----------- Clear ----------- */}
-        <Button
-          className={'ml1'}
-          disabled={isSubmitting}
-          onClick={(event) => {
-            resetForm();
-            saveInvoke(onClearClick, event);
-          }}
-          text={invoice && invoice.id ? <T id={'reset'} /> : <T id={'clear'} />}
-        />
-        {/* ----------- Cancel ----------- */}
-        <Button
-          className={'ml1'}
-          onClick={(event) => {
-            saveInvoke(onCancelClick, event);
-          }}
-          text={<T id={'cancel'} />}
-        />
-      </ButtonGroup>
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            className={'ml1'}
+            type="submit"
+            onClick={handleSubmitDraftBtnClick}
+            text={<T id={'save_as_draft'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitDraftAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'save_continue_editing'} />}
+                  onClick={handleSubmitDraftContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+      {/* ----------- Save and New ----------- */}
+      <If condition={invoice && invoicePublished}>
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            intent={Intent.PRIMARY}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+
+      {/* ----------- Clear & Reset----------- */}
+      <Button
+        className={'ml1'}
+        disabled={isSubmitting}
+        onClick={handleClearBtnClick}
+        text={invoice ? <T id={'reset'} /> : <T id={'clear'} />}
+      />
+      {/* ----------- Cancel ----------- */}
+      <Button
+        className={'ml1'}
+        onClick={handleCancelBtnClick}
+        text={<T id={'cancel'} />}
+      />
     </div>
   );
 }
diff --git a/client/src/containers/Sales/Invoice/InvoiceForm.js b/client/src/containers/Sales/Invoice/InvoiceForm.js
index aa65e2cde..646f0f05f 100644
--- a/client/src/containers/Sales/Invoice/InvoiceForm.js
+++ b/client/src/containers/Sales/Invoice/InvoiceForm.js
@@ -186,7 +186,6 @@ function InvoiceForm({
         intent: Intent.SUCCESS,
       });
       setSubmitting(false);
-      resetForm();
 
       if (submitPayload.redirect) {
         history.push('/invoices');
@@ -230,7 +229,7 @@ function InvoiceForm({
     },
     [changePageSubtitle],
   );
-
+  
   return (
     <div className={classNames(
       CLASSES.PAGE_FORM,
@@ -260,9 +259,10 @@ function InvoiceForm({
             <InvoiceFormFooter />
             <InvoiceFloatingActions
               isSubmitting={isSubmitting}
-              invoice={invoice}
+              invoice={invoiceId}
               onCancelClick={handleCancelClick}
               onSubmitClick={handleSubmitClick}
+              invoicePublished={true}
             />
           </Form>
         )}
diff --git a/client/src/containers/Sales/PaymentReceive/PaymentReceiveFloatingActions.js b/client/src/containers/Sales/PaymentReceive/PaymentReceiveFloatingActions.js
index 2f02013c4..318ea4a9e 100644
--- a/client/src/containers/Sales/PaymentReceive/PaymentReceiveFloatingActions.js
+++ b/client/src/containers/Sales/PaymentReceive/PaymentReceiveFloatingActions.js
@@ -46,19 +46,28 @@ export default function PaymentReceiveFormFloatingActions({
     onSubmitForm();
     saveInvoke(onSubmitClick, event, {
       redirect: false,
+      resetForm: true,
+    });
+  };
+
+  const handleSubmitContinueEditingBtnClick = (event) => {
+    onSubmitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
     });
   };
 
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
+      {/* ----------- Save and New ----------- */}
       <ButtonGroup>
-        {/* ----------- Save and New ----------- */}
         <Button
           disabled={isSubmitting}
           intent={Intent.PRIMARY}
           type="submit"
           onClick={handleSubmitBtnClick}
-          text={paymentReceiveId ? <T id={'edit'} /> : <T id={'save_and_send'} />}
+          text={paymentReceiveId ? <T id={'edit'} /> : <T id={'save'} />}
         />
         <Popover
           content={
@@ -67,6 +76,10 @@ export default function PaymentReceiveFormFloatingActions({
                 text={<T id={'save_and_new'} />}
                 onClick={handleSubmitAndNewClick}
               />
+              <MenuItem
+                text={<T id={'save_continue_editing'} />}
+                onClick={handleSubmitContinueEditingBtnClick}
+              />
             </Menu>
           }
           minimal={true}
@@ -78,20 +91,20 @@ export default function PaymentReceiveFormFloatingActions({
             rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
           />
         </Popover>
-        {/* ----------- Clear & Reset----------- */}
-        <Button
-          className={'ml1'}
-          disabled={isSubmitting}
-          onClick={handleClearBtnClick}
-          text={paymentReceiveId ? <T id={'reset'} /> : <T id={'clear'} />}
-        />
-        {/* ----------- Cancel  ----------- */}
-        <Button
-          className={'ml1'}
-          onClick={handleCancelBtnClick}
-          text={<T id={'cancel'} />}
-        />
       </ButtonGroup>
+      {/* ----------- Clear & Reset----------- */}
+      <Button
+        className={'ml1'}
+        disabled={isSubmitting}
+        onClick={handleClearBtnClick}
+        text={paymentReceiveId ? <T id={'reset'} /> : <T id={'clear'} />}
+      />
+      {/* ----------- Cancel  ----------- */}
+      <Button
+        className={'ml1'}
+        onClick={handleCancelBtnClick}
+        text={<T id={'cancel'} />}
+      />
     </div>
   );
 }
diff --git a/client/src/containers/Sales/PaymentReceive/PaymentReceiveForm.js b/client/src/containers/Sales/PaymentReceive/PaymentReceiveForm.js
index 32d682cd1..859e079c0 100644
--- a/client/src/containers/Sales/PaymentReceive/PaymentReceiveForm.js
+++ b/client/src/containers/Sales/PaymentReceive/PaymentReceiveForm.js
@@ -190,11 +190,13 @@ function PaymentReceiveForm({
         intent: Intent.SUCCESS,
       });
       setSubmitting(false);
-      resetForm();
 
       if (submitPayload.redirect) {
         history.push('/payment-receives');
       }
+      if (submitPayload.resetForm) {
+        resetForm();
+      }
     };
     // Handle request response errors.
     const onError = (errors) => {
@@ -366,7 +368,7 @@ function PaymentReceiveForm({
   const handleCancelClick = useCallback(() => {
     history.goBack();
   }, [history]);
-
+  
   return (
     <div
       className={classNames(
diff --git a/client/src/containers/Sales/Receipt/ReceiptForm.js b/client/src/containers/Sales/Receipt/ReceiptForm.js
index f84f54d94..84e943ec7 100644
--- a/client/src/containers/Sales/Receipt/ReceiptForm.js
+++ b/client/src/containers/Sales/Receipt/ReceiptForm.js
@@ -201,11 +201,13 @@ function ReceiptForm({
         intent: Intent.SUCCESS,
       });
       setSubmitting(false);
-      resetForm();
 
       if (submitPayload.redirect) {
         history.push('/receipts');
       }
+      if (submitPayload.resetForm) {
+        resetForm();
+      }
     };
 
     // Handle the request error.
@@ -243,7 +245,7 @@ function ReceiptForm({
     },
     [history],
   );
-
+  
   return (
     <div className={classNames(
       CLASSES.PAGE_FORM,
@@ -268,6 +270,7 @@ function ReceiptForm({
             <ReceiptFormFloatingActions
               isSubmitting={isSubmitting}
               receiptId={receiptId}
+              receiptPublished={true}
               onSubmitClick={handleSubmitClick}
               onCancelClick={handleCancelClick}
             />
diff --git a/client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js b/client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js
index c81044338..5333bec16 100644
--- a/client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js
+++ b/client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js
@@ -14,7 +14,7 @@ import { useFormikContext } from 'formik';
 import classNames from 'classnames';
 import { CLASSES } from 'common/classes';
 import { saveInvoke } from 'utils';
-import { Icon } from 'components';
+import { If, Icon } from 'components';
 
 /**
  * Receipt floating actions bar.
@@ -22,21 +22,60 @@ import { Icon } from 'components';
 export default function ReceiptFormFloatingActions({
   isSubmitting,
   receiptId,
+  receiptPublished,
   onSubmitClick,
   onCancelClick,
   onClearClick,
 }) {
   const { resetForm, submitForm } = useFormikContext();
 
-  const handleSubmitAndNewClick = useCallback(
-    (event) => {
-      submitForm();
-      saveInvoke(onSubmitClick, event, {
-        redirect: false,
-      });
-    },
-    [submitForm],
-  );
+  const handleSubmitPublishBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: true,
+    });
+  };
+
+  const handleSubmitPublishAndNewBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+      resetForm: true,
+    });
+  };
+
+  const handleSubmitPublishContinueEditingBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+    });
+  };
+
+  const handleSubmitDraftBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: false,
+    });
+  };
+
+  const handleSubmitDraftAndNewBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: false,
+      resetForm: true,
+    });
+  };
+
+  const handleSubmitDraftContinueEditingBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: false,
+    });
+  };
 
   const handleCancelBtnClick = (event) => {
     saveInvoke(onCancelClick, event);
@@ -49,51 +88,114 @@ export default function ReceiptFormFloatingActions({
 
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
-      <ButtonGroup>
-        {/* ----------- Save and New ----------- */}
-        <Button
-          disabled={isSubmitting}
-          intent={Intent.PRIMARY}
-          type="submit"
-          onClick={(event) => {
-            saveInvoke(onSubmitClick, event, {
-              redirect: true,
-            });
-          }}
-          text={receiptId ? <T id={'edit'} /> : <T id={'save'} />}
-        />
-        <Popover
-          content={
-            <Menu>
-              <MenuItem
-                text={<T id={'save_and_new'} />}
-                onClick={handleSubmitAndNewClick}
-              />
-            </Menu>
-          }
-          minimal={true}
-          interactionKind={PopoverInteractionKind.CLICK}
-          position={Position.BOTTOM_LEFT}
-        >
+      {/* ----------- Save And Publish ----------- */}
+      <If condition={!receiptId || !receiptPublished}>
+        <ButtonGroup>
           <Button
+            disabled={isSubmitting}
             intent={Intent.PRIMARY}
-            rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save_publish'} />}
           />
-        </Popover>
-        {/* ----------- Clear & Reset----------- */}
-        <Button
-          className={'ml1'}
-          disabled={isSubmitting}
-          onClick={handleClearBtnClick}
-          text={receiptId ? <T id={'reset'} /> : <T id={'clear'} />}
-        />
-        {/* ----------- Cancel  ----------- */}
-        <Button
-          className={'ml1'}
-          onClick={handleCancelBtnClick}
-          text={<T id={'cancel'} />}
-        />
-      </ButtonGroup>
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'publish_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'publish_continue_editing'} />}
+                  onClick={handleSubmitPublishContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+        {/* ----------- Save As Draft ----------- */}
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            className={'ml1'}
+            type="submit"
+            onClick={handleSubmitDraftBtnClick}
+            text={<T id={'save_as_draft'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitDraftAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'save_continue_editing'} />}
+                  onClick={handleSubmitDraftContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+      {/* ----------- Save and New ----------- */}
+      <If condition={receiptId && receiptPublished}>
+        <ButtonGroup>
+          <Button
+            disabled={isSubmitting}
+            intent={Intent.PRIMARY}
+            type="submit"
+            onClick={handleSubmitPublishBtnClick}
+            text={<T id={'save'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
+          >
+            <Button
+              intent={Intent.PRIMARY}
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+      {/* ----------- Clear & Reset----------- */}
+      <Button
+        className={'ml1'}
+        disabled={isSubmitting}
+        onClick={handleClearBtnClick}
+        text={receiptId ? <T id={'reset'} /> : <T id={'clear'} />}
+      />
+      {/* ----------- Cancel ----------- */}
+      <Button
+        className={'ml1'}
+        onClick={handleCancelBtnClick}
+        text={<T id={'cancel'} />}
+      />
     </div>
   );
 }
diff --git a/client/src/containers/Vendors/VendorFinanicalPanelTab.js b/client/src/containers/Vendors/VendorFinanicalPanelTab.js
index 86929939e..5397f5b91 100644
--- a/client/src/containers/Vendors/VendorFinanicalPanelTab.js
+++ b/client/src/containers/Vendors/VendorFinanicalPanelTab.js
@@ -3,6 +3,7 @@ import classNames from 'classnames';
 import { FormGroup, ControlGroup, Position, Classes } from '@blueprintjs/core';
 import { DateInput } from '@blueprintjs/datetime';
 import { FastField, ErrorMessage } from 'formik';
+import moment from 'moment';
 import {
   MoneyInputGroup,
   InputPrependText,
@@ -47,6 +48,12 @@ function VendorFinanicalPanelTab({
               >
                 <DateInput
                   {...momentFormatter('YYYY/MM/DD')}
+                  onChange={(date) => {
+                    form.setFieldValue(
+                      'opening_balance_at',
+                      moment(date).format('YYYY-MM-DD'),
+                    );
+                  }}
                   value={tansformDateValue(value)}
                   popoverProps={{ position: Position.BOTTOM, minimal: true }}
                   disabled={vendorId}
@@ -56,12 +63,7 @@ function VendorFinanicalPanelTab({
           </FastField>
           {/*------------ Opening balance  -----------*/}
           <FastField name={'opening_balance'}>
-            {({
-              form: { values },
-              field,
-              field: { value },
-              meta: { error, touched },
-            }) => (
+            {({ form, field, field: { value }, meta: { error, touched } }) => (
               <FormGroup
                 label={<T id={'opening_balance'} />}
                 className={classNames(
@@ -72,14 +74,15 @@ function VendorFinanicalPanelTab({
                 inline={true}
               >
                 <ControlGroup>
-                  <InputPrependText text={values.currency_code } />
+                  <InputPrependText text={form.values.currency_code} />
                   <MoneyInputGroup
                     value={value}
-                    onChange={field.onChange}
-                    prefix={'$'}
                     inputGroupProps={{
                       fill: true,
-                      ...field,
+                      // ...field,
+                    }}
+                    onChange={(balance) => {
+                      form.setFieldValue('opening_balance', balance);
                     }}
                     disabled={vendorId}
                   />
diff --git a/client/src/containers/Vendors/VendorFloatingActions.js b/client/src/containers/Vendors/VendorFloatingActions.js
index 7e3216da7..3ad4ec27c 100644
--- a/client/src/containers/Vendors/VendorFloatingActions.js
+++ b/client/src/containers/Vendors/VendorFloatingActions.js
@@ -79,20 +79,20 @@ export default function VendorFloatingActions({
             rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
           />
         </Popover>
-        {/* ----------- Clear & Reset----------- */}
-        <Button
-          className={'ml1'}
-          disabled={isSubmitting}
-          onClick={handleClearBtnClick}
-          text={vendor ? <T id={'reset'} /> : <T id={'clear'} />}
-        />
-        {/* ----------- Cancel  ----------- */}
-        <Button
-          className={'ml1'}
-          onClick={handleCancelBtnClick}
-          text={<T id={'cancel'} />}
-        />
       </ButtonGroup>
+      {/* ----------- Clear & Reset----------- */}
+      <Button
+        className={'ml1'}
+        disabled={isSubmitting}
+        onClick={handleClearBtnClick}
+        text={vendor ? <T id={'reset'} /> : <T id={'clear'} />}
+      />
+      {/* ----------- Cancel  ----------- */}
+      <Button
+        className={'ml1'}
+        onClick={handleCancelBtnClick}
+        text={<T id={'cancel'} />}
+      />
     </div>
   );
 }
diff --git a/client/src/containers/Vendors/VendorFormAfterPrimarySection.js b/client/src/containers/Vendors/VendorFormAfterPrimarySection.js
index 9ef0bcb0b..aa4a0763f 100644
--- a/client/src/containers/Vendors/VendorFormAfterPrimarySection.js
+++ b/client/src/containers/Vendors/VendorFormAfterPrimarySection.js
@@ -6,7 +6,6 @@ import classNames from 'classnames';
 import { CLASSES } from 'common/classes';
 import { inputIntent } from 'utils';
 
-
 /**
  * Vendor form  after primary section.
  */
@@ -66,7 +65,7 @@ function VendorFormAfterPrimarySection() {
             label={<T id={'website'} />}
             inline={true}
           >
-            <InputGroup {...field} />
+            <InputGroup placeholder={'http://'} {...field} />
           </FormGroup>
         )}
       </FastField>
diff --git a/client/src/containers/Vendors/VendorsTable.js b/client/src/containers/Vendors/VendorsTable.js
index 8f9936df1..9720faee9 100644
--- a/client/src/containers/Vendors/VendorsTable.js
+++ b/client/src/containers/Vendors/VendorsTable.js
@@ -32,6 +32,7 @@ function VendorsTable({
   vendorsPageination,
   vendorTableQuery,
   vendorItems,
+  vendorsCurrentViewId,
 
   // #withVendorsActions
   addVendorsTableQueries,
@@ -135,7 +136,9 @@ function VendorsTable({
       {
         id: 'receivable_balance',
         Header: formatMessage({ id: 'receivable_balance' }),
-        accessor: (r) => <Money amount={r.closing_balance} currency={'USD'} />,
+        accessor: (r) => (
+          <Money amount={r.closing_balance} currency={r.currency_code} />
+        ),
         className: 'receivable_balance',
         width: 100,
       },
@@ -182,6 +185,10 @@ function VendorsTable({
       onEditVendor,
       onDeleteVendor,
     });
+  const showEmptyStatus = [
+    vendorsCurrentViewId === -1,
+    vendorItems.length === 0,
+  ].every((condition) => condition === true);
 
   return (
     <div className={classNames(CLASSES.DASHBOARD_DATATABLE)}>
@@ -190,7 +197,7 @@ function VendorsTable({
         mount={false}
       >
         <Choose>
-          <Choose.When condition={true}>
+          <Choose.When condition={showEmptyStatus}>
             <VendorsEmptyStatus />
           </Choose.When>
 
@@ -228,11 +235,13 @@ export default compose(
       vendorsLoading,
       vendorTableQuery,
       vendorsPageination,
+      vendorsCurrentViewId,
     }) => ({
       vendorItems,
       vendorsLoading,
       vendorsPageination,
       vendorTableQuery,
+      vendorsCurrentViewId,
     }),
   ),
   withVendorsActions,
diff --git a/client/src/containers/Vendors/withVendors.js b/client/src/containers/Vendors/withVendors.js
index e9846f243..8a4c36ee6 100644
--- a/client/src/containers/Vendors/withVendors.js
+++ b/client/src/containers/Vendors/withVendors.js
@@ -5,11 +5,13 @@ import {
   getVendorCurrentPageFactory,
   getVendorsTableQuery,
   getVendorsPaginationMetaFactory,
+  getVendorsCurrentViewIdFactory,
 } from 'store/vendors/vendors.selectors';
 
 export default (mapState) => {
   const getVendorsItems = getVendorCurrentPageFactory();
   const getVendorsPaginationMeta = getVendorsPaginationMetaFactory();
+  const getVendorsCurrentViewId = getVendorsCurrentViewIdFactory();
   const mapStateToProps = (state, props) => {
     const query = getVendorsTableQuery(state, props);
 
@@ -20,6 +22,7 @@ export default (mapState) => {
       vendorTableQuery: query,
       vendorsPageination: getVendorsPaginationMeta(state, props, query),
       vendorsLoading: state.vendors.loading,
+      vendorsCurrentViewId: getVendorsCurrentViewId(state, props),
     };
     return mapState ? mapState(mapped, state, props) : mapped;
   };
diff --git a/client/src/store/vendors/vendors.selectors.js b/client/src/store/vendors/vendors.selectors.js
index 0bc45539b..c00a952a9 100644
--- a/client/src/store/vendors/vendors.selectors.js
+++ b/client/src/store/vendors/vendors.selectors.js
@@ -10,6 +10,8 @@ const vendorByIdSelector = (state, props) =>
   state.vendors.items[props.vendorId];
 const vendorsItemsSelector = (state) => state.vendors.items;
 
+const vendorsCurrentViewIdSelector = (state) => state.vendors.currentViewId;
+
 const vendorsPaginationSelector = (state, props) => {
   const viewId = state.vendors.currentViewId;
   return state.vendors.views?.[viewId];
@@ -57,3 +59,8 @@ export const getVendorByIdFactory = () =>
   createSelector(vendorByIdSelector, (vendor) => {
     return vendor;
   });
+
+  export const getVendorsCurrentViewIdFactory = () =>
+  createSelector(vendorsCurrentViewIdSelector, (currentViewId) => {
+    return currentViewId;
+  });
diff --git a/server/src/models/Expense.js b/server/src/models/Expense.js
index a36b989e9..3369cd80e 100644
--- a/server/src/models/Expense.js
+++ b/server/src/models/Expense.js
@@ -1,28 +1,28 @@
-import { Model } from 'objection';
-import TenantModel from 'models/TenantModel';
-import { viewRolesBuilder } from 'lib/ViewRolesBuilder';
-import Media from './Media';
+import { Model } from "objection";
+import TenantModel from "models/TenantModel";
+import { viewRolesBuilder } from "lib/ViewRolesBuilder";
+import Media from "./Media";
 
 export default class Expense extends TenantModel {
   /**
    * Table name
    */
   static get tableName() {
-    return 'expenses_transactions';
+    return "expenses_transactions";
   }
 
   /**
    * Account transaction reference type.
    */
   static get referenceType() {
-    return 'Expense';
+    return "Expense";
   }
 
   /**
    * Model timestamps.
    */
   get timestamps() {
-    return ['createdAt', 'updatedAt'];
+    return ["createdAt", "updatedAt"];
   }
 
   /**
@@ -33,11 +33,18 @@ export default class Expense extends TenantModel {
   }
 
   /**
-   * 
+   *
    */
-  static get media () {
+  static get media() {
     return true;
   }
+  
+  static get virtualAttributes() {
+    return ["isPublished"];
+  }
+  isPublished() {
+    return Boolean(this.publishedAt);
+  }
 
   /**
    * Model modifiers.
@@ -46,28 +53,28 @@ export default class Expense extends TenantModel {
     return {
       filterByDateRange(query, startDate, endDate) {
         if (startDate) {
-          query.where('date', '>=', startDate);
+          query.where("date", ">=", startDate);
         }
         if (endDate) {
-          query.where('date', '<=', endDate);
+          query.where("date", "<=", endDate);
         }
       },
       filterByAmountRange(query, from, to) {
         if (from) {
-          query.where('amount', '>=', from);
+          query.where("amount", ">=", from);
         }
         if (to) {
-          query.where('amount', '<=', to);
+          query.where("amount", "<=", to);
         }
       },
       filterByExpenseAccount(query, accountId) {
         if (accountId) {
-          query.where('expense_account_id', accountId);
+          query.where("expense_account_id", accountId);
         }
       },
       filterByPaymentAccount(query, accountId) {
         if (accountId) {
-          query.where('payment_account_id', accountId);
+          query.where("payment_account_id", accountId);
         }
       },
       viewRolesBuilder(query, conditionals, expression) {
@@ -80,41 +87,41 @@ export default class Expense extends TenantModel {
    * Relationship mapping.
    */
   static get relationMappings() {
-    const Account = require('models/Account');
-    const ExpenseCategory = require('models/ExpenseCategory');
-    const Media = require('models/Media');
+    const Account = require("models/Account");
+    const ExpenseCategory = require("models/ExpenseCategory");
+    const Media = require("models/Media");
 
     return {
       paymentAccount: {
         relation: Model.BelongsToOneRelation,
         modelClass: Account.default,
         join: {
-          from: 'expenses_transactions.paymentAccountId',
-          to: 'accounts.id',
+          from: "expenses_transactions.paymentAccountId",
+          to: "accounts.id",
         },
       },
       categories: {
         relation: Model.HasManyRelation,
         modelClass: ExpenseCategory.default,
         join: {
-          from: 'expenses_transactions.id',
-          to: 'expense_transaction_categories.expenseId',
+          from: "expenses_transactions.id",
+          to: "expense_transaction_categories.expenseId",
         },
       },
       media: {
         relation: Model.ManyToManyRelation,
         modelClass: Media.default,
         join: {
-          from: 'expenses_transactions.id',
+          from: "expenses_transactions.id",
           through: {
-            from: 'media_links.model_id',
-            to: 'media_links.media_id',
+            from: "media_links.model_id",
+            to: "media_links.media_id",
           },
-          to: 'media.id',
+          to: "media.id",
         },
         filter(query) {
-          query.where('model_name', 'Expense');
-        }
+          query.where("model_name", "Expense");
+        },
       },
     };
   }
@@ -125,51 +132,50 @@ export default class Expense extends TenantModel {
   static get fields() {
     return {
       payment_date: {
-        label: 'Payment date',
-        column: 'payment_date',
-        columnType: 'date',
+        label: "Payment date",
+        column: "payment_date",
+        columnType: "date",
       },
       payment_account: {
-        label: 'Payment account',
-        column: 'payment_account_id',
-        relation: 'accounts.id',
-        optionsResource: 'account',
+        label: "Payment account",
+        column: "payment_account_id",
+        relation: "accounts.id",
+        optionsResource: "account",
       },
       amount: {
-        label: 'Amount',
-        column: 'total_amount',
-        columnType: 'number'
+        label: "Amount",
+        column: "total_amount",
+        columnType: "number",
       },
       currency_code: {
-        label: 'Currency',
-        column: 'currency_code',
-        optionsResource: 'currency',
+        label: "Currency",
+        column: "currency_code",
+        optionsResource: "currency",
       },
       reference_no: {
-        label: 'Reference No.',
-        column: 'reference_no',
-        columnType: 'string',
+        label: "Reference No.",
+        column: "reference_no",
+        columnType: "string",
       },
       description: {
-        label: 'Description',
-        column: 'description',
-        columnType: 'string',
+        label: "Description",
+        column: "description",
+        columnType: "string",
       },
       published: {
-        label: 'Published',
-        column: 'published',
-
+        label: "Published",
+        column: "published",
       },
       user: {
-        label: 'User',
-        column: 'user_id',
-        relation: 'users.id',
-        relationColumn: 'users.id',
+        label: "User",
+        column: "user_id",
+        relation: "users.id",
+        relationColumn: "users.id",
       },
       created_at: {
-        label: 'Created at',
-        column: 'created_at',
-        columnType: 'date',
+        label: "Created at",
+        column: "created_at",
+        columnType: "date",
       },
     };
   }