schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: asset value correction in fixed asset register (#41943)

Browse Source
This commit is contained in:
Khushi Rawat
2024-06-25 16:04:20 +05:30
committed by GitHub
parent 92ca6c6538
commit a2ee4631cc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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,