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:55:56 +05:30
committed by GitHub
parent 352642096e
commit ac587b9c94
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,14 +131,13 @@ class AssetRepair(AccountsController):
), ),
) )
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 before_cancel(self): def before_cancel(self):
self.asset_doc = frappe.get_doc("Asset", self.asset) self.asset_doc = frappe.get_doc("Asset", self.asset)