From f1983d510df46bb62d850b3aa72096a6504672ad Mon Sep 17 00:00:00 2001
From: mbauskar <mbauskar@gmail.com>
Date: Wed, 8 Mar 2017 12:26:31 +0530
Subject: [PATCH] [minor] custom field unique property fixes

---
 frappe/core/doctype/doctype/doctype.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 93bb041820..d1e14fa445 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -446,7 +446,8 @@ def validate_fields(meta):
 			if not d.get("__islocal"):
 				try:
 					has_non_unique_values = frappe.db.sql("""select `{fieldname}`, count(*)
-						from `tab{doctype}` group by `{fieldname}` having count(*) > 1 limit 1""".format(
+						from `tab{doctype}` where ifnull({fieldname}, '') != ''
+						group by `{fieldname}` having count(*) > 1 limit 1""".format(
 						doctype=d.parent, fieldname=d.fieldname))
 
 				except MySQLdb.OperationalError, e: