From 632a45d82e60ba4179d8f6c9a36e511e97de9193 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:31:38 +0530 Subject: [PATCH 1/2] fix: handle zero salvage value case --- erpnext/assets/doctype/asset/asset.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 05d575ac822..dbef3d096c7 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -805,6 +805,9 @@ class Asset(AccountsController): return args.get("rate_of_depreciation") if self.flags.increase_in_asset_value_due_to_repair: + if not flt(args.get("expected_value_after_useful_life")): + return args.get("rate_of_depreciation") + value = flt(args.get("expected_value_after_useful_life")) / flt( args.get("value_after_depreciation") ) From ed42ed04d262a492291a4720a8af6a32661f993e Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:36:30 +0530 Subject: [PATCH 2/2] fix: make rate of depreciation mandatory --- erpnext/assets/doctype/asset/asset.py | 6 +++--- .../doctype/asset_finance_book/asset_finance_book.json | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index dbef3d096c7..243ad009050 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -804,10 +804,10 @@ class Asset(AccountsController): ): return args.get("rate_of_depreciation") - if self.flags.increase_in_asset_value_due_to_repair: - if not flt(args.get("expected_value_after_useful_life")): - return args.get("rate_of_depreciation") + if args.get("rate_of_depreciation") and not flt(args.get("expected_value_after_useful_life")): + return args.get("rate_of_depreciation") + if self.flags.increase_in_asset_value_due_to_repair: value = flt(args.get("expected_value_after_useful_life")) / flt( args.get("value_after_depreciation") ) diff --git a/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json b/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json index c269948b742..b86028a7621 100644 --- a/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json +++ b/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json @@ -86,7 +86,8 @@ "description": "In Percentage", "fieldname": "rate_of_depreciation", "fieldtype": "Percent", - "label": "Rate of Depreciation" + "label": "Rate of Depreciation (%)", + "mandatory_depends_on": "eval:doc.depreciation_method == 'Written Down Value'" }, { "fieldname": "salvage_value_percentage", @@ -117,7 +118,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-05-21 15:48:20.907250", + "modified": "2024-12-13 12:11:03.743209", "modified_by": "Administrator", "module": "Assets", "name": "Asset Finance Book",