Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 688dfe2..ef61354 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '5.1.5'
+__version__ = '5.1.6'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index fd2dbd7..30032f8 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -5,7 +5,7 @@
app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "5.1.5"
+app_version = "5.1.6"
error_report_email = "support@erpnext.com"
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 7d5b2ac..e8a772a 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -40,7 +40,7 @@
check_list.append(cstr(d.item_code))
if (frappe.db.get_value("Item", d.item_code, "is_stock_item") == 'Yes' or
- self.has_sales_bom(d.item_code)) and not d.warehouse:
+ self.has_product_bundle(d.item_code)) and not d.warehouse:
frappe.throw(_("Reserved warehouse required for stock item {0}").format(d.item_code))
# used for production plan
diff --git a/setup.py b/setup.py
index c0d29de..e7702e4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = "5.1.5"
+version = "5.1.6"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()