From d3e0e7c53186df12280aa7bf29e35a68c40ebdfd Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 3 Feb 2021 21:59:43 +0200
Subject: [PATCH] Reports

---
 lib/ui/reports/profit_loss_report.dart | 12 ++++++++----
 lib/ui/reports/reports_screen.dart     |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/ui/reports/profit_loss_report.dart b/lib/ui/reports/profit_loss_report.dart
index 93f19bd7a..30074ef70 100644
--- a/lib/ui/reports/profit_loss_report.dart
+++ b/lib/ui/reports/profit_loss_report.dart
@@ -88,7 +88,7 @@ ReportResult profitAndLossReport(
 
       switch (column) {
         case ProfitAndLossReportFields.type:
-          value = EntityType.payment.toString();
+          value = EntityType.payment;
           break;
         case ProfitAndLossReportFields.client:
           value = client?.displayName;
@@ -143,7 +143,9 @@ ReportResult profitAndLossReport(
         skip = true;
       }
 
-      if (value.runtimeType == bool) {
+      if (value.runtimeType == EntityType) {
+        row.add(payment.getReportEntityType());
+      } else if (value.runtimeType == bool) {
         row.add(payment.getReportBool(value: value));
       } else if (value.runtimeType == double || value.runtimeType == int) {
         row.add(payment.getReportDouble(
@@ -171,7 +173,7 @@ ReportResult profitAndLossReport(
 
       switch (column) {
         case ProfitAndLossReportFields.type:
-          value = EntityType.expense.toString();
+          value = EntityType.expense;
           break;
         case ProfitAndLossReportFields.client:
           value = client?.displayName;
@@ -226,7 +228,9 @@ ReportResult profitAndLossReport(
         skip = true;
       }
 
-      if (value.runtimeType == bool) {
+      if (value.runtimeType == EntityType) {
+        row.add(expense.getReportEntityType());
+      } else if (value.runtimeType == bool) {
         row.add(expense.getReportBool(value: value));
       } else if (value.runtimeType == double || value.runtimeType == int) {
         row.add(expense.getReportDouble(
diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart
index cf381b299..d7239e32e 100644
--- a/lib/ui/reports/reports_screen.dart
+++ b/lib/ui/reports/reports_screen.dart
@@ -646,7 +646,7 @@ class ReportResult {
             return false;
           }
         } else if (value.runtimeType == EntityType) {
-          return filter == localization.lookup('$value');
+          return filter.toLowerCase() == '$value'.toLowerCase();
         } else if (isValidDate(value)) {
           if (!ReportResult.matchDateTime(
               filter: filter,