Merge pull request #5748 from rohitwaghchaure/v7_timesheet_issue
[WIP] Timesheet overlap issue and fields rearranged
diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index 41b8b88..3ff3d88 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -28,16 +28,14 @@
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.lower():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.lower(): 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 @@
#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 @@
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()]
diff --git a/erpnext/patches/v7_0/make_is_group_fieldtype_as_check.py b/erpnext/patches/v7_0/make_is_group_fieldtype_as_check.py
index aef0306..ba82e86 100644
--- a/erpnext/patches/v7_0/make_is_group_fieldtype_as_check.py
+++ b/erpnext/patches/v7_0/make_is_group_fieldtype_as_check.py
@@ -1,13 +1,18 @@
+from __future__ import unicode_literals
import frappe
def execute():
for doctype in ["Sales Person", "Customer Group", "Item Group", "Territory"]:
+
+ # convert to 1 or 0
+ frappe.db.sql("update `tab{doctype}` set is_group = if(is_group='Yes',1,0) "
+ .format(doctype=doctype))
+
+ frappe.db.commit()
+
+ # alter fields to int
+
+ frappe.db.sql("alter table `tab{doctype}` change is_group is_group int(1) default '0'"
+ .format(doctype=doctype))
frappe.reload_doctype(doctype)
-
- #In MySQL, you can't modify the same table which you use in the SELECT part.
-
- frappe.db.sql(""" update `tab{doctype}` set is_group = 1
- where name in (select parent_{field} from (select distinct parent_{field} from `tab{doctype}`
- where parent_{field} != '') as dummy_table)
- """.format(doctype=doctype, field=doctype.strip().lower().replace(' ','_')))
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.py b/erpnext/stock/doctype/item_attribute/item_attribute.py
index 7bcb21a..7529ef6 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.py
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.py
@@ -6,7 +6,7 @@
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 @@
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: