Merge branch 'master' of https://github.com/abouolia/Bigcapital

client/src/containers/Preferences/Accountant/AccountantForm.js

@@ -31,7 +31,7 @@ export default function AccountantForm() {
 
   return (
     <Form>
-      {/* ----------- accounts  ----------- */}
+      {/* ----------- Accounts  ----------- */}
       <FormGroup
         label={
           <strong>
@@ -46,7 +46,7 @@ export default function AccountantForm() {
           label={'Should account code be unique when create a new account.'}
         />
       </FormGroup>
-      {/* ----------- accounting basis ----------- */}
+      {/* ----------- Accounting basis ----------- */}
       <FastField name={'accounting_basis'}>
         {({ form, field: { value }, meta: { error, touched } }) => (
           <FormGroup
@@ -64,7 +64,8 @@ export default function AccountantForm() {
           </FormGroup>
         )}
       </FastField>
-      {/* ----------- deposit customer account ----------- */}
+
+      {/* ----------- Deposit customer account ----------- */}
       <FastField name={'deposit_customer_account'}>
         {({ form, field: { value }, meta: { error, touched } }) => (
           <FormGroup
@@ -88,13 +89,13 @@ export default function AccountantForm() {
         )}
       </FastField>
 
-      {/* ----------- withdrawal customer account ----------- */}
+      {/* ----------- Withdrawal customer account ----------- */}
       <FastField name={'withdrawal_customer_account'}>
         {({ form, field: { value }, meta: { error, touched } }) => (
           <FormGroup
             label={
               <strong>
-                <T id={'withdrawal_customer_account'} />
+                <T id={'withdrawal_vendor_account'} />
               </strong>
             }
             helperText={
@@ -111,13 +112,13 @@ export default function AccountantForm() {
         )}
       </FastField>
 
-      {/* ----------- withdrawal customer account ----------- */}
+      {/* ----------- Withdrawal customer account ----------- */}
       <FastField name={'vendor_advance_deposit'}>
         {({ form, field: { value }, meta: { error, touched } }) => (
           <FormGroup
             label={
               <strong>
-                <T id={'vendor_advance_deposit'} />
+                <T id={'customer_advance_deposit'} />
               </strong>
             }
             helperText={

client/src/containers/Preferences/Accountant/AccountantFormProvider.js

@@ -9,10 +9,10 @@ const AccountantFormContext = React.createContext();
  */
 function AccountantFormProvider({ ...props }) {
   // Fetches the accounts list.
-  const { isFetching: isAccountsLoading, data: accounts } = useAccounts();
+  const { isLoading: isAccountsLoading, data: accounts } = useAccounts();
 
   //Fetches Organization Settings.
-  const { isFetching: isSettingsLoading } = useSettings();
+  const { isLoading: isSettingsLoading } = useSettings();
 
   // Save Organization Settings.
   const { mutateAsync: saveSettingMutate } = useSaveSettings();

client/src/lang/en/index.js

@@ -821,7 +821,7 @@ export default {
   average_rate: 'Average rate',
   the_name_used_before: 'The name is already used.',
   the_item_has_associated_transactions: 'The item has associated transactions.',
-  customer_has_sales_invoices: 'Customer has sales invoices',
+  customer_has_sales_invoices: 'Cannot delete customer has associated sales invoices.',
   account_name_is_already_used: 'Account name is already used.',
   vendors: 'Vendors',
   vendor_email: 'Vendor Email',

client/src/routes/dashboard.js

@@ -547,6 +547,5 @@ export default [
     path: `/`,
     component: lazy(() => import('containers/Homepage/Homepage')),
     breadcrumb: 'Home',
-    pageTitle: 'Homepage',
   },
 ];

server/src/data/options.js

@@ -35,13 +35,15 @@ export default {
     {
       key: "time_zone",
       type: "string",
-      // config: true,
     },
     {
       key: "date_format",
       type: "string",
-      // config: true,
     },
+    {
+      key: 'accounting_basis',
+      type: 'string',
+    }
   ],
   manual_journals: [
     {
@@ -59,13 +61,9 @@ export default {
   ],
   bill_payments: [
     {
-      key: "next_number",
+      key: 'withdrawal_account',
-      type: "number",
+      type: 'string'
-    },
+    }
-    {
-      key: "number_prefix",
-      type: "string",
-    },
   ],
   sales_estimates: [
     {
@@ -125,19 +123,27 @@ export default {
     {
       key: "auto_increment",
       type: "boolean",
+    },
+    {
+      key: 'deposit_account',
+      type: 'string'
+    },
+    {
+      key: 'advance_deposit',
+      key: 'string'
     }
   ],
   items: [
     {
-      key: "preferred_sell_account",
+      key: "sell_account",
       type: "number",
     },
     {
-      key: "preferred_cost_account",
+      key: "cost_account",
       type: "number",
     },
     {
-      key: "preferred_inventory_account",
+      key: "inventory_account",
       type: "number",
     },
   ],
@@ -147,4 +153,14 @@ export default {
       type: "number",
     },
   ],
+  accounts: [
+    {
+      key: 'account_code_required',
+      type: 'boolean',
+    },
+    {
+      key: 'account_code_unique',
+      type: 'boolean',
+    },
+  ]
 };