diff --git a/lib/ui/reports/client_report.dart b/lib/ui/reports/client_report.dart index 0c410b2df..27d7c684a 100644 --- a/lib/ui/reports/client_report.dart +++ b/lib/ui/reports/client_report.dart @@ -96,6 +96,7 @@ ReportResult clientReport( if (clientReportSettings.columns.isNotEmpty) { columns = BuiltList(clientReportSettings.columns .map((e) => EnumUtils.fromString(ClientReportFields.values, e)) + .where((element) => element != null) .toList()); } else { columns = BuiltList(defaultColumns); diff --git a/lib/ui/reports/credit_report.dart b/lib/ui/reports/credit_report.dart index b3a7decee..85b77f8aa 100644 --- a/lib/ui/reports/credit_report.dart +++ b/lib/ui/reports/credit_report.dart @@ -85,6 +85,7 @@ ReportResult creditReport( if (creditReportSettings.columns.isNotEmpty) { columns = BuiltList(creditReportSettings.columns .map((e) => EnumUtils.fromString(CreditReportFields.values, e)) + .where((element) => element != null) .toList()); } else { columns = BuiltList(defaultColumns); diff --git a/lib/ui/reports/document_report.dart b/lib/ui/reports/document_report.dart index b95e9b8d9..a4871f2de 100644 --- a/lib/ui/reports/document_report.dart +++ b/lib/ui/reports/document_report.dart @@ -82,6 +82,7 @@ ReportResult documentReport( if (documentReportSettings.columns.isNotEmpty) { columns = BuiltList(documentReportSettings.columns .map((e) => EnumUtils.fromString(DocumentReportFields.values, e)) + .where((element) => element != null) .toList()); } else { columns = BuiltList(defaultColumns); diff --git a/lib/ui/reports/expense_report.dart b/lib/ui/reports/expense_report.dart index 2642d73fa..8d0d8d870 100644 --- a/lib/ui/reports/expense_report.dart +++ b/lib/ui/reports/expense_report.dart @@ -76,6 +76,7 @@ ReportResult expenseReport( if (expenseReportSettings.columns.isNotEmpty) { columns = BuiltList(expenseReportSettings.columns .map((e) => EnumUtils.fromString(ExpenseReportFields.values, e)) + .where((element) => element != null) .toList()); } else { columns = BuiltList(defaultColumns); diff --git a/lib/ui/reports/invoice_report.dart b/lib/ui/reports/invoice_report.dart index bf5504a9d..99f891902 100644 --- a/lib/ui/reports/invoice_report.dart +++ b/lib/ui/reports/invoice_report.dart @@ -93,6 +93,7 @@ ReportResult invoiceReport( if (invoiceReportSettings.columns.isNotEmpty) { columns = BuiltList(invoiceReportSettings.columns .map((e) => EnumUtils.fromString(InvoiceReportFields.values, e)) + .where((element) => element != null) .toList()); } else { columns = BuiltList(defaultColumns); diff --git a/lib/ui/reports/line_item_report.dart b/lib/ui/reports/line_item_report.dart index 3ff6095dd..58ec24673 100644 --- a/lib/ui/reports/line_item_report.dart +++ b/lib/ui/reports/line_item_report.dart @@ -67,6 +67,7 @@ ReportResult lineItemReport( if (lineItemReportSettings.columns.isNotEmpty) { columns = BuiltList(lineItemReportSettings.columns .map((e) => EnumUtils.fromString(LineItemReportFields.values, e)) + .where((element) => element != null) .toList()); } else { columns = BuiltList(defaultColumns); diff --git a/lib/ui/reports/payment_report.dart b/lib/ui/reports/payment_report.dart index 7f4cf6278..0d424b7af 100644 --- a/lib/ui/reports/payment_report.dart +++ b/lib/ui/reports/payment_report.dart @@ -68,6 +68,7 @@ ReportResult paymentReport( if (paymentReportSettings.columns.isNotEmpty) { columns = BuiltList(paymentReportSettings.columns .map((e) => EnumUtils.fromString(PaymentReportFields.values, e)) + .where((element) => element != null) .toList()); } else { columns = BuiltList(defaultColumns); diff --git a/lib/ui/reports/product_report.dart b/lib/ui/reports/product_report.dart index 85ffa78b5..363078e43 100644 --- a/lib/ui/reports/product_report.dart +++ b/lib/ui/reports/product_report.dart @@ -61,6 +61,7 @@ ReportResult productReport( if (productReportSettings.columns.isNotEmpty) { columns = BuiltList(productReportSettings.columns .map((e) => EnumUtils.fromString(ProductReportFields.values, e)) + .where((element) => element != null) .toList()); } else { columns = BuiltList(defaultColumns); diff --git a/lib/ui/reports/profit_loss_report.dart b/lib/ui/reports/profit_loss_report.dart index 30dea43fa..b5a482db3 100644 --- a/lib/ui/reports/profit_loss_report.dart +++ b/lib/ui/reports/profit_loss_report.dart @@ -64,6 +64,7 @@ ReportResult profitAndLossReport( if (profitAndLossReportSettings.columns.isNotEmpty) { columns = BuiltList(profitAndLossReportSettings.columns .map((e) => EnumUtils.fromString(ProfitAndLossReportFields.values, e)) + .where((element) => element != null) .toList()); } else { columns = BuiltList(defaultColumns); diff --git a/lib/ui/reports/quote_report.dart b/lib/ui/reports/quote_report.dart index c8b827f5c..0825d058c 100644 --- a/lib/ui/reports/quote_report.dart +++ b/lib/ui/reports/quote_report.dart @@ -85,6 +85,7 @@ ReportResult quoteReport( if (quoteReportSettings.columns.isNotEmpty) { columns = BuiltList(quoteReportSettings.columns .map((e) => EnumUtils.fromString(QuoteReportFields.values, e)) + .where((element) => element != null) .toList()); } else { columns = BuiltList(defaultColumns); diff --git a/lib/ui/reports/tax_rate_report.dart b/lib/ui/reports/tax_rate_report.dart index 3bd3ab757..ba2d97cc4 100644 --- a/lib/ui/reports/tax_rate_report.dart +++ b/lib/ui/reports/tax_rate_report.dart @@ -64,6 +64,7 @@ ReportResult taxRateReport( if (taxRateReportSettings.columns.isNotEmpty) { columns = BuiltList(taxRateReportSettings.columns .map((e) => EnumUtils.fromString(TaxRateReportFields.values, e)) + .where((element) => element != null) .toList()); } else { columns = BuiltList(defaultColumns);