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

Merge branch 'develop'

Browse Source
This commit is contained in:
Anand Doshi 2015-08-20 18:47:19 +05:30
commit f37884472d
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '5.7.4' __version__ = '5.7.5'

2
erpnext/hooks.py
View File

@ -27,7 +27,7 @@ blogs.
""" """
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "5.7.4" app_version = "5.7.5"
github_link = "https://github.com/frappe/erpnext" github_link = "https://github.com/frappe/erpnext"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

6
erpnext/patches/v5_7/item_template_attributes.py
View File

@ -65,6 +65,12 @@ def migrate_item_variants():
item_attributes = frappe.db.sql("""select distinct item_attribute, item_attribute_value item_attributes = frappe.db.sql("""select distinct item_attribute, item_attribute_value
from `tabItem Variant` where parent=%s""", item.name) 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 = {} attribute_value_options = {}
for attribute, value in item_attributes: for attribute, value in item_attributes:
attribute_value_options.setdefault(attribute, []).append(value) attribute_value_options.setdefault(attribute, []).append(value)

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

@ -64,7 +64,7 @@ class Item(WebsiteGenerator):
self.update_item_desc() self.update_item_desc()
self.synced_with_hub = 0 self.synced_with_hub = 0
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_attributes() self.validate_attributes()
self.validate_variant_attributes() self.validate_variant_attributes()

10
erpnext/stock/doctype/item/test_item.py
View File

@ -46,11 +46,11 @@ class TestItem(unittest.TestCase):
item = frappe.get_doc("Item", item_code) item = frappe.get_doc("Item", item_code)
return item return item
def test_template_cannot_have_stock(self): # def test_template_cannot_have_stock(self):
item = self.get_item(10) # item = self.get_item(10)
make_stock_entry(item_code=item.name, target="Stores - _TC", qty=1, basic_rate=1) # make_stock_entry(item_code=item.name, target="Stores - _TC", qty=1, basic_rate=1)
item.has_variants = 1 # item.has_variants = 1
self.assertRaises(ItemTemplateCannotHaveStock, item.save) # self.assertRaises(ItemTemplateCannotHaveStock, item.save)
def test_default_warehouse(self): def test_default_warehouse(self):
item = frappe.copy_doc(test_records[0]) item = frappe.copy_doc(test_records[0])

2
setup.py
View File

@ -1,6 +1,6 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
version = "5.7.4" version = "5.7.5"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()