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

fix: Fix depreciation_amount calculation

Browse Source 
(cherry picked from commit 22cc8d2246)

# Conflicts:
#	erpnext/regional/india/utils.py
This commit is contained in:
GangaManoj
2021-12-01 21:46:09 +05:30
committed by mergify-bot
parent 10c4874306
commit a50ecffb69
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/regional/india/utils.py
View File

@@ -838,12 +838,16 @@ def update_taxable_values(doc, method):
doc.get('items')[item_count - 1].taxable_value += diff doc.get('items')[item_count - 1].taxable_value += diff
def get_depreciation_amount(asset, depreciable_value, row): def get_depreciation_amount(asset, depreciable_value, row):
depreciation_left = flt(row.total_number_of_depreciations) - flt(asset.number_of_depreciations_booked) depreciation_left = flt(row.total_number_of_depreciations)
if row.depreciation_method in ("Straight Line", "Manual"): if row.depreciation_method in ("Straight Line", "Manual"):
# if the Depreciation Schedule is being prepared for the first time # if the Depreciation Schedule is being prepared for the first time
if not asset.flags.increase_in_asset_life: if not asset.flags.increase_in_asset_life:
<<<<<<< HEAD
depreciation_amount = (flt(row.value_after_depreciation) - depreciation_amount = (flt(row.value_after_depreciation) -
=======
depreciation_amount = (flt(asset.gross_purchase_amount) -
>>>>>>> 22cc8d2246 (fix: Fix depreciation_amount calculation)
flt(row.expected_value_after_useful_life)) / depreciation_left flt(row.expected_value_after_useful_life)) / depreciation_left
# if the Depreciation Schedule is being modified after Asset Repair # if the Depreciation Schedule is being modified after Asset Repair