Merge branch 'develop'
This commit is contained in:
commit
f37884472d
@ -1,2 +1,2 @@
|
||||
from __future__ import unicode_literals
|
||||
__version__ = '5.7.4'
|
||||
__version__ = '5.7.5'
|
||||
|
@ -27,7 +27,7 @@ blogs.
|
||||
"""
|
||||
app_icon = "icon-th"
|
||||
app_color = "#e74c3c"
|
||||
app_version = "5.7.4"
|
||||
app_version = "5.7.5"
|
||||
github_link = "https://github.com/frappe/erpnext"
|
||||
|
||||
error_report_email = "support@erpnext.com"
|
||||
|
@ -65,6 +65,12 @@ def migrate_item_variants():
|
||||
item_attributes = frappe.db.sql("""select distinct item_attribute, item_attribute_value
|
||||
from `tabItem Variant` where parent=%s""", item.name)
|
||||
|
||||
if not item_attributes and not all_variants:
|
||||
item = frappe.get_doc("Item", item.name)
|
||||
item.has_variants = 0
|
||||
item.save()
|
||||
continue
|
||||
|
||||
attribute_value_options = {}
|
||||
for attribute, value in item_attributes:
|
||||
attribute_value_options.setdefault(attribute, []).append(value)
|
||||
|
@ -64,7 +64,7 @@ class Item(WebsiteGenerator):
|
||||
self.update_item_desc()
|
||||
self.synced_with_hub = 0
|
||||
self.validate_has_variants()
|
||||
self.validate_stock_for_template_must_be_zero()
|
||||
# self.validate_stock_for_template_must_be_zero()
|
||||
self.validate_attributes()
|
||||
self.validate_variant_attributes()
|
||||
|
||||
|
@ -46,11 +46,11 @@ class TestItem(unittest.TestCase):
|
||||
item = frappe.get_doc("Item", item_code)
|
||||
return item
|
||||
|
||||
def test_template_cannot_have_stock(self):
|
||||
item = self.get_item(10)
|
||||
make_stock_entry(item_code=item.name, target="Stores - _TC", qty=1, basic_rate=1)
|
||||
item.has_variants = 1
|
||||
self.assertRaises(ItemTemplateCannotHaveStock, item.save)
|
||||
# def test_template_cannot_have_stock(self):
|
||||
# item = self.get_item(10)
|
||||
# make_stock_entry(item_code=item.name, target="Stores - _TC", qty=1, basic_rate=1)
|
||||
# item.has_variants = 1
|
||||
# self.assertRaises(ItemTemplateCannotHaveStock, item.save)
|
||||
|
||||
def test_default_warehouse(self):
|
||||
item = frappe.copy_doc(test_records[0])
|
||||
|
Loading…
x
Reference in New Issue
Block a user