Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6592 from rohitwaghchaure/production_planning_issue

Browse Source 
[Fix] making of production order from material request with sales order, restirct validation validate_production_order_against_so in production order
This commit is contained in:
Nabin Hait 2016-10-10 17:10:49 +05:30 committed by GitHub
commit efd7c3e22b
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@ -58,7 +58,8 @@ class ProductionOrder(Document):
if so[0].project: if so[0].project:
self.project = so[0].project self.project = so[0].project
self.validate_production_order_against_so() if not self.material_request:
self.validate_production_order_against_so()
else: else:
frappe.throw(_("Sales Order {0} is not valid").format(self.sales_order)) frappe.throw(_("Sales Order {0} is not valid").format(self.sales_order))

29
erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
View File

@ -454,20 +454,21 @@ class ProductionPlanningTool(Document):
material_request.update({"material_request_type": item_wrapper.default_material_request_type}) material_request.update({"material_request_type": item_wrapper.default_material_request_type})
for sales_order, requested_qty in items_to_be_requested[item].items(): for sales_order, requested_qty in items_to_be_requested[item].items():
material_request.append("items", { if sales_order != 'No Sales Order':
"doctype": "Material Request Item", material_request.append("items", {
"__islocal": 1, "doctype": "Material Request Item",
"item_code": item, "__islocal": 1,
"item_name": item_wrapper.item_name, "item_code": item,
"description": item_wrapper.description, "item_name": item_wrapper.item_name,
"uom": item_wrapper.stock_uom, "description": item_wrapper.description,
"item_group": item_wrapper.item_group, "uom": item_wrapper.stock_uom,
"brand": item_wrapper.brand, "item_group": item_wrapper.item_group,
"qty": requested_qty, "brand": item_wrapper.brand,
"schedule_date": add_days(nowdate(), cint(item_wrapper.lead_time_days)), "qty": requested_qty,
"warehouse": self.purchase_request_for_warehouse, "schedule_date": add_days(nowdate(), cint(item_wrapper.lead_time_days)),
"sales_order": sales_order if sales_order!="No Sales Order" else None "warehouse": self.purchase_request_for_warehouse,
}) "sales_order": sales_order if sales_order!="No Sales Order" else None
})
material_request.flags.ignore_permissions = 1 material_request.flags.ignore_permissions = 1
material_request.submit() material_request.submit()