Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4664 from saurabh6790/variant_fixes

Browse Source 
[fixes] compare variants in lower case
This commit is contained in:
Nabin Hait 2016-01-21 16:06:42 +05:30
commit c5d41eb22a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/controllers/item_variant.py
View File

@ -32,15 +32,16 @@ def validate_item_variant_attributes(item, args):
attribute_values = {}
for t in frappe.get_all("Item Attribute Value", fields=["parent", "attribute_value"],
filters={"parent": ["in", args.keys()]}):
(attribute_values.setdefault(t.parent, [])).append(t.attribute_value)
(attribute_values.setdefault(t.parent.lower(), [])).append(t.attribute_value)
numeric_attributes = frappe._dict((t.attribute, t) for t in \
numeric_attributes = frappe._dict((t.attribute.lower(), t) for t in \
frappe.db.sql("""select attribute, from_range, to_range, increment from `tabItem Variant Attribute`
where parent = %s and numeric_values=1""", (item), as_dict=1))
for attribute, value in args.items():
if attribute in numeric_attributes:
numeric_attribute = numeric_attributes[attribute]
if attribute.lower() in numeric_attributes:
numeric_attribute = numeric_attributes[attribute.lower()]
from_range = numeric_attribute.from_range
to_range = numeric_attribute.to_range
@ -60,8 +61,8 @@ def validate_item_variant_attributes(item, args):
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}")\
.format(attribute, from_range, to_range, increment), InvalidItemAttributeValueError)
elif value not in attribute_values.get(attribute, []):
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").format(
value, attribute))