nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use bom source warehouse in WO created from PP

Browse Source 
(cherry picked from commit ebb4a3d053)

# Conflicts:
#	erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
#	erpnext/manufacturing/doctype/work_order/work_order.json
This commit is contained in:
Mihir Kandoi
2026-03-16 10:16:21 +05:30
committed by Mergify
parent 433dec8a6c
commit fe1ba48372
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -685,6 +685,7 @@ class ProductionPlan(Document):
"description": d.description, "description": d.description,
"stock_uom": d.stock_uom, "stock_uom": d.stock_uom,
"company": self.company, "company": self.company,
"source_warehouse": frappe.get_value("BOM", d.bom_no, "default_source_warehouse"),
"fg_warehouse": d.warehouse, "fg_warehouse": d.warehouse,
"production_plan": self.name, "production_plan": self.name,
"production_plan_item": d.name, "production_plan_item": d.name,
@@ -761,6 +762,7 @@ class ProductionPlan(Document):
continue continue
work_order_data = { work_order_data = {
"source_warehouse": frappe.get_value("BOM", row.bom_no, "default_source_warehouse"),
"wip_warehouse": default_warehouses.get("wip_warehouse"), "wip_warehouse": default_warehouses.get("wip_warehouse"),
"fg_warehouse": default_warehouses.get("fg_warehouse"), "fg_warehouse": default_warehouses.get("fg_warehouse"),
"scrap_warehouse": default_warehouses.get("scrap_warehouse"), "scrap_warehouse": default_warehouses.get("scrap_warehouse"),

4
erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
View File

@@ -234,7 +234,11 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-02-17 12:06:02.309032", "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", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Production Plan Sub Assembly Item", "name": "Production Plan Sub Assembly Item",

7
erpnext/manufacturing/doctype/work_order/work_order.json
View File

@@ -554,7 +554,8 @@
{ {
"fieldname": "production_plan_sub_assembly_item", "fieldname": "production_plan_sub_assembly_item",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Production Plan Sub-assembly Item", "hidden": 1,
"label": "Production Plan Sub Assembly Item",
"no_copy": 1, "no_copy": 1,
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1
@@ -602,7 +603,11 @@
"image_field": "image", "image_field": "image",
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2025-06-21 00:55:45.916224", "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", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Work Order", "name": "Work Order",