From ac587b9c94c60e9ac436ba0da3b7b3a6fad47803 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 30 Jun 2025 10:55:56 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/assets/doctype/asset_repair/asset_repair.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index 5cd9d522494..c50b70adeca 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -131,14 +131,13 @@ class AssetRepair(AccountsController): ), ) - 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 before_cancel(self): self.asset_doc = frappe.get_doc("Asset", self.asset)