Merge branch 'develop'

erpnext/__version__.py

@@ -1 +1 @@
-__version__ = '4.15.0'
+__version__ = '4.15.1'

erpnext/hooks.py

@@ -4,7 +4,7 @@ app_publisher = "Web Notes 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 = "4.15.0"
+app_version = "4.15.1"
 
 error_report_email = "support@erpnext.com"
 

erpnext/public/js/transaction.js

@@ -411,7 +411,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
 				}
 			});
 			// if pricing rule set as blank from an existing value, apply price_list
-			if(existing_pricing_rule && !d.pricing_rule) {
+			if(!me.frm.doc.ignore_pricing_rule && existing_pricing_rule && !d.pricing_rule) {
 				me.apply_price_list(frappe.get_doc(d.doctype, d.name));
 			}
 		});

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "4.15.0"
+version = "4.15.1"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()