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

[minor] optimize item attribute validation for #5756

Browse Source
This commit is contained in:
Rushabh Mehta 2016-07-15 12:40:47 +05:30
parent cd2ee8940b
commit b8bdfbcead
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/controllers/item_variant.py
View File

@ -28,16 +28,14 @@ def get_variant(template, args, variant=None):
return find_variant(template, args, variant)
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()]}):
def validate_item_variant_attributes(item, args=None):
if not args:
args = {d.attribute:d.attribute_value for d in item.attributes}
(attribute_values.setdefault(t.parent.lower(), [])).append(t.attribute_value)
attribute_values = get_attribute_values()
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))
numeric_attributes = frappe._dict({d.attribute: d for d
in item.attributes if d.numeric_values==1})
for attribute, value in args.items():
if attribute.lower() in numeric_attributes:
@ -56,7 +54,7 @@ def validate_item_variant_attributes(item, args):
#avoid precision error by rounding the remainder
remainder = flt((flt(value) - from_range) % increment, precision)
is_incremental = remainder==0 or remainder==0 or remainder==increment
is_incremental = remainder==0 or remainder==increment
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}")\
@ -66,6 +64,16 @@ def validate_item_variant_attributes(item, args):
frappe.throw(_("Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values").format(
value, attribute), InvalidItemAttributeValueError)
def get_attribute_values():
if not frappe.flags.attribute_values:
attribute_values = {}
for t in frappe.get_all("Item Attribute Value", fields=["parent", "attribute_value"]):
(attribute_values.setdefault(t.parent.lower(), [])).append(t.attribute_value)
frappe.flags.attribute_values = attribute_values
return frappe.flags.attribute_values
def find_variant(template, args, variant_item_code=None):
conditions = ["""(iv_attribute.attribute="{0}" and iv_attribute.attribute_value="{1}")"""\
.format(frappe.db.escape(key), frappe.db.escape(cstr(value))) for key, value in args.items()]

6
erpnext/stock/doctype/item_attribute/item_attribute.py
View File

@ -6,7 +6,7 @@ import frappe
from frappe.model.document import Document
from frappe import _
from erpnext.controllers.item_variant import InvalidItemAttributeValueError
from erpnext.controllers.item_variant import validate_item_variant_attributes, InvalidItemAttributeValueError
class ItemAttributeIncrementError(frappe.ValidationError): pass
@ -24,9 +24,9 @@ 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 i.name from `tabItem Variant Attribute` iva, `tabItem` i
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):
frappe.get_doc('Item', item[0]).validate_variant_attributes()
validate_item_variant_attributes(frappe.get_doc('Item', item[0]))
def validate_numeric(self):
if self.numeric_values: