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

fix(Profit/Loss): fix profit&loss sheet.

Browse Source
This commit is contained in:
a.bouhuolia
2021-03-24 15:05:06 +02:00
parent 091030a52f
commit 3b70f60952
6 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/interfaces/ProfitLossSheet.ts
View File

@@ -53,6 +53,7 @@ export interface IProfitLossSheetStatement {
otherIncome: IProfitLossSheetAccountsSection,
netIncome: IProfitLossSheetTotalSection;
operatingProfit: IProfitLossSheetTotalSection;
netOtherIncome: IProfitLossSheetTotalSection,
grossProfit: IProfitLossSheetTotalSection;
};

35
server/src/services/FinancialStatements/ProfitLossSheet/ProfitLossSheet.ts
View File

@@ -52,7 +52,9 @@ export default class ProfitLossSheet extends FinancialSheet {
}
get otherIncomeAccounts() {
return this.accounts.filter((a) => a.accountType === ACCOUNT_TYPE.OTHER_INCOME);
return this.accounts.filter(
(a) => a.accountType === ACCOUNT_TYPE.OTHER_INCOME
);
}
/**
@@ -76,7 +78,9 @@ export default class ProfitLossSheet extends FinancialSheet {
* @return {IAccount & { type: IAccountType }[]}}
*/
get otherExpensesAccounts() {
return this.accounts.filter((a) => a.accountType === ACCOUNT_TYPE.OTHER_EXPENSE);
return this.accounts.filter(
(a) => a.accountType === ACCOUNT_TYPE.OTHER_EXPENSE
);
}
/**
@@ -84,7 +88,9 @@ export default class ProfitLossSheet extends FinancialSheet {
* @return {IAccount & { type: IAccountType }[]}
*/
get costOfSalesAccounts() {
return this.accounts.filter((a) => a.accountType === ACCOUNT_TYPE.COST_OF_GOODS_SOLD);
return this.accounts.filter(
(a) => a.accountType === ACCOUNT_TYPE.COST_OF_GOODS_SOLD
);
}
/**
@@ -244,8 +250,8 @@ export default class ProfitLossSheet extends FinancialSheet {
return {
name: 'Other Income',
entryNormal: 'credit',
...this.sectionMapper(this.otherIncomeAccounts)
}
...this.sectionMapper(this.otherIncomeAccounts),
};
}
/**
@@ -369,12 +375,16 @@ export default class ProfitLossSheet extends FinancialSheet {
const grossProfit = this.getSummarySection(income, costOfSales);
// - Operating profit = Gross profit - Expenses.
const operatingProfit = this.getSummarySection(grossProfit, [
expenses,
costOfSales,
]);
// - Net income = Operating profit - Other expenses.
const netIncome = this.getSummarySection(operatingProfit, otherExpenses);
const operatingProfit = this.getSummarySection(grossProfit, expenses);
// Net other income = Other income - other expenses.
const netOtherIncome = this.getSummarySection(otherIncome, otherExpenses);
// - Net income = (Operating profit + other income) - Other expenses.
const netIncome = this.getSummarySection(
[operatingProfit, netOtherIncome],
[],
);
return {
income,
@@ -383,8 +393,9 @@ export default class ProfitLossSheet extends FinancialSheet {
expenses,
otherIncome,
otherExpenses,
netIncome,
operatingProfit,
netOtherIncome,
netIncome,
};
}