nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33888 from barredterra/get-asset-value

Browse Source 
fix(Fixed Asset Register): error when selecting more than one fiscal …
This commit is contained in:
Anand Baburajan
2023-01-31 01:59:53 +05:30
committed by GitHub
parent 3e5f8323b0 11d165c274
commit e007776ada
1 changed files with 9 additions and 7 deletions
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: if not asset.calculate_depreciation:
return flt(asset.gross_purchase_amount) - flt(asset.opening_accumulated_depreciation) return flt(asset.gross_purchase_amount) - flt(asset.opening_accumulated_depreciation)
finance_book_filter = ["finance_book", "is", "not set"] result = frappe.get_all(
if finance_book:
finance_book_filter = ["finance_book", "=", finance_book]
return frappe.db.get_value(
doctype="Asset Finance Book", doctype="Asset Finance Book",
filters=[["parent", "=", asset.asset_id], finance_book_filter], filters={
fieldname="value_after_depreciation", "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): def prepare_chart_data(data, filters):
labels_values_map = {} labels_values_map = {}