From fc565ecd996da72e28b452598a784788008d299b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 26 Feb 2024 12:21:57 +0530 Subject: [PATCH] fix: resolved conflict --- .../doctype/asset_capitalization/asset_capitalization.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py index ca1d616be3..e27a492fa6 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py @@ -148,10 +148,7 @@ class AssetCapitalization(StockController): def cancel_target_asset(self): if self.entry_type == "Capitalization" and self.target_asset: asset_doc = frappe.get_doc("Asset", self.target_asset) -<<<<<<< HEAD -======= asset_doc.db_set("capitalized_in", None) ->>>>>>> 17f85de6fb (fix: Issues regarding asset cancellation and deletion) if asset_doc.docstatus == 1: asset_doc.cancel()