Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Improve P&L report

This commit is contained in:
Hillel Coren 2022-03-15 10:22:39 +02:00
parent 38366d5d42
commit c4cc156918
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ui/app/presenters/entity_presenter.dart
View File

@ -124,6 +124,8 @@ class EntityPresenter {
'discount',
'profit',
'total',
'payment',
'expense',
'invoice_amount',
'invoice_balance',
'client_balance',

25
lib/ui/reports/profit_loss_report.dart
View File

@ -27,6 +27,9 @@ enum ProfitAndLossReportFields {
vendor_country,
type,
amount,
payment,
expense,
profit,
date,
category,
}
@ -76,7 +79,9 @@ ReportResult profitAndLossReport(
final defaultColumns = [
ProfitAndLossReportFields.type,
ProfitAndLossReportFields.amount,
ProfitAndLossReportFields.payment,
ProfitAndLossReportFields.expense,
ProfitAndLossReportFields.profit,
ProfitAndLossReportFields.client,
ProfitAndLossReportFields.vendor,
ProfitAndLossReportFields.date,
@ -145,6 +150,15 @@ ReportResult profitAndLossReport(
case ProfitAndLossReportFields.amount:
value = payment?.completedAmount;
break;
case ProfitAndLossReportFields.payment:
value = payment?.completedAmount;
break;
case ProfitAndLossReportFields.expense:
value = 0.0;
break;
case ProfitAndLossReportFields.profit:
value = payment?.completedAmount;
break;
case ProfitAndLossReportFields.date:
value = payment?.date;
break;
@ -233,6 +247,15 @@ ReportResult profitAndLossReport(
case ProfitAndLossReportFields.amount:
value = -expense.amount;
break;
case ProfitAndLossReportFields.payment:
value = 0.0;
break;
case ProfitAndLossReportFields.expense:
value = expense.amount;
break;
case ProfitAndLossReportFields.profit:
value = -expense.amount;
break;
case ProfitAndLossReportFields.date:
value = expense.date;
break;