Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: resolved conflict

Browse Source
This commit is contained in:
Nabin Hait 2024-02-21 11:38:21 +05:30 committed by GitHub
parent a0c0ab7709
commit 692867427c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,10 +148,7 @@ class AssetCapitalization(StockController):
def cancel_target_asset(self): def cancel_target_asset(self):
if self.entry_type == "Capitalization" and self.target_asset: if self.entry_type == "Capitalization" and self.target_asset:
asset_doc = frappe.get_doc("Asset", self.target_asset) asset_doc = frappe.get_doc("Asset", self.target_asset)
<<<<<<< HEAD
=======
asset_doc.db_set("capitalized_in", None) asset_doc.db_set("capitalized_in", None)
>>>>>>> 17f85de6fb (fix: Issues regarding asset cancellation and deletion)
if asset_doc.docstatus == 1: if asset_doc.docstatus == 1:
asset_doc.cancel() asset_doc.cancel()