From fe1ba48372624e330496bac916d58bd2933cf9e1 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 16 Mar 2026 10:16:21 +0530 Subject: [PATCH] fix: use bom source warehouse in WO created from PP (cherry picked from commit ebb4a3d053f2c08b23552410dd8bffde45d19da7) # Conflicts: # erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json # erpnext/manufacturing/doctype/work_order/work_order.json --- .../doctype/production_plan/production_plan.py | 2 ++ .../production_plan_sub_assembly_item.json | 4 ++++ erpnext/manufacturing/doctype/work_order/work_order.json | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py index d2ca6ff73fd..6473dd96cff 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py @@ -685,6 +685,7 @@ class ProductionPlan(Document): "description": d.description, "stock_uom": d.stock_uom, "company": self.company, + "source_warehouse": frappe.get_value("BOM", d.bom_no, "default_source_warehouse"), "fg_warehouse": d.warehouse, "production_plan": self.name, "production_plan_item": d.name, @@ -761,6 +762,7 @@ class ProductionPlan(Document): continue work_order_data = { + "source_warehouse": frappe.get_value("BOM", row.bom_no, "default_source_warehouse"), "wip_warehouse": default_warehouses.get("wip_warehouse"), "fg_warehouse": default_warehouses.get("fg_warehouse"), "scrap_warehouse": default_warehouses.get("scrap_warehouse"), diff --git a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json index 9818beaa2c8..ebf807e78d1 100644 --- a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json +++ b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json @@ -234,7 +234,11 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], +<<<<<<< HEAD "modified": "2026-02-17 12:06:02.309032", +======= + "modified": "2026-03-16 10:28:41.879801", +>>>>>>> ebb4a3d053 (fix: use bom source warehouse in WO created from PP) "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Plan Sub Assembly Item", diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json index f1735ab64b5..8a0ec30d6bf 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.json +++ b/erpnext/manufacturing/doctype/work_order/work_order.json @@ -554,7 +554,8 @@ { "fieldname": "production_plan_sub_assembly_item", "fieldtype": "Data", - "label": "Production Plan Sub-assembly Item", + "hidden": 1, + "label": "Production Plan Sub Assembly Item", "no_copy": 1, "print_hide": 1, "read_only": 1 @@ -602,7 +603,11 @@ "image_field": "image", "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2025-06-21 00:55:45.916224", +======= + "modified": "2026-03-16 10:15:28.708688", +>>>>>>> ebb4a3d053 (fix: use bom source warehouse in WO created from PP) "modified_by": "Administrator", "module": "Manufacturing", "name": "Work Order",