Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '5.1.5'
+__version__ = '5.1.6'

erpnext/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd. and Contributors"
 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"
 

erpnext/selling/doctype/sales_order/sales_order.py

@@ -40,7 +40,7 @@ class SalesOrder(SellingController):
 			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

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()