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

Fix for aging report totals

This commit is contained in:
Hillel Coren 2020-03-15 16:05:48 +02:00
parent 502cdf1349
commit f738814daf
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ui/reports/aging_report.dart
View File

@ -1,7 +1,6 @@
import 'package:built_collection/built_collection.dart'; import 'package:built_collection/built_collection.dart';
import 'package:invoiceninja_flutter/utils/enums.dart'; import 'package:invoiceninja_flutter/utils/enums.dart';
import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/tax_rate_model.dart';
import 'package:invoiceninja_flutter/data/models/company_model.dart'; import 'package:invoiceninja_flutter/data/models/company_model.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart';
@ -134,6 +133,7 @@ ReportResult agingReport(
} else if (column == AgingReportFields.age) { } else if (column == AgingReportFields.age) {
row.add(invoice.getReportNumber( row.add(invoice.getReportNumber(
value: value, value: value,
// TODO figure out why this line is needed
currencyId: client.settings.currencyId, currencyId: client.settings.currencyId,
formatNumberType: FormatNumberType.int)); formatNumberType: FormatNumberType.int));
} else if (value.runtimeType == double || value.runtimeType == int) { } else if (value.runtimeType == double || value.runtimeType == int) {

8
lib/ui/reports/reports_screen.dart
View File

@ -1126,8 +1126,14 @@ class ReportResult {
..sort((String str1, String str2) => str1.compareTo(str2)); ..sort((String str1, String str2) => str1.compareTo(str2));
fields.forEach((field) { fields.forEach((field) {
final amount = values[field]; final amount = values[field];
final value = formatNumber(amount, context, currencyId: currencyId);
if (field != 'count') { if (field != 'count') {
String value;
if (field == 'age') {
value = formatNumber(amount / values['count'], context,
formatNumberType: FormatNumberType.double);
} else {
value = formatNumber(amount, context, currencyId: currencyId);
}
cells.add(DataCell(Text(value))); cells.add(DataCell(Text(value)));
} }
}); });