From 39bed3a65e2557d15d2275178120de941e66c536 Mon Sep 17 00:00:00 2001
From: Kevin Chan <kevin98gray@gmail.com>
Date: Mon, 12 Oct 2020 11:42:05 +0800
Subject: [PATCH] fix: Add null or empty checking to validation

This commit adds null or empty checking in the **Item Price** DocType's
`check_duplicates()`. This was done to fix a bug where some prices are
shown to be duplciates even though they aren't because they don't have
values in some fields.
---
 .../stock/doctype/item_price/item_price.py    | 52 +++++++++++++++----
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/erpnext/stock/doctype/item_price/item_price.py b/erpnext/stock/doctype/item_price/item_price.py
index 56efa09486b..f88b05cd20a 100644
--- a/erpnext/stock/doctype/item_price/item_price.py
+++ b/erpnext/stock/doctype/item_price/item_price.py
@@ -48,20 +48,52 @@ class ItemPrice(Document):
 				self.item_code,["item_name", "description"])
 
 	def check_duplicates(self):
-		conditions = "where item_code=%(item_code)s and price_list=%(price_list)s and name != %(name)s"
+		conditions = """
+			where
+				item_code = %(item_code)s
+				and price_list = %(price_list)s
+				and name != %(name)s
+		"""
 
-		for field in ['uom', 'valid_from',
-			'valid_upto', 'packing_unit', 'customer', 'supplier']:
+		for field in [
+			"uom",
+			"valid_from",
+			"valid_upto",
+			"packing_unit",
+			"customer",
+			"supplier",
+		]:
 			if self.get(field):
-				conditions += " and {0} = %({1})s".format(field, field)
+				conditions += " and {0} = %({0})s ".format(field)
+			else:
+				conditions += """
+						and (
+							isnull({0})
+							or {0} = ''
+						)
+					""".format(
+					field
+				)
 
-		price_list_rate = frappe.db.sql("""
-			SELECT price_list_rate
-			FROM `tabItem Price`
-			  {conditions} """.format(conditions=conditions), self.as_dict())
+		price_list_rate = frappe.db.sql(
+			"""
+				select
+					price_list_rate
+				from
+					`tabItem Price`
+				{conditions}
+			""".format(
+				conditions=conditions
+			),
+			self.as_dict(),
+		)
 
-		if price_list_rate :
-			frappe.throw(_("Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, UOM, Qty and Dates."), ItemPriceDuplicateItem)
+		if price_list_rate:
+			frappe.throw(_("""
+				Item Price appears multiple times based on
+				Price List, Supplier/Customer, Currency, Item, UOM, Qty,
+				and Dates.
+			"""), ItemPriceDuplicateItem,)
 
 	def before_save(self):
 		if self.selling: