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

Allow Editing variant attribute in Variant. Add validation to check duplication.

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-08-06 15:24:35 +05:30
parent b9b49632f2
commit cdc060cb7c
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/item/item.js
View File

@ -224,7 +224,7 @@ $.extend(erpnext.item, {
method:"erpnext.stock.doctype.item.item.get_variant", method:"erpnext.stock.doctype.item.item.get_variant",
args: { args: {
"item": cur_frm.doc.name, "item": cur_frm.doc.name,
"param": d.get_values() "args": d.get_values()
}, },
callback: function(r) { callback: function(r) {
if (r.message) { if (r.message) {

18
erpnext/stock/doctype/item/item.py
View File

@ -65,6 +65,7 @@ class Item(WebsiteGenerator):
self.validate_has_variants() self.validate_has_variants()
self.validate_stock_for_template_must_be_zero() self.validate_stock_for_template_must_be_zero()
self.validate_template_attributes() self.validate_template_attributes()
self.validate_variant_attributes()
if not self.get("__islocal"): if not self.get("__islocal"):
self.old_item_group = frappe.db.get_value(self.doctype, self.name, "item_group") self.old_item_group = frappe.db.get_value(self.doctype, self.name, "item_group")
@ -338,6 +339,16 @@ class Item(WebsiteGenerator):
else: else:
attributes.append(d.attribute) attributes.append(d.attribute)
def validate_variant_attributes(self):
if self.variant_of:
args = {}
for d in self.attributes:
args[d.attribute] = d.attribute_value
variant = get_variant(self.variant_of, args)
if variant and not variant[0][0] == self.name:
frappe.throw(_("Item variant {0} exists with same attributes".format(variant[0][0]) ))
def validate_end_of_life(item_code, end_of_life=None, verbose=1): def validate_end_of_life(item_code, end_of_life=None, verbose=1):
if not end_of_life: if not end_of_life:
end_of_life = frappe.db.get_value("Item", item_code, "end_of_life") end_of_life = frappe.db.get_value("Item", item_code, "end_of_life")
@ -471,8 +482,9 @@ def check_stock_uom_with_bin(item, stock_uom):
use 'UOM Replace Utility' tool under Stock module.").format(item)) use 'UOM Replace Utility' tool under Stock module.").format(item))
@frappe.whitelist() @frappe.whitelist()
def get_variant(item, param): def get_variant(item, args):
args = json.loads(param) if not type(args) == dict:
args = json.loads(args)
attributes = {} attributes = {}
numeric_attributes = [] numeric_attributes = []
for t in frappe.db.get_all("Item Attribute Value", fields=["parent", "attribute_value"]): for t in frappe.db.get_all("Item Attribute Value", fields=["parent", "attribute_value"]):
@ -486,7 +498,7 @@ def get_variant(item, param):
values = frappe.db.sql("""select from_range, to_range, increment from `tabItem Template Attribute` \ values = frappe.db.sql("""select from_range, to_range, increment from `tabItem Template Attribute` \
where parent = %s and attribute = %s""", (item, d), as_dict=1)[0] where parent = %s and attribute = %s""", (item, d), as_dict=1)[0]
if (not values.from_range < args[d] < values.to_range) or ((args[d] - values.from_range) % values.increment != 0): if (not values.from_range < cint(args[d]) < values.to_range) or ((cint(args[d]) - values.from_range) % values.increment != 0):
frappe.throw(_("Attribute value {0} for attribute {1} must be within range of {2} to {3} and in increments of {4}") frappe.throw(_("Attribute value {0} for attribute {1} must be within range of {2} to {3} and in increments of {4}")
.format(args[d], d, values.from_range, values.to_range, values.increment)) .format(args[d], d, values.from_range, values.to_range, values.increment))
else: else: