CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 01:36:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35859 from frappe/mergify/bp/version-14/pr-35858

Browse Source 
fix: show non-depreciable assets in fixed asset register (backport #35858)
This commit is contained in:
Anand Baburajan
2023-06-23 08:22:43 +05:30
committed by GitHub
parent 8049582652 2240aeb307
commit c66c4e3aab
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,7 +115,11 @@ def get_data(filters):
depreciation_amount_map = get_asset_depreciation_amount_map(filters, finance_book)
for asset in assets_record:
if assets_linked_to_fb 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
asset_value = get_asset_value_after_depreciation(