From 43ce6426492807c277eeace1c4495f8d1f4376c3 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 16 Nov 2015 16:50:53 +0530 Subject: [PATCH 1/5] [fix] Uncheck 'Is Production Item' if it is a non-stock item --- erpnext/stock/doctype/item/item.js | 2 ++ erpnext/stock/doctype/item/item.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index feb0213799b..739f934e180 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -87,6 +87,8 @@ frappe.ui.form.on("Item", { is_stock_item: function(frm) { erpnext.item.toggle_reqd(frm); + if(frm.doc.is_pro_applicable && !frm.doc.is_stock_item) + frm.set_value("is_pro_applicable", 0); }, has_variants: function(frm) { diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index c02d9f10cdf..1cbb33d95e2 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -311,7 +311,7 @@ class Item(WebsiteGenerator): def validate_item_type(self): if self.is_pro_applicable == 1 and self.is_stock_item==0: - frappe.throw(_("As Production Order can be made for this item, it must be a stock item.")) + self.is_pro_applicable = 0 if self.has_serial_no == 1 and self.is_stock_item == 0: msgprint(_("'Has Serial No' can not be 'Yes' for non-stock item"), raise_exception=1) From 94e90bddaab6db63d817711ad8ce2816a853ffa5 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 16 Nov 2015 17:01:12 +0530 Subject: [PATCH 2/5] [change-log] Added change log --- erpnext/change_log/current/v6_9_1.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 erpnext/change_log/current/v6_9_1.md diff --git a/erpnext/change_log/current/v6_9_1.md b/erpnext/change_log/current/v6_9_1.md new file mode 100644 index 00000000000..82e2d4ffab1 --- /dev/null +++ b/erpnext/change_log/current/v6_9_1.md @@ -0,0 +1,4 @@ +- Invoice Outstanding calculation fixed related to advance +- Show Close button only for users with Submit rights and for Delivery Note and Purchase Receipt, only if it is returned +- Don't show Receive for a Purchase Order having non-stock items +- Leave Allocation, Application and Balance report cleanup and fixes \ No newline at end of file From 6f7cd47ac620c96529bec77e13b301a90bf80619 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 16 Nov 2015 17:01:12 +0530 Subject: [PATCH 3/5] [change-log] Added change log --- erpnext/change_log/v6/v6_9_1.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 erpnext/change_log/v6/v6_9_1.md diff --git a/erpnext/change_log/v6/v6_9_1.md b/erpnext/change_log/v6/v6_9_1.md new file mode 100644 index 00000000000..82e2d4ffab1 --- /dev/null +++ b/erpnext/change_log/v6/v6_9_1.md @@ -0,0 +1,4 @@ +- Invoice Outstanding calculation fixed related to advance +- Show Close button only for users with Submit rights and for Delivery Note and Purchase Receipt, only if it is returned +- Don't show Receive for a Purchase Order having non-stock items +- Leave Allocation, Application and Balance report cleanup and fixes \ No newline at end of file From de46fd62d8cfb3b573757a878619e80aa0ec91ee Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 16 Nov 2015 17:06:51 +0530 Subject: [PATCH 4/5] Delete v6_9_1.md --- erpnext/change_log/current/v6_9_1.md | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 erpnext/change_log/current/v6_9_1.md diff --git a/erpnext/change_log/current/v6_9_1.md b/erpnext/change_log/current/v6_9_1.md deleted file mode 100644 index 82e2d4ffab1..00000000000 --- a/erpnext/change_log/current/v6_9_1.md +++ /dev/null @@ -1,4 +0,0 @@ -- Invoice Outstanding calculation fixed related to advance -- Show Close button only for users with Submit rights and for Delivery Note and Purchase Receipt, only if it is returned -- Don't show Receive for a Purchase Order having non-stock items -- Leave Allocation, Application and Balance report cleanup and fixes \ No newline at end of file From 6826ca19b174fe94cc3fb7309a2ffca3c9aad334 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 16 Nov 2015 17:37:38 +0600 Subject: [PATCH 5/5] bumped to version 6.9.1 --- 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 ce580166c84..10b867833a7 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.9.0' +__version__ = '6.9.1' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 7dd0628f195..8eb0b25a060 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -29,7 +29,7 @@ blogs. """ app_icon = "icon-th" app_color = "#e74c3c" -app_version = "6.9.0" +app_version = "6.9.1" app_email = "info@erpnext.com" app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" diff --git a/setup.py b/setup.py index 600693f9fca..290f13fe0d5 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "6.9.0" +version = "6.9.1" with open("requirements.txt", "r") as f: install_requires = f.readlines()