From 4a29a54804df8355c2ec277bb61cb6bf000923e3 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 24 Apr 2025 16:36:53 +0530 Subject: [PATCH] fix: update additional cost and total asset cost after asset repair (backport #47233) (#47235) fix: update additional cost and total asset cost after asset repair (#47233) * fix: add consumed stock's cost to the asset value after repair * fix: do not copy additional cost and total asset cost (cherry picked from commit ed8a8532e169b669d55380a3282b992b6117d7f8) Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> --- erpnext/assets/doctype/asset/asset.json | 4 +++- erpnext/assets/doctype/asset_repair/asset_repair.py | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json index cf3602ef966..83873f670ad 100644 --- a/erpnext/assets/doctype/asset/asset.json +++ b/erpnext/assets/doctype/asset/asset.json @@ -512,6 +512,7 @@ "fieldname": "total_asset_cost", "fieldtype": "Currency", "label": "Total Asset Cost", + "no_copy": 1, "options": "Company:company:default_currency", "read_only": 1 }, @@ -520,6 +521,7 @@ "fieldname": "additional_asset_cost", "fieldtype": "Currency", "label": "Additional Asset Cost", + "no_copy": 1, "options": "Company:company:default_currency", "read_only": 1 }, @@ -593,7 +595,7 @@ "link_fieldname": "target_asset" } ], - "modified": "2025-04-15 16:33:17.189524", + "modified": "2025-04-24 15:31:47.373274", "modified_by": "Administrator", "module": "Assets", "name": "Asset", diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index 4e73148828d..3938ae06b50 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -98,9 +98,11 @@ class AssetRepair(AccountsController): self.increase_asset_value() + total_repair_cost = self.get_total_value_of_stock_consumed() if self.capitalize_repair_cost: - self.asset_doc.total_asset_cost += self.repair_cost - self.asset_doc.additional_asset_cost += self.repair_cost + total_repair_cost += self.repair_cost + self.asset_doc.total_asset_cost += total_repair_cost + self.asset_doc.additional_asset_cost += total_repair_cost if self.get("stock_consumption"): self.check_for_stock_items_and_warehouse() @@ -139,9 +141,11 @@ class AssetRepair(AccountsController): self.decrease_asset_value() + total_repair_cost = self.get_total_value_of_stock_consumed() if self.capitalize_repair_cost: - self.asset_doc.total_asset_cost -= self.repair_cost - self.asset_doc.additional_asset_cost -= self.repair_cost + total_repair_cost += self.repair_cost + self.asset_doc.total_asset_cost -= total_repair_cost + self.asset_doc.additional_asset_cost -= total_repair_cost if self.get("capitalize_repair_cost"): self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry")