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

Profit loss report is doesn't reflect converted currencies #620

This commit is contained in:
Hillel Coren 2024-01-30 18:15:00 +02:00
parent ce862942ea
commit 900ddf5c4f
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/data/models/payment_model.dart
View File

@ -501,6 +501,10 @@ abstract class PaymentEntity extends Object
bool get isOnline => companyGatewayId.isNotEmpty; bool get isOnline => companyGatewayId.isNotEmpty;
double get convertedExchangeRate => exchangeRate == 0 ? 1 : exchangeRate;
double get convertedAmount => completedAmount * convertedExchangeRate;
bool get isCompletedOrPartiallyRefunded => [ bool get isCompletedOrPartiallyRefunded => [
kPaymentStatusCompleted, kPaymentStatusCompleted,
kPaymentStatusPartiallyRefunded kPaymentStatusPartiallyRefunded

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

@ -36,6 +36,7 @@ enum ProfitAndLossReportFields {
currency, currency,
transaction_reference, transaction_reference,
record_state, record_state,
converted_amount,
} }
var memoizedProfitAndLossReport = memo9(( var memoizedProfitAndLossReport = memo9((
@ -179,6 +180,9 @@ ReportResult profitAndLossReport(
value = AppLocalization.of(navigatorKey.currentContext!)! value = AppLocalization.of(navigatorKey.currentContext!)!
.lookup(payment.entityState); .lookup(payment.entityState);
break; break;
case ProfitAndLossReportFields.converted_amount:
value = payment.convertedAmount;
break;
} }
if (!ReportResult.matchField( if (!ReportResult.matchField(
@ -194,6 +198,9 @@ ReportResult profitAndLossReport(
row.add(payment.getReportEntityType()); row.add(payment.getReportEntityType());
} else if (value.runtimeType == bool) { } else if (value.runtimeType == bool) {
row.add(payment.getReportBool(value: value)); row.add(payment.getReportBool(value: value));
} else if (column == ProfitAndLossReportFields.converted_amount) {
row.add(payment.getReportDouble(
value: value, currencyId: userCompany.company.currencyId));
} else if (value.runtimeType == double || value.runtimeType == int) { } else if (value.runtimeType == double || value.runtimeType == int) {
row.add(payment.getReportDouble( row.add(payment.getReportDouble(
value: value, currencyId: client.currencyId)); value: value, currencyId: client.currencyId));
@ -286,6 +293,9 @@ ReportResult profitAndLossReport(
value = AppLocalization.of(navigatorKey.currentContext!)! value = AppLocalization.of(navigatorKey.currentContext!)!
.lookup(expense.entityState); .lookup(expense.entityState);
break; break;
case ProfitAndLossReportFields.converted_amount:
value = expense.convertedAmount;
break;
} }
if (!ReportResult.matchField( if (!ReportResult.matchField(
@ -301,6 +311,9 @@ ReportResult profitAndLossReport(
row.add(expense.getReportEntityType()); row.add(expense.getReportEntityType());
} else if (value.runtimeType == bool) { } else if (value.runtimeType == bool) {
row.add(expense.getReportBool(value: value)); row.add(expense.getReportBool(value: value));
} else if (column == ProfitAndLossReportFields.converted_amount) {
row.add(expense.getReportDouble(
value: value, currencyId: userCompany.company.currencyId));
} else if (value.runtimeType == double || value.runtimeType == int) { } else if (value.runtimeType == double || value.runtimeType == int) {
row.add(expense.getReportDouble( row.add(expense.getReportDouble(
value: value, currencyId: expense.currencyId)); value: value, currencyId: expense.currencyId));