From 4edb73d398d921d76e860cb072b00af20c272cca Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 17 Jan 2024 17:36:42 +0530 Subject: [PATCH] fix: resolved merge conflict --- .../doctype/asset_capitalization/asset_capitalization.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py index 38c8de2beea..d0e77f8868a 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py @@ -72,18 +72,13 @@ class AssetCapitalization(StockController): self.update_target_asset() def on_cancel(self): -<<<<<<< HEAD - self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Repost Item Valuation") -======= self.ignore_linked_doctypes = ( "GL Entry", "Stock Ledger Entry", "Repost Item Valuation", - "Serial and Batch Bundle", "Asset", ) self.cancel_target_asset() ->>>>>>> efe9f6656f (fix: Cancel asset capitalisation record on cancellation of asset and vice-versa) self.update_stock_ledger() self.make_gl_entries() self.restore_consumed_asset_items()