From 635559d9052b9c65a16e7ddf3ec92fc9fbfb5334 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 20:00:04 +0530 Subject: [PATCH] fix: handle expected_value_after_useful_life properly in asset value adjustment (backport #35117) (#35120) fix: handle expected_value_after_useful_life properly in asset value adjustment (#35117) (cherry picked from commit 80230fec3ef079b75825447a61836f8a9ce64f57) Co-authored-by: Anand Baburajan --- .../doctype/asset_value_adjustment/asset_value_adjustment.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py index 710c6cfacf3..f63773a8b7f 100644 --- a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py +++ b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py @@ -119,7 +119,9 @@ class AssetValueAdjustment(Document): if d.depreciation_method in ("Straight Line", "Manual"): end_date = max(s.schedule_date for s in asset.schedules if cint(s.finance_book_id) == d.idx) total_days = date_diff(end_date, self.date) - rate_per_day = flt(d.value_after_depreciation) / flt(total_days) + rate_per_day = flt(d.value_after_depreciation - d.expected_value_after_useful_life) / flt( + total_days + ) from_date = self.date else: no_of_depreciations = len(