From 963ddac528daa6ac9694757af704282f9bd22262 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 13 Feb 2024 09:40:57 +0530 Subject: [PATCH 1/3] fix: Adjust amount in last row due to rounding --- erpnext/assets/doctype/asset/asset.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 3fcb9720dd1..4560d098cd7 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -513,14 +513,14 @@ class Asset(AccountsController): ) # 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 - and value_after_depreciation != finance_book.expected_value_after_useful_life + and flt(value_after_depreciation) != flt(finance_book.expected_value_after_useful_life) ) - or value_after_depreciation < finance_book.expected_value_after_useful_life + or flt(value_after_depreciation) < flt(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 if flt(depreciation_amount, self.precision("gross_purchase_amount")) > 0: From e99485bfa7d78f99094b08d5147f02cc3921cb12 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 20 Feb 2024 11:57:06 +0530 Subject: [PATCH 2/3] fix: linter issues --- erpnext/assets/doctype/asset/asset.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 4560d098cd7..7f5e4debf29 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -514,13 +514,14 @@ class Asset(AccountsController): # Adjust depreciation amount in the last period based on the expected value after useful life if ( - ( - n == cint(final_number_of_depreciations) - 1 - and flt(value_after_depreciation) != flt(finance_book.expected_value_after_useful_life) - ) - or flt(value_after_depreciation) < flt(finance_book.expected_value_after_useful_life) + n == cint(final_number_of_depreciations) - 1 + and flt(value_after_depreciation) != flt(finance_book.expected_value_after_useful_life) + ) or flt(value_after_depreciation) < flt( + finance_book.expected_value_after_useful_life ): - depreciation_amount += flt(value_after_depreciation) - flt(finance_book.expected_value_after_useful_life) + depreciation_amount += flt(value_after_depreciation) - flt( + finance_book.expected_value_after_useful_life + ) skip_row = True if flt(depreciation_amount, self.precision("gross_purchase_amount")) > 0: From a4fbea3722ef61e7d79e8158629e564f6f32487a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 20 Feb 2024 12:31:34 +0530 Subject: [PATCH 3/3] fix: linter issue --- .../assets/doctype/asset_capitalization/asset_capitalization.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py index 8db401bcc59..2b5d8d0ffdd 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py @@ -83,7 +83,7 @@ class AssetCapitalization(StockController): self.update_stock_ledger() self.make_gl_entries() self.restore_consumed_asset_items() - + def cancel_target_asset(self): if self.entry_type == "Capitalization" and self.target_asset: asset_doc = frappe.get_doc("Asset", self.target_asset)