From 0406ad497fec251d5023a44d072df88007a90cc7 Mon Sep 17 00:00:00 2001 From: Marica Date: Tue, 21 Sep 2021 16:50:14 +0530 Subject: [PATCH] fix: (ux) Use subassembly schedule date while making WO from Prod Plan (#27628) - Set subassemply WO's planned start date from Production Plan (cherry picked from commit 9110223341321946699931dc45467f96427d8643) # Conflicts: # erpnext/manufacturing/doctype/production_plan/production_plan.py --- .../doctype/production_plan/production_plan.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py index 173c730bb31..300dbe66bfb 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py @@ -599,6 +599,21 @@ class ProductionPlan(Document): doc_list = [get_link_to_form(doctype, p) for p in doc_list] msgprint(_("{0} created").format(comma_and(doc_list))) +<<<<<<< HEAD +======= + def prepare_args_for_sub_assembly_items(self, row, args): + for field in ["production_item", "item_name", "qty", "fg_warehouse", + "description", "bom_no", "stock_uom", "bom_level", + "production_plan_item", "schedule_date"]: + args[field] = row.get(field) + + args.update({ + "use_multi_level_bom": 0, + "production_plan": self.name, + "production_plan_sub_assembly_item": row.name + }) + +>>>>>>> 9110223341 (fix: (ux) Use subassembly schedule date while making WO from Prod Plan (#27628)) def create_work_order(self, item): from erpnext.manufacturing.doctype.work_order.work_order import OverProductionError