- fix: store children accounts with Redux store.

- fix: store expense payment date with transactions.
- fix: Total assets, liabilities and equity on balance sheet.
- tweaks: dashboard content and sidebar style.
- fix: reset form with contact list on journal entry form.
- feat: Add hints to filter accounts in financial statements.
This commit is contained in:
Ahmed Bouhuolia
2020-07-12 12:31:12 +02:00
parent 4bd8f1628d
commit 9d9c7c1568
60 changed files with 1685 additions and 929 deletions

View File

@@ -64,7 +64,6 @@ function GeneralLedger({
to_date: moment(filter.to_date).format('YYYY-MM-DD'),
};
setFilter(parsedFilter);
fetchSheet.refetch({ force: true });
}, [setFilter]);
const handleFilterChanged = () => { };

View File

@@ -52,8 +52,8 @@ function GeneralLedgerHeader({
});
const onAccountSelected = useCallback((selectedAccounts) => {
}, []);
formik.setFieldValue('accounts_ids', Object.keys(selectedAccounts));
}, [formik.setFieldValue]);
const handleAccountingBasisChange = useCallback(
(value) => {

View File

@@ -53,7 +53,7 @@ function GeneralLedgerTable({
];
return TYPES.indexOf(row.rowType) !== -1
? moment(row.date).format('DD-MM-YYYY')
? moment(row.date).format('DD MMM YYYY')
: '';
},
[moment, ROW_TYPE],
@@ -83,36 +83,43 @@ function GeneralLedgerTable({
Header: formatMessage({ id: 'account_name' }),
accessor: accountNameAccessor,
className: 'name',
width: 225,
},
{
Header: formatMessage({ id: 'date' }),
accessor: dateAccessor,
className: 'date',
width: 115,
},
{
Header: formatMessage({ id: 'transaction_type' }),
accessor: 'referenceType',
className: 'transaction_type',
width: 145,
},
{
Header: formatMessage({ id: 'trans_num' }),
accessor: referenceLink,
className: 'transaction_number',
width: 110,
},
{
Header: formatMessage({ id: 'description' }),
accessor: 'note',
className: 'description',
width: 145,
},
{
Header: formatMessage({ id: 'amount' }),
Cell: amountCell,
className: 'amount',
width: 150,
},
{
Header: formatMessage({ id: 'balance' }),
Cell: amountCell,
className: 'balance',
width: 150,
},
],
[],
@@ -133,11 +140,13 @@ function GeneralLedgerTable({
return (
<FinancialSheet
companyName={companyName}
sheetType={formatMessage({ id: 'general_ledger_sheet' })}
// sheetType={formatMessage({ id: 'general_ledger_sheet' })}
fromDate={generalLedgerQuery.from_date}
toDate={generalLedgerQuery.to_date}
name="general-ledger"
loading={generalLedgerSheetLoading}
minimal={true}
fullWidth={true}
>
<DataTable
className="bigcapital-datatable--financial-report"