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-10-22 22:02:59 +05:30
commit b84ba868e6
4 changed files with 4 additions and 3 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__ = '6.6.3' __version__ = '6.6.4'

2
erpnext/hooks.py
View File

@ -29,7 +29,7 @@ blogs.
""" """
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "6.6.3" app_version = "6.6.4"
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"

1
erpnext/setup/page/setup_wizard/setup_wizard.py
View File

@ -392,6 +392,7 @@ def create_items(args):
"is_purchase_item": 1 if is_purchase_item else 0, "is_purchase_item": 1 if is_purchase_item else 0,
"show_in_website": 1, "show_in_website": 1,
"is_stock_item": is_stock_item and 1 or 0, "is_stock_item": is_stock_item and 1 or 0,
"is_pro_applicable": is_pro_applicable and 1 or 0,
"item_group": item_group, "item_group": item_group,
"stock_uom": args.get("item_uom_" + str(i)), "stock_uom": args.get("item_uom_" + str(i)),
"default_warehouse": default_warehouse "default_warehouse": default_warehouse

2
setup.py
View File

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