" + d.attribute + ": " + cstr(d.attribute_value) + "
" + +def make_variant_item_code(template, variant): + """Uses template's item code and abbreviations to make variant's item code""" + if variant.item_code: + return + + abbreviations = [] + for attr in variant.attributes: + item_attribute = frappe.db.sql("""select i.numeric_values, v.abbr + from `tabItem Attribute` i left join `tabItem Attribute Value` v + on (i.name=v.parent) + where i.name=%(attribute)s and v.attribute_value=%(attribute_value)s""", { + "attribute": attr.attribute, + "attribute_value": attr.attribute_value + }, as_dict=True) + + if not item_attribute: + # somehow an invalid item attribute got used + return + + if item_attribute[0].numeric_values: + # don't generate item code if one of the attributes is numeric + return + + abbreviations.append(item_attribute[0].abbr) + + if abbreviations: + variant.item_code = "{0}-{1}".format(template.item_code, "-".join(abbreviations)) + + if variant.item_code: + variant.item_name = variant.item_code diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index 7aa5a03897..06a115fa8d 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -231,7 +231,7 @@ $.extend(erpnext.item, { args = d.get_values(); if(!args) return; frappe.call({ - method:"erpnext.stock.doctype.item.item.get_variant", + method:"erpnext.controllers.item_variant.get_variant", args: { "item": cur_frm.doc.name, "args": d.get_values() @@ -253,7 +253,7 @@ $.extend(erpnext.item, { } else { d.hide(); frappe.call({ - method:"erpnext.stock.doctype.item.item.create_variant", + method:"erpnext.controllers.item_variant.create_variant", args: { "item": cur_frm.doc.name, "args": d.get_values() diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index d445582f72..d8d21ff09f 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -3,18 +3,15 @@ from __future__ import unicode_literals import frappe -import json from frappe import msgprint, _ from frappe.utils import cstr, flt, cint, getdate, now_datetime, formatdate from frappe.website.website_generator import WebsiteGenerator from erpnext.setup.doctype.item_group.item_group import invalidate_cache_for, get_parent_item_groups from frappe.website.render import clear_cache from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow +from erpnext.controllers.item_variant import get_variant, copy_attributes_to_variant, ItemVariantExistsError class WarehouseNotSet(frappe.ValidationError): pass -class ItemTemplateCannotHaveStock(frappe.ValidationError): pass -class ItemVariantExistsError(frappe.ValidationError): pass -class InvalidItemAttributeValueError(frappe.ValidationError): pass class Item(WebsiteGenerator): website = frappe._dict( @@ -63,8 +60,8 @@ class Item(WebsiteGenerator): self.validate_warehouse_for_reorder() self.update_item_desc() self.synced_with_hub = 0 + self.validate_has_variants() - # self.validate_stock_for_template_must_be_zero() self.validate_attributes() self.validate_variant_attributes() @@ -314,14 +311,6 @@ class Item(WebsiteGenerator): if frappe.db.exists("Item", {"variant_of": self.name}): frappe.throw(_("Item has variants.")) - def validate_stock_for_template_must_be_zero(self): - if self.has_variants: - stock_in = frappe.db.sql_list("""select warehouse from tabBin - where item_code=%s and (ifnull(actual_qty, 0) > 0 or ifnull(ordered_qty, 0) > 0 - or ifnull(reserved_qty, 0) > 0 or ifnull(indented_qty, 0) > 0 or ifnull(planned_qty, 0) > 0)""", self.name) - if stock_in: - frappe.throw(_("Item Template cannot have stock or Open Sales/Purchase/Production Orders."), ItemTemplateCannotHaveStock) - def validate_uom(self): if not self.get("__islocal"): check_stock_uom_with_bin(self.name, self.stock_uom) @@ -490,158 +479,3 @@ def check_stock_uom_with_bin(item, stock_uom): you have already made some transaction(s) with another UOM. To change default UOM, \ use 'UOM Replace Utility' tool under Stock module.").format(item)) -@frappe.whitelist() -def get_variant(item, args): - """Validates Attributes and their Values, then looks for an exactly matching Item Variant - - :param item: Template Item - :param args: A dictionary with "Attribute" as key and "Attribute Value" as value - """ - if isinstance(args, basestring): - args = json.loads(args) - - if not args: - frappe.throw(_("Please specify at least one attribute in the Attributes table")) - - validate_item_variant_attributes(item, args) - - return find_variant(item, args) - -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) - - numeric_attributes = frappe._dict((t.attribute, 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] - - from_range = numeric_attribute.from_range - to_range = numeric_attribute.to_range - increment = numeric_attribute.increment - - if increment == 0: - # defensive validation to prevent ZeroDivisionError - frappe.throw(_("Increment for Attribute {0} cannot be 0").format(attribute)) - - is_in_range = from_range <= flt(value) <= to_range - precision = len(cstr(increment).split(".")[-1].rstrip("0")) - #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 - - 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[attribute]: - frappe.throw(_("Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values").format( - value, attribute)) - -def find_variant(item, args): - 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()] - - conditions = " or ".join(conditions) - - # use approximate match and shortlist possible variant matches - # it is approximate because we are matching using OR condition - # and it need not be exact match at this stage - # this uses a simpler query instead of using multiple exists conditions - possible_variants = frappe.db.sql_list("""select name from `tabItem` item - where variant_of=%s and exists ( - select name from `tabItem Variant Attribute` iv_attribute - where iv_attribute.parent=item.name - and ({conditions}) - )""".format(conditions=conditions), item) - - for variant in possible_variants: - variant = frappe.get_doc("Item", variant) - - if len(args.keys()) == len(variant.get("attributes")): - # has the same number of attributes and values - # assuming no duplication as per the validation in Item - match_count = 0 - - for attribute, value in args.items(): - for row in variant.attributes: - if row.attribute==attribute and row.attribute_value== cstr(value): - # this row matches - match_count += 1 - break - - if match_count == len(args.keys()): - return variant.name - -@frappe.whitelist() -def create_variant(item, args): - if isinstance(args, basestring): - args = json.loads(args) - - variant = frappe.new_doc("Item") - variant_attributes = [] - for d in args: - variant_attributes.append({ - "attribute": d, - "attribute_value": args[d] - }) - - variant.set("attributes", variant_attributes) - template = frappe.get_doc("Item", item) - copy_attributes_to_variant(template, variant) - make_variant_item_code(template, variant) - - return variant - -def copy_attributes_to_variant(item, variant): - from frappe.model import no_value_fields - for field in item.meta.fields: - if field.fieldtype not in no_value_fields and (not field.no_copy)\ - and field.fieldname not in ("item_code", "item_name"): - if variant.get(field.fieldname) != item.get(field.fieldname): - variant.set(field.fieldname, item.get(field.fieldname)) - variant.variant_of = item.name - variant.has_variants = 0 - variant.show_in_website = 0 - if variant.attributes: - variant.description += "\n" - for d in variant.attributes: - variant.description += "" + d.attribute + ": " + cstr(d.attribute_value) + "
" - -def make_variant_item_code(template, variant): - """Uses template's item code and abbreviations to make variant's item code""" - if variant.item_code: - return - - abbreviations = [] - for attr in variant.attributes: - item_attribute = frappe.db.sql("""select i.numeric_values, v.abbr - from `tabItem Attribute` i left join `tabItem Attribute Value` v - on (i.name=v.parent) - where i.name=%(attribute)s and v.attribute_value=%(attribute_value)s""", { - "attribute": attr.attribute, - "attribute_value": attr.attribute_value - }, as_dict=True) - - if not item_attribute: - # somehow an invalid item attribute got used - return - - if item_attribute[0].numeric_values: - # don't generate item code if one of the attributes is numeric - return - - abbreviations.append(item_attribute[0].abbr) - - if abbreviations: - variant.item_code = "{0}-{1}".format(template.item_code, "-".join(abbreviations)) - - if variant.item_code: - variant.item_name = variant.item_code diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py index 916101516f..bd6fe285a1 100644 --- a/erpnext/stock/doctype/item/test_item.py +++ b/erpnext/stock/doctype/item/test_item.py @@ -6,8 +6,8 @@ import unittest import frappe from frappe.test_runner import make_test_records -from erpnext.stock.doctype.item.item import (WarehouseNotSet, create_variant, - ItemVariantExistsError, InvalidItemAttributeValueError) +from erpnext.stock.doctype.item.item import WarehouseNotSet +from erpnext.controllers.item_variant import create_variant, ItemVariantExistsError, InvalidItemAttributeValueError test_ignore = ["BOM"] test_dependencies = ["Warehouse"] @@ -132,7 +132,7 @@ class TestItem(unittest.TestCase): "attribute": "Test Size" }, { - "attribute": "Test Item Length", + "attribute": "Test Item Length", "numeric_values": 1, "from_range": 0.0, "to_range": 100.0, diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.py b/erpnext/stock/doctype/item_attribute/item_attribute.py index 8310288e47..f2d53451d0 100644 --- a/erpnext/stock/doctype/item_attribute/item_attribute.py +++ b/erpnext/stock/doctype/item_attribute/item_attribute.py @@ -41,6 +41,10 @@ class ItemAttribute(Document): abbrs.append(d.abbr) def validate_attribute_values(self): + # don't validate numeric values + if self.numeric_values: + return + attribute_values = [] for d in self.item_attribute_values: attribute_values.append(d.attribute_value) diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py index 797b2a0a89..33fc6586a2 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -8,7 +8,7 @@ from frappe import _ from frappe.utils import flt, getdate, add_days, formatdate from frappe.model.document import Document from datetime import date -from erpnext.stock.doctype.item.item import ItemTemplateCannotHaveStock +from erpnext.controllers.item_variant import ItemTemplateCannotHaveStock class StockFreezeError(frappe.ValidationError): pass