From 11d165c274ffe17b6f403bf30d86b4430976518b Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 30 Jan 2023 19:33:58 +0100 Subject: [PATCH] fix(Fixed Asset Register): error when selecting more than one fiscal year --- .../fixed_asset_register/fixed_asset_register.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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 faffd1134d..d41069c1c9 100644 --- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py +++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py @@ -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 = {}