Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Fixed Asset Register): error when selecting more than one fiscal year

Browse Source
This commit is contained in:
barredterra 2023-01-30 19:33:58 +01:00
parent 3e5f8323b0
commit 11d165c274
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,16 +126,18 @@ def get_asset_value(asset, finance_book=None):
if not asset.calculate_depreciation:
return flt(asset.gross_purchase_amount) - flt(asset.opening_accumulated_depreciation)
finance_book_filter = ["finance_book", "is", "not set"]
if finance_book:
finance_book_filter = ["finance_book", "=", finance_book]
return frappe.db.get_value(
result = frappe.get_all(
doctype="Asset Finance Book",
filters=[["parent", "=", asset.asset_id], finance_book_filter],
fieldname="value_after_depreciation",
filters={
"parent": asset.asset_id,
"finance_book": finance_book or ("is", "not set"),
},
pluck="value_after_depreciation",
limit=1,
)
return result[0] if result else 0.0
def prepare_chart_data(data, filters):
labels_values_map = {}