mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-27 02:28:30 +00:00
fix: sales order is not valid when creating WO from MR from PP (#54435)
(cherry picked from commit e65b9fc2ae)
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
This commit is contained in:
@@ -425,6 +425,18 @@ class WorkOrder(Document):
|
|||||||
if self.production_plan_sub_assembly_item:
|
if self.production_plan_sub_assembly_item:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
production_item = self.production_item
|
||||||
|
|
||||||
|
if self.material_request_item and (
|
||||||
|
mr_plan_item := frappe.get_value(
|
||||||
|
"Material Request Item", self.material_request_item, "material_request_plan_item"
|
||||||
|
)
|
||||||
|
):
|
||||||
|
if main_item_code := frappe.get_value(
|
||||||
|
"Material Request Plan Item", mr_plan_item, "main_item_code"
|
||||||
|
):
|
||||||
|
production_item = main_item_code
|
||||||
|
|
||||||
if self.sales_order:
|
if self.sales_order:
|
||||||
self.check_sales_order_on_hold_or_close()
|
self.check_sales_order_on_hold_or_close()
|
||||||
|
|
||||||
@@ -445,8 +457,8 @@ class WorkOrder(Document):
|
|||||||
& (SalesOrder.docstatus == 1)
|
& (SalesOrder.docstatus == 1)
|
||||||
& (SalesOrder.name == self.sales_order)
|
& (SalesOrder.name == self.sales_order)
|
||||||
& (
|
& (
|
||||||
(SalesOrderItem.item_code == self.production_item)
|
(SalesOrderItem.item_code == production_item)
|
||||||
| (ProductBundleItem.item_code == self.production_item)
|
| (ProductBundleItem.item_code == production_item)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.run(as_dict=1)
|
.run(as_dict=1)
|
||||||
@@ -465,7 +477,7 @@ class WorkOrder(Document):
|
|||||||
& (SalesOrder.skip_delivery_note == 0)
|
& (SalesOrder.skip_delivery_note == 0)
|
||||||
& (SalesOrderItem.item_code == PackedItem.parent_item)
|
& (SalesOrderItem.item_code == PackedItem.parent_item)
|
||||||
& (SalesOrder.docstatus == 1)
|
& (SalesOrder.docstatus == 1)
|
||||||
& (PackedItem.item_code == self.production_item)
|
& (PackedItem.item_code == production_item)
|
||||||
)
|
)
|
||||||
.run(as_dict=1)
|
.run(as_dict=1)
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user