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

chore: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-07-29 15:41:20 +05:30
committed by GitHub
parent 4524c74968
commit 59ac7aeb23
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,8 +20,6 @@ class AssetRepair(AccountsController):
self.set_stock_items_cost() self.set_stock_items_cost()
self.calculate_total_repair_cost() self.calculate_total_repair_cost()
<<<<<<< HEAD
=======
def validate_asset(self): def validate_asset(self):
if self.asset_doc.status in ("Sold", "Fully Depreciated", "Scrapped"): if self.asset_doc.status in ("Sold", "Fully Depreciated", "Scrapped"):
frappe.throw( frappe.throw(
@@ -36,7 +34,6 @@ class AssetRepair(AccountsController):
_("Completion Date can not be before Failure Date. Please adjust the dates accordingly.") _("Completion Date can not be before Failure Date. Please adjust the dates accordingly.")
) )
>>>>>>> 5a82b723c2 (fix: post gl entry on completion date of asset repair)
def update_status(self): def update_status(self):
if self.repair_status == "Pending": if self.repair_status == "Pending":
frappe.db.set_value("Asset", self.asset, "status", "Out of Order") frappe.db.set_value("Asset", self.asset, "status", "Out of Order")