From 6500ef404daca020b3eebdb16f31ef1e3c7c7153 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Thu, 15 Dec 2016 18:24:32 +0530
Subject: [PATCH] [Fix] Timeout error in item attribute validation

---
 erpnext/controllers/item_variant.py           | 43 +++++++++++--------
 .../doctype/item_attribute/item_attribute.py  | 15 +++++--
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index ba1d2426cb..66b3dd0a94 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -41,30 +41,37 @@ def validate_item_variant_attributes(item, args=None):
 
 		if attribute.lower() in numeric_values:
 			numeric_attribute = numeric_values[attribute.lower()]
+			validate_is_incremental(numeric_attribute, attribute, value, item.name)
 
-			from_range = numeric_attribute.from_range
-			to_range = numeric_attribute.to_range
-			increment = numeric_attribute.increment
+		else:
+			attributes_list = attribute_values.get(attribute.lower(), [])
+			validate_item_attribute_value(attributes_list, attribute, value, item.name)
 
-			if increment == 0:
-				# defensive validation to prevent ZeroDivisionError
-				frappe.throw(_("Increment for Attribute {0} cannot be 0").format(attribute))
+def validate_is_incremental(numeric_attribute, attribute, value, item):
+	from_range = numeric_attribute.from_range
+	to_range = numeric_attribute.to_range
+	increment = numeric_attribute.increment
 
-			is_in_range = from_range <= flt(value) <= to_range
-			precision = max(len(cstr(v).split(".")[-1].rstrip("0")) for v in (value, increment))
-			#avoid precision error by rounding the remainder
-			remainder = flt((flt(value) - from_range) % increment, precision)
+	if increment == 0:
+		# defensive validation to prevent ZeroDivisionError
+		frappe.throw(_("Increment for Attribute {0} cannot be 0").format(attribute))
 
-			is_incremental = remainder==0 or remainder==increment
+	is_in_range = from_range <= flt(value) <= to_range
+	precision = max(len(cstr(v).split(".")[-1].rstrip("0")) for v in (value, increment))
+	#avoid precision error by rounding the remainder
+	remainder = flt((flt(value) - from_range) % increment, precision)
 
-			if not (is_in_range and is_incremental):
-				frappe.throw(_("Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4}")\
-					.format(attribute, from_range, to_range, increment, item.name),
-					InvalidItemAttributeValueError, title=_('Invalid Attribute'))
+	is_incremental = remainder==0 or remainder==increment
 
-		elif value not in attribute_values.get(attribute.lower(), []):
-			frappe.throw(_("Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2}").format(
-				value, attribute, item.name), InvalidItemAttributeValueError, title=_('Invalid Attribute'))
+	if not (is_in_range and is_incremental):
+		frappe.throw(_("Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4}")\
+			.format(attribute, from_range, to_range, increment, item),
+			InvalidItemAttributeValueError, title=_('Invalid Attribute'))
+
+def validate_item_attribute_value(attributes_list, attribute, attribute_value, item):
+	if attribute_value not in attributes_list:
+		frappe.throw(_("Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2}").format(
+			attribute_value, attribute, item), InvalidItemAttributeValueError, title=_('Invalid Attribute'))
 
 def get_attribute_values():
 	if not frappe.flags.attribute_values:
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.py b/erpnext/stock/doctype/item_attribute/item_attribute.py
index 3220bc5ba2..71b998fb95 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.py
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.py
@@ -6,7 +6,8 @@ import frappe
 from frappe.model.document import Document
 from frappe import _
 
-from erpnext.controllers.item_variant import validate_item_variant_attributes, InvalidItemAttributeValueError
+from erpnext.controllers.item_variant import (validate_is_incremental,
+	validate_item_attribute_value, InvalidItemAttributeValueError)
 
 
 class ItemAttributeIncrementError(frappe.ValidationError): pass
@@ -25,9 +26,15 @@ class ItemAttribute(Document):
 
 	def validate_exising_items(self):
 		'''Validate that if there are existing items with attributes, they are valid'''
-		for item in frappe.db.sql('''select distinct i.name from `tabItem Variant Attribute` iva, `tabItem` i
-			where iva.attribute = %s and iva.parent = i.name and i.has_variants = 0''', self.name):
-			validate_item_variant_attributes(item[0])
+		attributes_list = [d.attribute_value for d in self.item_attribute_values]
+
+		for item in frappe.db.sql('''select i.name, iva.attribute_value as value
+			from `tabItem Variant Attribute` iva, `tabItem` i where iva.attribute = %s
+			and iva.parent = i.name and i.has_variants = 0''', self.name, as_dict=1):
+			if self.numeric_values:
+				validate_is_incremental(self, self.name, item.value, item.name)
+			else:
+				validate_item_attribute_value(attributes_list, self.name, item.value, item.name)
 
 	def validate_numeric(self):
 		if self.numeric_values: