fix: asset value in fixed asset register (#33608)

fix: asset value in fixed asset register

(cherry picked from commit aa1f2a7297)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
This commit is contained in:
mergify[bot]
2023-01-15 17:33:39 +05:30
committed by GitHub
parent 91b08f179a
commit 4d2497faf1

View File

@@ -86,6 +86,7 @@ def get_data(filters):
"status", "status",
"department", "department",
"cost_center", "cost_center",
"calculate_depreciation",
"purchase_receipt", "purchase_receipt",
"asset_category", "asset_category",
"purchase_date", "purchase_date",
@@ -98,11 +99,7 @@ def get_data(filters):
assets_record = frappe.db.get_all("Asset", filters=conditions, fields=fields) assets_record = frappe.db.get_all("Asset", filters=conditions, fields=fields)
for asset in assets_record: for asset in assets_record:
asset_value = ( asset_value = get_asset_value(asset, filters.finance_book)
asset.gross_purchase_amount
- flt(asset.opening_accumulated_depreciation)
- flt(depreciation_amount_map.get(asset.name))
)
row = { row = {
"asset_id": asset.asset_id, "asset_id": asset.asset_id,
"asset_name": asset.asset_name, "asset_name": asset.asset_name,
@@ -125,6 +122,21 @@ def get_data(filters):
return data return data
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(
doctype="Asset Finance Book",
filters=[["parent", "=", asset.asset_id], finance_book_filter],
fieldname="value_after_depreciation",
)
def prepare_chart_data(data, filters): def prepare_chart_data(data, filters):
labels_values_map = {} labels_values_map = {}
date_field = frappe.scrub(filters.date_based_on) date_field = frappe.scrub(filters.date_based_on)