From 3bd455ac856c5a073e7ec44bb7e855c64e7789cb Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Tue, 14 May 2024 14:24:18 +0530 Subject: [PATCH 1/2] fix: filtered out data having none values in date field --- .../report/fixed_asset_register/fixed_asset_register.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py index 3d4473fedce..e6235779446 100644 --- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py +++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py @@ -159,8 +159,9 @@ def prepare_chart_data(data, filters): if filters.filter_based_on not in ("Date Range", "Fiscal Year"): filters_filter_based_on = "Date Range" date_field = "purchase_date" - filters_from_date = min(data, key=lambda a: a.get(date_field)).get(date_field) - filters_to_date = max(data, key=lambda a: a.get(date_field)).get(date_field) + filtered_data = [d for d in data if d.get(date_field) is not None] + filters_from_date = min(filtered_data, key=lambda a: a.get(date_field)).get(date_field) + filters_to_date = max(filtered_data, key=lambda a: a.get(date_field)).get(date_field) else: filters_filter_based_on = filters.filter_based_on date_field = frappe.scrub(filters.date_based_on) From a36b7fb95a4b1e42f0a0da3e73d9e380f171d5b5 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Tue, 14 May 2024 19:36:44 +0530 Subject: [PATCH 2/2] style: code optimization --- .../assets/report/fixed_asset_register/fixed_asset_register.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py index e6235779446..d27d5838186 100644 --- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py +++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py @@ -159,7 +159,7 @@ def prepare_chart_data(data, filters): if filters.filter_based_on not in ("Date Range", "Fiscal Year"): filters_filter_based_on = "Date Range" date_field = "purchase_date" - filtered_data = [d for d in data if d.get(date_field) is not None] + filtered_data = [d for d in data if not d.get(date_field)] filters_from_date = min(filtered_data, key=lambda a: a.get(date_field)).get(date_field) filters_to_date = max(filtered_data, key=lambda a: a.get(date_field)).get(date_field) else: