Merge branch 'develop' into item-attribute-validation-on-non-template-item
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.py b/erpnext/stock/doctype/item_attribute/item_attribute.py
index 7f00201..3764738 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.py
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.py
@@ -29,9 +29,18 @@
'''Validate that if there are existing items with attributes, they are valid'''
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):
+ # Get Item Variant Attribute details of variant items
+ items = frappe.db.sql("""
+ select
+ i.name, iva.attribute_value as value
+ from
+ `tabItem Variant Attribute` iva, `tabItem` i
+ where
+ iva.attribute = %(attribute)s
+ and iva.parent = i.name and
+ i.variant_of is not null and i.variant_of != ''""", {"attribute" : self.name}, as_dict=1)
+
+ for item in items:
if self.numeric_values:
validate_is_incremental(self, self.name, item.value, item.name)
else: