CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-22 03:35:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2024-01-17 17:36:42 +05:30
committed by GitHub
parent 1dff96057c
commit 4edb73d398
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
View File

@@ -72,18 +72,13 @@ class AssetCapitalization(StockController):
self.update_target_asset() self.update_target_asset()
def on_cancel(self): def on_cancel(self):
<<<<<<< HEAD
self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Repost Item Valuation")
=======
self.ignore_linked_doctypes = ( self.ignore_linked_doctypes = (
"GL Entry", "GL Entry",
"Stock Ledger Entry", "Stock Ledger Entry",
"Repost Item Valuation", "Repost Item Valuation",
"Serial and Batch Bundle",
"Asset", "Asset",
) )
self.cancel_target_asset() self.cancel_target_asset()
>>>>>>> efe9f6656f (fix: Cancel asset capitalisation record on cancellation of asset and vice-versa)
self.update_stock_ledger() self.update_stock_ledger()
self.make_gl_entries() self.make_gl_entries()
self.restore_consumed_asset_items() self.restore_consumed_asset_items()