schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-06-30 10:12:54 +05:30
committed by GitHub
parent ab61b46a01
commit 352642096e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,6 @@ class AssetRepair(AccountsController):
if self.get("stock_consumption") or self.get("capitalize_repair_cost"): if self.get("stock_consumption") or self.get("capitalize_repair_cost"):
self.asset_doc.flags.increase_in_asset_value_due_to_repair = True self.asset_doc.flags.increase_in_asset_value_due_to_repair = True
<<<<<<< HEAD
self.increase_asset_value() self.increase_asset_value()
total_repair_cost = self.get_total_value_of_stock_consumed() total_repair_cost = self.get_total_value_of_stock_consumed()
@@ -132,17 +131,15 @@ class AssetRepair(AccountsController):
), ),
) )
def before_cancel(self):
=======
def cancel_sabb(self): def cancel_sabb(self):
for row in self.stock_items: for row in self.stock_items:
if sabb := row.serial_and_batch_bundle: if sabb := row.serial_and_batch_bundle:
row.db_set("serial_and_batch_bundle", None) row.db_set("serial_and_batch_bundle", None)
doc = frappe.get_doc("Serial and Batch Bundle", sabb) doc = frappe.get_doc("Serial and Batch Bundle", sabb)
doc.cancel() doc.cancel()
def on_cancel(self): def before_cancel(self):
>>>>>>> ae77c609ff (fix: option to pick serial / batch for asset repair)
self.asset_doc = frappe.get_doc("Asset", self.asset) self.asset_doc = frappe.get_doc("Asset", self.asset)
self.asset_doc.flags.increase_in_asset_value_due_to_repair = False self.asset_doc.flags.increase_in_asset_value_due_to_repair = False