nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 20:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51883 from frappe/mergify/bp/version-15-hotfix/pr-51830

Browse Source 
fix(manufacturing): consider process loss qty while validating the work order (backport #51830)
This commit is contained in:
ruthra kumar
2026-01-20 08:08:43 +05:30
committed by GitHub
parent 25112468bc 4418fb48a9
commit 6b61eabf61
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,7 +315,7 @@ class WorkOrder(Document):
def validate_work_order_against_so(self): def validate_work_order_against_so(self):
# already ordered qty # already ordered qty
ordered_qty_against_so = frappe.db.sql( ordered_qty_against_so = frappe.db.sql(
"""select sum(qty) from `tabWork Order` """select sum(qty - process_loss_qty) from `tabWork Order`
where production_item = %s and sales_order = %s and docstatus < 2 and status != 'Closed' and name != %s""", where production_item = %s and sales_order = %s and docstatus < 2 and status != 'Closed' and name != %s""",
(self.production_item, self.sales_order, self.name), (self.production_item, self.sales_order, self.name),
)[0][0] )[0][0]

2
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -1869,7 +1869,7 @@ def get_work_order_items(sales_order, for_raw_material_request=0):
if not for_raw_material_request: if not for_raw_material_request:
total_work_order_qty = flt( total_work_order_qty = flt(
qb.from_(wo) qb.from_(wo)
.select(Sum(wo.qty)) .select(Sum(wo.qty - wo.process_loss_qty))
.where( .where(
(wo.production_item == i.item_code) (wo.production_item == i.item_code)
& (wo.sales_order == so.name) & (wo.sales_order == so.name)