From 1cd049d824fc7490fc5cd0da020d1db181e6c079 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 13 Jul 2015 14:17:42 +0530 Subject: [PATCH 1/2] Sales BOM to Product Bundle rename changes --- erpnext/selling/doctype/sales_order/sales_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 7d5b2ac61d..e8a772a216 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/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 From 54ade0d26cfe34b8c35b530e39145defb11a1ad4 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 13 Jul 2015 14:56:23 +0600 Subject: [PATCH 2/2] bumped to version 5.1.6 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 688dfe225a..ef613540d1 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 fd2dbd7535..30032f8b49 100644 --- a/erpnext/hooks.py +++ b/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" diff --git a/setup.py b/setup.py index c0d29deeba..e7702e42c4 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()