QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 13:20: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-24 16:14:23 +02:00
parent a4cb075cea 3b70f60952
commit e155a339ed
6 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/containers/FinancialStatements/reducers.js
View File

@@ -140,6 +140,14 @@ export const profitLossSheetReducer = (profitLoss) => {
],
});
}
if (profitLoss.net_other_income) {
results.push({
name: 'Net other income',
total: profitLoss.net_other_income.total,
total_periods: profitLoss.net_other_income.total_periods,
rowTypes: ['net_other_income', 'section_total', 'total'],
});
}
if (profitLoss.net_income) {
results.push({
name: 'Net Income',
@@ -209,6 +217,7 @@ export const generalLedgerTableRowsReducer = (accounts) => {
...account.opening_balance,
name: 'Opening balance',
rowType: 'OPENING_BALANCE',
date: moment(account.opening_balance.date).format('DD MMM YYYY'),
},
...account.transactions.map((transaction) => ({
...transaction,
@@ -220,8 +229,11 @@ export const generalLedgerTableRowsReducer = (accounts) => {
...account.closing_balance,
name: 'Closing balance',
rowType: 'CLOSING_BALANCE',
date: moment(account.closing_balance.date).format('DD MMM YYYY'),
},
],
amount: account.closing_balance.amount,
formatted_amount: account.closing_balance.formatted_amount,
};
})
.value();