From f667cff5a6719a10343bc7ff50f41b9846cd5fa8 Mon Sep 17 00:00:00 2001 From: dgarg007 Date: Sat, 2 Feb 2019 21:57:00 +0530 Subject: [PATCH 1/3] fix: Validation while getting raw materils for production in Production Plan --- .../doctype/production_plan/production_plan.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py index 6c84ef15ca..a2374c3701 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py @@ -568,7 +568,11 @@ def get_items_for_material_requests(doc, sales_order=None, company=None): item_details = get_subitems(doc, data, item_details, bom_no, company, include_non_stock_items, include_subcontracted_items, 1, planned_qty=planned_qty) else: - item_master = frappe.get_doc('Item', data['item_code']).as_dict() + if data['item_code']: + item_master = frappe.get_doc('Item', data['item_code']).as_dict() + else: + frappe.throw(_("Please select items in SELECT ITEMS section")) + purchase_uom = item_master.purchase_uom or item_master.stock_uom conversion_factor = 0 for d in item_master.get("uoms"): From d442d0694720a23278398f43429e01fccd684f4e Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Sun, 3 Feb 2019 12:45:20 +0530 Subject: [PATCH 2/3] Update production_plan.py --- .../manufacturing/doctype/production_plan/production_plan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py index a2374c3701..6b87cf3dbd 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py @@ -571,7 +571,7 @@ def get_items_for_material_requests(doc, sales_order=None, company=None): if data['item_code']: item_master = frappe.get_doc('Item', data['item_code']).as_dict() else: - frappe.throw(_("Please select items in SELECT ITEMS section")) + frappe.throw(_("Please select items first")) purchase_uom = item_master.purchase_uom or item_master.stock_uom conversion_factor = 0 From fe6f1ad2440130be171efdded86c9bcde71a889b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 5 Feb 2019 10:34:58 +0530 Subject: [PATCH 3/3] Update production_plan.py --- .../doctype/production_plan/production_plan.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py index 6b87cf3dbd..d17adf6369 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py @@ -567,12 +567,8 @@ def get_items_for_material_requests(doc, sales_order=None, company=None): else: item_details = get_subitems(doc, data, item_details, bom_no, company, include_non_stock_items, include_subcontracted_items, 1, planned_qty=planned_qty) - else: - if data['item_code']: - item_master = frappe.get_doc('Item', data['item_code']).as_dict() - else: - frappe.throw(_("Please select items first")) - + elif data.get('item_code'): + item_master = frappe.get_doc('Item', data['item_code']).as_dict() purchase_uom = item_master.purchase_uom or item_master.stock_uom conversion_factor = 0 for d in item_master.get("uoms"):