nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-08-05 15:06:57 +05:30
committed by GitHub
parent 497247d89a
commit 4f14651a42
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
View File

@@ -101,9 +101,6 @@ class AssetDepreciationSchedule(Document):
self.validate_asset() self.validate_asset()
self.db_set("status", "Active") self.db_set("status", "Active")
<<<<<<< HEAD
def before_cancel(self):
=======
def validate_asset(self): def validate_asset(self):
asset = frappe.get_doc("Asset", self.asset) asset = frappe.get_doc("Asset", self.asset)
if not asset.calculate_depreciation: if not asset.calculate_depreciation:
@@ -121,7 +118,6 @@ class AssetDepreciationSchedule(Document):
def on_cancel(self): def on_cancel(self):
self.db_set("status", "Cancelled") self.db_set("status", "Cancelled")
>>>>>>> a4628c2024 (fix: submit depreciation schedule only for submitted asset)
if not self.flags.should_not_cancel_depreciation_entries: if not self.flags.should_not_cancel_depreciation_entries:
self.cancel_depreciation_entries() self.cancel_depreciation_entries()