Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.9.0'
+__version__ = '6.9.1'

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

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"

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

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)

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