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 0000000000..82e2d4ffab
--- /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
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index feb0213799..739f934e18 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 c02d9f10cd..1cbb33d95e 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)