Merge branch 'develop'

This commit is contained in:
Anand Doshi 2015-10-22 21:59:21 +05:30
commit 0b59d1c78b
4 changed files with 4 additions and 3 deletions

View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = '6.6.2'
__version__ = '6.6.3'

View File

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

View File

@ -374,6 +374,7 @@ def create_items(args):
is_sales_item = args.get("is_sales_item_" + str(i))
is_purchase_item = args.get("is_purchase_item_" + str(i))
is_stock_item = item_group!=_("Services")
is_pro_applicable = item_group!=_("Services")
default_warehouse = ""
if is_stock_item:
default_warehouse = frappe.db.get_value("Warehouse", filters={

View File

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