Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.8.1'
+__version__ = '6.8.2'

erpnext/hooks.py

@@ -29,7 +29,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.8.1"
+app_version = "6.8.2"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"

erpnext/setup/setup_wizard/setup_wizard.py

@@ -255,7 +255,7 @@ def create_taxes(args):
 	for i in xrange(1,6):
 		if args.get("tax_" + str(i)):
 			# replace % in case someone also enters the % symbol
-			tax_rate = (args.get("tax_rate_" + str(i)) or "").replace("%", "")
+			tax_rate = cstr(args.get("tax_rate_" + str(i)) or "").replace("%", "")
 
 			try:
 				tax_group = frappe.db.get_value("Account", {"company": args.get("company_name"),

erpnext/setup/setup_wizard/test_setup_wizard.py

@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.desk.page.setup_wizard.test_setup_data import args
+from erpnext.setup.setup_wizard.test_setup_data import args
 from frappe.desk.page.setup_wizard.setup_wizard import setup_complete
 import frappe.utils.scheduler
 

setup.py

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