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

Merge pull request #39874 from nabinhait/depreciation-last-row-adjustment

Browse Source 
fix: Adjust amount in last row due to rounding
This commit is contained in:
Nabin Hait
2024-02-20 13:13:02 +05:30
committed by GitHub
parent 947f138ea4 a4fbea3722
commit c53ced1224
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/assets/doctype/asset/asset.py
View File

@@ -513,14 +513,15 @@ class Asset(AccountsController):
) )
# Adjust depreciation amount in the last period based on the expected value after useful life # Adjust depreciation amount in the last period based on the expected value after useful life
if finance_book.expected_value_after_useful_life and ( if (
( n == cint(final_number_of_depreciations) - 1
n == cint(final_number_of_depreciations) - 1 and flt(value_after_depreciation) != flt(finance_book.expected_value_after_useful_life)
and value_after_depreciation != finance_book.expected_value_after_useful_life ) or flt(value_after_depreciation) < flt(
) finance_book.expected_value_after_useful_life
or value_after_depreciation < finance_book.expected_value_after_useful_life
): ):
depreciation_amount += value_after_depreciation - finance_book.expected_value_after_useful_life depreciation_amount += flt(value_after_depreciation) - flt(
finance_book.expected_value_after_useful_life
)
skip_row = True skip_row = True
if flt(depreciation_amount, self.precision("gross_purchase_amount")) > 0: if flt(depreciation_amount, self.precision("gross_purchase_amount")) > 0:

2
erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
View File

@@ -83,7 +83,7 @@ class AssetCapitalization(StockController):
self.update_stock_ledger() self.update_stock_ledger()
self.make_gl_entries() self.make_gl_entries()
self.restore_consumed_asset_items() self.restore_consumed_asset_items()
def cancel_target_asset(self): def cancel_target_asset(self):
if self.entry_type == "Capitalization" and self.target_asset: if self.entry_type == "Capitalization" and self.target_asset:
asset_doc = frappe.get_doc("Asset", self.target_asset) asset_doc = frappe.get_doc("Asset", self.target_asset)