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

Merge pull request #47382 from rohitwaghchaure/fixed-serial-batch-reservation-wo

Browse Source 
fix: serial batch from work order for fg
This commit is contained in:
rohitwaghchaure
2025-05-03 13:21:42 +05:30
committed by GitHub
parent 16306d1352 5225d4c318
commit fa1b706147
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/manufacturing/doctype/work_order/work_order.py
View File

@@ -1397,6 +1397,8 @@ class WorkOrder(Document):
def set_reserved_qty_for_wip_and_fg(self, stock_entry): def set_reserved_qty_for_wip_and_fg(self, stock_entry):
items = frappe._dict() items = frappe._dict()
stock_entry.reload()
if stock_entry.purpose == "Manufacture" and self.sales_order: if stock_entry.purpose == "Manufacture" and self.sales_order:
items = self.get_finished_goods_for_reservation(stock_entry) items = self.get_finished_goods_for_reservation(stock_entry)
elif stock_entry.purpose == "Material Transfer for Manufacture": elif stock_entry.purpose == "Material Transfer for Manufacture":
@@ -1439,7 +1441,10 @@ class WorkOrder(Document):
items = frappe._dict() items = frappe._dict()
so_details = self.get_so_details() so_details = self.get_so_details()
qty = so_details.stock_qty - so_details.stock_reserved_qty if not so_details:
return items
qty = so_details.stock_qty - (so_details.stock_reserved_qty + so_details.delivered_qty)
if not qty: if not qty:
return items return items
@@ -1462,6 +1467,7 @@ class WorkOrder(Document):
"from_voucher_no": stock_entry.name, "from_voucher_no": stock_entry.name,
"from_voucher_type": stock_entry.doctype, "from_voucher_type": stock_entry.doctype,
"from_voucher_detail_no": row.name, "from_voucher_detail_no": row.name,
"serial_and_batch_bundles": [row.serial_and_batch_bundle],
} }
) )
else: else:
@@ -1476,9 +1482,8 @@ class WorkOrder(Document):
"parent": self.sales_order, "parent": self.sales_order,
"item_code": self.production_item, "item_code": self.production_item,
"docstatus": 1, "docstatus": 1,
"stock_reserved_qty": 0,
}, },
["name", "stock_qty", "stock_reserved_qty"], ["name", "stock_qty", "stock_reserved_qty", "delivered_qty"],
as_dict=1, as_dict=1,
) )

1
erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
View File

@@ -1093,6 +1093,7 @@ class StockReservation:
"Serial and Batch Entry", "Serial and Batch Entry",
fields=["serial_no", "batch_no", "qty"], fields=["serial_no", "batch_no", "qty"],
filters={"parent": ("in", serial_batch_bundles)}, filters={"parent": ("in", serial_batch_bundles)},
order_by="creation",
) )
for detail in bundle_details: for detail in bundle_details: