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

Merge pull request #4991 from neilLasrado/develop

Browse Source 
Fixed Production Planning Tool
This commit is contained in:
Nabin Hait 2016-03-17 19:05:09 +05:30
commit 2e08e3e186
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,8 +135,7 @@ class ProductionPlanningTool(Document):
from `tabSales Order Item` so_item from `tabSales Order Item` so_item
where parent in (%s) and docstatus = 1 and qty > delivered_qty where parent in (%s) and docstatus = 1 and qty > delivered_qty
and exists (select * from `tabItem` item where item.name=so_item.item_code and exists (select * from `tabItem` item where item.name=so_item.item_code
and (item.is_pro_applicable = 1 and item.is_pro_applicable = 1) %s""" % \
or item.is_sub_contracted_item = 1)) %s""" % \
(", ".join(["%s"] * len(so_list)), item_condition), tuple(so_list), as_dict=1) (", ".join(["%s"] * len(so_list)), item_condition), tuple(so_list), as_dict=1)
if self.fg_item: if self.fg_item:
@ -150,8 +149,7 @@ class ProductionPlanningTool(Document):
and pi.parent_item = so_item.item_code and pi.parent_item = so_item.item_code
and so_item.parent in (%s) and so_item.qty > so_item.delivered_qty and so_item.parent in (%s) and so_item.qty > so_item.delivered_qty
and exists (select * from `tabItem` item where item.name=pi.item_code and exists (select * from `tabItem` item where item.name=pi.item_code
and (item.is_pro_applicable = 1 and item.is_pro_applicable = 1) %s""" % \
or item.is_sub_contracted_item = 1)) %s""" % \
(", ".join(["%s"] * len(so_list)), item_condition), tuple(so_list), as_dict=1) (", ".join(["%s"] * len(so_list)), item_condition), tuple(so_list), as_dict=1)
self.add_items(items + packed_items) self.add_items(items + packed_items)
@ -171,8 +169,7 @@ class ProductionPlanningTool(Document):
from `tabMaterial Request Item` mr_item from `tabMaterial Request Item` mr_item
where parent in (%s) and docstatus = 1 and qty > ordered_qty where parent in (%s) and docstatus = 1 and qty > ordered_qty
and exists (select * from `tabItem` item where item.name=mr_item.item_code and exists (select * from `tabItem` item where item.name=mr_item.item_code
and (item.is_pro_applicable = 1 and item.is_pro_applicable = 1) %s""" % \
or item.is_sub_contracted_item = 1)) %s""" % \
(", ".join(["%s"] * len(mr_list)), item_condition), tuple(mr_list), as_dict=1) (", ".join(["%s"] * len(mr_list)), item_condition), tuple(mr_list), as_dict=1)
self.add_items(items) self.add_items(items)