nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 17:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2024-07-16 22:46:54 +05:30
parent 2ffe7d5838
commit cfab956811
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/assets/doctype/asset/asset.py
View File

@@ -161,11 +161,7 @@ class Asset(AccountsController):
def on_cancel(self): def on_cancel(self):
self.validate_cancellation() self.validate_cancellation()
self.cancel_movement_entries() self.cancel_movement_entries()
<<<<<<< HEAD
self.cancel_capitalization()
=======
self.reload() self.reload()
>>>>>>> 81e0b96c30 (fix: service item capitalization (#42188))
self.delete_depreciation_entries() self.delete_depreciation_entries()
cancel_asset_depr_schedules(self) cancel_asset_depr_schedules(self)
self.set_status() self.set_status()
@@ -527,19 +523,6 @@ class Asset(AccountsController):
movement = frappe.get_doc("Asset Movement", movement.get("name")) movement = frappe.get_doc("Asset Movement", movement.get("name"))
movement.cancel() movement.cancel()
<<<<<<< HEAD
def cancel_capitalization(self):
asset_capitalization = frappe.db.get_value(
"Asset Capitalization",
{"target_asset": self.name, "docstatus": 1, "entry_type": "Capitalization"},
)
if asset_capitalization:
asset_capitalization = frappe.get_doc("Asset Capitalization", asset_capitalization)
asset_capitalization.cancel()
=======
>>>>>>> 81e0b96c30 (fix: service item capitalization (#42188))
def delete_depreciation_entries(self): def delete_depreciation_entries(self):
if self.calculate_depreciation: if self.calculate_depreciation:
for row in self.get("finance_books"): for row in self.get("finance_books"):