mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-09 15:29:30 +00:00
fix: Work Order picks wrong Delivery Date when Sales Order has the same item in multiple rows (#58526)
This commit is contained in:
@@ -527,7 +527,7 @@ class WorkOrder(Document):
|
|||||||
PackedItem = frappe.qb.DocType("Packed Item")
|
PackedItem = frappe.qb.DocType("Packed Item")
|
||||||
ProductBundleItem = frappe.qb.DocType("Product Bundle Item")
|
ProductBundleItem = frappe.qb.DocType("Product Bundle Item")
|
||||||
|
|
||||||
so = (
|
so_query = (
|
||||||
frappe.qb.from_(SalesOrder)
|
frappe.qb.from_(SalesOrder)
|
||||||
.inner_join(SalesOrderItem)
|
.inner_join(SalesOrderItem)
|
||||||
.on(SalesOrderItem.parent == SalesOrder.name)
|
.on(SalesOrderItem.parent == SalesOrder.name)
|
||||||
@@ -543,9 +543,13 @@ class WorkOrder(Document):
|
|||||||
| (ProductBundleItem.item_code == production_item)
|
| (ProductBundleItem.item_code == production_item)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.run(as_dict=1)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if self.sales_order_item:
|
||||||
|
so_query = so_query.where(SalesOrderItem.name == self.sales_order_item)
|
||||||
|
|
||||||
|
so = so_query.run(as_dict=1)
|
||||||
|
|
||||||
if not so:
|
if not so:
|
||||||
so = (
|
so = (
|
||||||
frappe.qb.from_(SalesOrder)
|
frappe.qb.from_(SalesOrder)
|
||||||
|
|||||||
Reference in New Issue
Block a user