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

Merge pull request #50069 from frappe/mergify/bp/version-15-hotfix/pr-50027

Browse Source 
fix: reset raw materials considering not available batches (backport #50027)
This commit is contained in:
rohitwaghchaure
2025-10-14 13:21:03 +05:30
committed by GitHub
parent 5909b0e1a2 2184a28e91
commit 141b70ce8b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/subcontracting_controller.py
View File

@@ -637,7 +637,8 @@ class SubcontractingController(StockController):
if use_serial_batch_fields: if use_serial_batch_fields:
rm_obj.use_serial_batch_fields = 1 rm_obj.use_serial_batch_fields = 1
self.__set_batch_nos(bom_item, item_row, rm_obj, qty) if not self.flags.get("reset_raw_materials"):
self.__set_batch_nos(bom_item, item_row, rm_obj, qty)
if self.doctype == "Subcontracting Receipt": if self.doctype == "Subcontracting Receipt":
if not use_serial_batch_fields: if not use_serial_batch_fields:

1
erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
View File

@@ -195,6 +195,7 @@ class SubcontractingReceipt(SubcontractingController):
@frappe.whitelist() @frappe.whitelist()
def reset_raw_materials(self): def reset_raw_materials(self):
self.supplied_items = [] self.supplied_items = []
self.flags.reset_raw_materials = True
self.create_raw_materials_supplied() self.create_raw_materials_supplied()
def validate_closed_subcontracting_order(self): def validate_closed_subcontracting_order(self):