CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 01:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41457 from khushi8112/comparison-between-none-type-and-date-time-instances

Browse Source 
fix: filtered out data having none values in date field
This commit is contained in:
Nabin Hait
2024-05-14 20:10:52 +05:30
committed by GitHub
parent 16751ec935 a36b7fb95a
commit 99d417bbc2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
View File

@@ -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 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:
filters_filter_based_on = filters.filter_based_on
date_field = frappe.scrub(filters.date_based_on)