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

client/src/containers/Expenses/ExpenseFormHeader.js

@@ -63,12 +63,6 @@ function ExpenseFormHeader({
     [setFieldValue, selectedItems],
   );
 
-  // Filter payment accounts.
-  const paymentAccounts = useMemo(
-    () => accountsList.filter((a) => a?.type?.key === 'current_asset'),
-    [accountsList],
-  );
-
   // handle change customer
   const onChangeCustomer = useCallback(
     (filedName) => {
@@ -126,10 +120,11 @@ function ExpenseFormHeader({
             }
           >
             <AccountsSelectList
-              accounts={paymentAccounts}
+              accounts={accountsList}
               onAccountSelected={onChangeAccount}
               defaultSelectText={<T id={'select_payment_account'} />}
               selectedAccountId={values.payment_account_id}
+              filterByTypes={['current_asset']}
             />
           </FormGroup>
         </Col>

client/src/containers/Expenses/ExpenseTable.js

@@ -127,7 +127,7 @@ function ExpenseTable({
         disableSortBy: true,
         disableResizing: true,
         width: 250,
-        accountsDataProp: 'expenseAccounts',
+        filterAccountsByRootType: ['expense'],
       },
       {
         Header: formatMessage({ id: 'amount_currency' }, { currency: 'USD' }),
@@ -220,12 +220,6 @@ function ExpenseTable({
     [rows],
   );
 
-  // Filter expense accounts.
-  const expenseAccounts = useMemo(
-    () => accountsList.filter((a) => a?.type?.root_type === 'expense'),
-    [accountsList],
-  );
-
   return (
     <div className={'dashboard__insider--expense-form__table'}>
       <DataTable
@@ -235,7 +229,6 @@ function ExpenseTable({
         sticky={true}
         payload={{
           accounts: accountsList,
-          expenseAccounts,
           errors: errors.categories || [],
           updateData: handleUpdateData,
           removeRow: handleRemoveRow,

client/src/containers/Items/ItemFormBody.js

@@ -104,6 +104,7 @@ function ItemFormBody({
               defaultSelectText={<T id={'select_account'} />}
               selectedAccountId={values.sell_account_id}
               disabled={!values.sellable}
+              filterByTypes={['income']}
             />
           </FormGroup>
 
@@ -173,6 +174,7 @@ function ItemFormBody({
               defaultSelectText={<T id={'select_account'} />}
               selectedAccountId={values.cost_account_id}
               disabled={!values.purchasable}
+              filterByTypes={['cost_of_goods_sold']}
             />
           </FormGroup>
         </Col>

client/src/containers/Purchases/PaymentMades/PaymentMadeFormHeader.js

@@ -76,11 +76,6 @@ function PaymentMadeFormHeader({
     },
     [setFieldValue],
   );
-  // Filter Payment accounts.
-  const paymentAccounts = useMemo(
-    () => accountsList.filter((a) => a?.type?.key === 'current_asset'),
-    [accountsList],
-  );
 
   const handleReceiveFullAmountClick = () => {
     setFieldValue('full_amount', payableFullAmount);
@@ -208,11 +203,12 @@ function PaymentMadeFormHeader({
           }
           >
             <AccountsSelectList
-              accounts={paymentAccounts}
+              accounts={accountsList}
               labelInfo={<FieldRequiredHint />}
               onAccountSelected={onChangeSelect('payment_account_id')}
               defaultSelectText={<T id={'select_payment_account'} />}
               selectedAccountId={values.payment_account_id}
+              filterByTypes={['current_asset']}
             />
           </FormGroup>
 

client/src/containers/Sales/PaymentReceive/PaymentReceiveFormHeader.js

@@ -64,12 +64,6 @@ function PaymentReceiveFormHeader({
     [setFieldValue],
   );
 
-  // Filter deposit accounts.
-  const depositAccounts = useMemo(
-    () => accountsList.filter((a) => a?.type?.key === 'current_asset'),
-    [accountsList],
-  );
-
   const triggerFullAmountChanged = (value) => {
     onFullAmountChanged && onFullAmountChanged(value);
   };
@@ -210,11 +204,12 @@ function PaymentReceiveFormHeader({
             }
           >
             <AccountsSelectList
-              accounts={depositAccounts}
+              accounts={accountsList}
               labelInfo={<FieldRequiredHint />}
               onAccountSelected={onChangeSelect('deposit_account_id')}
               defaultSelectText={<T id={'select_deposit_account'} />}
               selectedAccountId={values.deposit_account_id}
+              filterByTypes={['current_asset']}
             />
           </FormGroup>