nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 23:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed asset value in Fixed Asset Register (backport #41930) (#42027)

Browse Source 
fix: fixed asset value in Fixed Asset Register (#41930)

(cherry picked from commit 1c643a0ead)

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2024-06-26 16:49:55 +05:30
committed by GitHub
parent a981633d94
commit f2feeaf264
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,9 +125,10 @@ def get_data(filters):
if assets_linked_to_fb and asset.calculate_depreciation and asset.asset_id not in assets_linked_to_fb: if assets_linked_to_fb and asset.calculate_depreciation and asset.asset_id not in assets_linked_to_fb:
continue continue
asset_value = get_asset_value_after_depreciation( depreciation_amount = depreciation_amount_map.get(asset.asset_id) or 0.0
asset.asset_id, finance_book asset_value = (
) or get_asset_value_after_depreciation(asset.asset_id) asset.gross_purchase_amount - asset.opening_accumulated_depreciation - depreciation_amount
)
row = { row = {
"asset_id": asset.asset_id, "asset_id": asset.asset_id,
@@ -139,7 +140,7 @@ def get_data(filters):
or pi_supplier_map.get(asset.purchase_invoice), or pi_supplier_map.get(asset.purchase_invoice),
"gross_purchase_amount": asset.gross_purchase_amount, "gross_purchase_amount": asset.gross_purchase_amount,
"opening_accumulated_depreciation": asset.opening_accumulated_depreciation, "opening_accumulated_depreciation": asset.opening_accumulated_depreciation,
"depreciated_amount": depreciation_amount_map.get(asset.asset_id) or 0.0, "depreciated_amount": depreciation_amount,
"available_for_use_date": asset.available_for_use_date, "available_for_use_date": asset.available_for_use_date,
"location": asset.location, "location": asset.location,
"asset_category": asset.asset_category, "asset_category": asset.asset_category,
@@ -185,11 +186,12 @@ def prepare_chart_data(data, filters):
) )
for d in data: for d in data:
date = d.get(date_field) if d.get(date_field):
belongs_to_month = formatdate(date, "MMM YYYY") date = d.get(date_field)
belongs_to_month = formatdate(date, "MMM YYYY")
labels_values_map[belongs_to_month].asset_value += d.get("asset_value") labels_values_map[belongs_to_month].asset_value += d.get("asset_value")
labels_values_map[belongs_to_month].depreciated_amount += d.get("depreciated_amount") labels_values_map[belongs_to_month].depreciated_amount += d.get("depreciated_amount")
return { return {
"data": { "data": {