nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-ritvik-ignore-perm-tree-doctype

Browse Source
This commit is contained in:
Suraj Shetty
2023-08-30 16:46:00 +05:30
committed by GitHub
parent de433d8626 5e38109481
commit e92d4e9b4a
76 changed files with 3586 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,6 +156,8 @@ def get_data(filters):
def prepare_chart_data(data, filters):
if not data:
return
labels_values_map = {}
if filters.filter_based_on not in ("Date Range", "Fiscal Year"):
filters_filter_based_on = "Date Range"