QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 04:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: accountant.

Browse Source
This commit is contained in:
elforjani13
2021-12-21 12:12:06 +02:00
parent da3564d315
commit c87a98a5e4
6 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.js
View File

@@ -106,6 +106,6 @@ export default compose(
paymentReceiveNextNumber: paymentReceiveSettings?.nextNumber,
paymentReceiveNumberPrefix: paymentReceiveSettings?.numberPrefix,
paymentReceiveAutoIncrement: paymentReceiveSettings?.autoIncrement,
preferredDepositAccount: paymentReceiveSettings?.depositAccount,
preferredDepositAccount: paymentReceiveSettings?.preferredDepositAccount,
})),
)(QuickPaymentReceiveForm);

4
src/containers/Preferences/Accountant/Accountant.schema.js
View File

@@ -4,9 +4,9 @@ const Schema = Yup.object().shape({
accounting_basis: Yup.string().required(),
account_code_required: Yup.boolean().nullable(),
account_code_unique: Yup.boolean().nullable(),
deposit_account: Yup.number().nullable(),
withdrawal_account: Yup.number().nullable(),
advance_deposit: Yup.number().nullable(),
preferred_deposit_account: Yup.number().nullable(),
preferred_advance_deposit: Yup.number().nullable(),
});
export const AccountantSchema = Schema;

20
src/containers/Preferences/Accountant/AccountantForm.js
View File

@@ -17,6 +17,7 @@ import {
FieldRequiredHint,
} from 'components';
import { handleStringChange, inputIntent } from 'utils';
import { ACCOUNT_TYPE } from 'common/accountTypes';
import { useAccountantFormContext } from './AccountantFormProvider';
@@ -113,7 +114,7 @@ export default function AccountantForm() {
</FastField>
{/* ----------- Deposit customer account ----------- */}
<FastField name={'deposit_account'}>
<FastField name={'preferred_deposit_account'}>
{({
form: { values, setFieldValue },
field: { value },
@@ -138,11 +139,15 @@ export default function AccountantForm() {
<AccountsSelectList
accounts={accounts}
onAccountSelected={({ id }) => {
setFieldValue('deposit_account', id);
setFieldValue('preferred_deposit_account', id);
}}
selectedAccountId={value}
defaultSelectText={<T id={'select_payment_account'} />}
// filterByParentTypes={[ACCOUNT_PARENT_TYPE.CURRENT_ASSET]}
filterByTypes={[
ACCOUNT_TYPE.CASH,
ACCOUNT_TYPE.BANK,
ACCOUNT_TYPE.OTHER_CURRENT_ASSET,
]}
/>
</FormGroup>
)}
@@ -178,13 +183,18 @@ export default function AccountantForm() {
}}
selectedAccountId={value}
defaultSelectText={<T id={'select_payment_account'} />}
filterByTypes={[
ACCOUNT_TYPE.CASH,
ACCOUNT_TYPE.BANK,
ACCOUNT_TYPE.OTHER_CURRENT_ASSET,
]}
/>
</FormGroup>
)}
</FastField>
{/* ----------- Withdrawal customer account ----------- */}
<FastField name={'advance_deposit'}>
<FastField name={'preferred_advance_deposit'}>
{({
form: { values, setFieldValue },
field: { value },
@@ -209,7 +219,7 @@ export default function AccountantForm() {
<AccountsSelectList
accounts={accounts}
onAccountSelected={({ id }) => {
setFieldValue('advance_deposit', id);
setFieldValue('preferred_advance_deposit', id);
}}
selectedAccountId={value}
defaultSelectText={<T id={'select_payment_account'} />}

4
src/containers/Preferences/Accountant/AccountantFormPage.js
View File

@@ -28,15 +28,13 @@ function AccountantFormPage({
accountsSettings,
billPaymentSettings,
}) {
const { saveSettingMutate } = useAccountantFormContext();
const accountantSettings = {
...billPaymentSettings,
...accountsSettings,
...pick(organizationSettings, ['accountingBasis']),
...pick(paymentReceiveSettings, ['depositAccount', 'advanceDeposit']),
...pick(paymentReceiveSettings, ['preferredDepositAccount', 'preferredAdvanceDeposit']),
};
const initialValues = {

8
src/containers/Preferences/Accountant/utils.js
View File

@@ -11,13 +11,13 @@ export const transformToOptions = (option) => {
group: 'bill_payments',
},
{
key: 'deposit_account',
value: option.deposit_account,
key: 'preferred_deposit_account',
value: option.preferred_deposit_account,
group: 'payment_receives',
},
{
key: 'advance_deposit',
value: option.advance_deposit,
key: 'preferred_advance_deposit',
value: option.preferred_advance_deposit,
group: 'payment_receives',
},
{

9
src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveForm.js
View File

@@ -28,7 +28,11 @@ import { AppToaster } from 'components';
import { transactionNumber, compose } from 'utils';
import { usePaymentReceiveFormContext } from './PaymentReceiveFormProvider';
import { defaultPaymentReceive, transformToEditForm, transformFormToRequest } from './utils';
import {
defaultPaymentReceive,
transformToEditForm,
transformFormToRequest,
} from './utils';
/**
* Payment Receive form.
@@ -61,6 +65,7 @@ function PaymentReceiveForm({
paymentReceiveNumberPrefix,
paymentReceiveNextNumber,
);
console.log(preferredDepositAccount, 'XX');
// Form initial values.
const initialValues = useMemo(
() => ({
@@ -194,7 +199,7 @@ export default compose(
paymentReceiveNextNumber: paymentReceiveSettings?.nextNumber,
paymentReceiveNumberPrefix: paymentReceiveSettings?.numberPrefix,
paymentReceiveAutoIncrement: paymentReceiveSettings?.autoIncrement,
preferredDepositAccount: paymentReceiveSettings?.depositAccount,
preferredDepositAccount: paymentReceiveSettings?.preferredDepositAccount,
})),
withCurrentOrganization(),
)(PaymentReceiveForm);