From 352642096e37f2035b3ba28d5a1a72f381531796 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 30 Jun 2025 10:12:54 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/assets/doctype/asset_repair/asset_repair.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index 3b73da133df..5cd9d522494 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -96,7 +96,6 @@ class AssetRepair(AccountsController): if self.get("stock_consumption") or self.get("capitalize_repair_cost"): self.asset_doc.flags.increase_in_asset_value_due_to_repair = True -<<<<<<< HEAD self.increase_asset_value() total_repair_cost = self.get_total_value_of_stock_consumed() @@ -132,17 +131,15 @@ class AssetRepair(AccountsController): ), ) - def before_cancel(self): -======= + def cancel_sabb(self): for row in self.stock_items: if sabb := row.serial_and_batch_bundle: row.db_set("serial_and_batch_bundle", None) doc = frappe.get_doc("Serial and Batch Bundle", sabb) doc.cancel() - - def on_cancel(self): ->>>>>>> ae77c609ff (fix: option to pick serial / batch for asset repair) + + def before_cancel(self): self.asset_doc = frappe.get_doc("Asset", self.asset) self.asset_doc.flags.increase_in_asset_value_due_to_repair = False