QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 05:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
elforjani3
2021-03-21 18:50:22 +02:00
parent 27670d51ed 55771348b5
commit ccc28f667e
5 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/containers/Preferences/Accountant/AccountantForm.js
View File

@@ -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={

4
client/src/containers/Preferences/Accountant/AccountantFormProvider.js
View File

@@ -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();