Merge branch 'master' into develop
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 4298574..93ce6d8 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.27.10'
+__version__ = '6.27.11'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 0baf604..d37c4be 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@
app_description = """ERP made simple"""
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "6.27.10"
+app_version = "6.27.11"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
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 a95948d..199a5a4 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -321,13 +321,13 @@
# Did not use qty_consumed_per_unit in the query, as it leads to rounding loss
for d in frappe.db.sql("""select fb.item_code,
ifnull(sum(fb.qty/ifnull(bom.quantity, 1)), 0) as qty,
- fb.description, fb.stock_uom, it.min_order_qty
- from `tabBOM Explosion Item` fb, `tabBOM` bom, `tabItem` it
+ fb.description, fb.stock_uom, item.min_order_qty
+ from `tabBOM Explosion Item` fb, `tabBOM` bom, `tabItem` item
where bom.name = fb.parent and it.name = fb.item_code
- and (is_sub_contracted_item = 0 or ifnull(default_bom, "")="")
- and is_stock_item = 1
+ and (item.is_sub_contracted_item = 0 or ifnull(item.default_bom, "")="")
+ and item.is_stock_item = 1
and fb.docstatus<2 and bom.name=%s
- group by item_code, stock_uom""", bom, as_dict=1):
+ group by fb.item_code, fb.stock_uom""", bom, as_dict=1):
bom_wise_item_details.setdefault(d.item_code, d)
else:
# Get all raw materials considering SA items as raw materials,
@@ -339,7 +339,7 @@
where bom.name = bom_item.parent and bom.name = %s and bom_item.docstatus < 2
and bom_item.item_code = item.name
and item.is_stock_item = 1
- group by item_code""", bom, as_dict=1):
+ group by bom_item.item_code""", bom, as_dict=1):
bom_wise_item_details.setdefault(d.item_code, d)
for item, item_details in bom_wise_item_details.items():
for so_qty in so_wise_qty:
diff --git a/setup.py b/setup.py
index cf95371..de74510 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
from pip.req import parse_requirements
-version = "6.27.10"
+version = "6.27.11"
requirements = parse_requirements("requirements.txt", session="")
setup(