[fix] Production planning tool, unable to download material required report (#10704)
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
index 050c3c1..815e504 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -376,19 +376,20 @@
else:
bom_wise_item_details[d.item_code] = d
- if include_sublevel:
+ if include_sublevel and d.default_bom:
if ((d.default_material_request_type == "Purchase" and d.is_sub_contracted and supply_subs)
or (d.default_material_request_type == "Manufacture")):
my_qty = 0
projected_qty = self.get_item_projected_qty(d.item_code)
-
if self.create_material_requests_for_all_required_qty:
my_qty = d.qty
- elif (bom_wise_item_details[d.item_code].qty - d.qty) < projected_qty:
- my_qty = bom_wise_item_details[d.item_code].qty - projected_qty
else:
- my_qty = d.qty
+ total_required_qty = flt(bom_wise_item_details.get(d.item_code, frappe._dict()).qty)
+ if (total_required_qty - d.qty) < projected_qty:
+ my_qty = total_required_qty - projected_qty
+ else:
+ my_qty = d.qty
if my_qty > 0:
self.get_subitems(bom_wise_item_details,
@@ -483,14 +484,15 @@
return items_to_be_requested
def get_item_projected_qty(self,item):
+ conditions = ""
+ if self.purchase_request_for_warehouse:
+ conditions = " and warehouse='{0}'".format(frappe.db.escape(self.purchase_request_for_warehouse))
+
item_projected_qty = frappe.db.sql("""
select ifnull(sum(projected_qty),0) as qty
from `tabBin`
- where item_code = %(item_code)s and warehouse=%(warehouse)s
- """, {
- "item_code": item,
- "warehouse": self.purchase_request_for_warehouse
- }, as_dict=1)
+ where item_code = %(item_code)s {conditions}
+ """.format(conditions=conditions), { "item_code": item }, as_dict=1)
return item_projected_qty[0].qty