From 6303f84d45fb47765461b8d95b8073cb46bb7a45 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 12 Nov 2015 18:11:38 +0530 Subject: [PATCH 1/3] [minor] fix test case --- erpnext/setup/setup_wizard/test_setup_wizard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/setup_wizard/test_setup_wizard.py b/erpnext/setup/setup_wizard/test_setup_wizard.py index d5dd6588cc7..59bf8bf7f9b 100644 --- a/erpnext/setup/setup_wizard/test_setup_wizard.py +++ b/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 From ca5b593e3898e91e87aae792665624a1dd1a2a34 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 12 Nov 2015 20:00:50 +0530 Subject: [PATCH 2/3] [hotfix] setup wizard tax rate --- erpnext/setup/setup_wizard/setup_wizard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py index 90856cade92..2289e267158 100644 --- a/erpnext/setup/setup_wizard/setup_wizard.py +++ b/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"), From 5f6546c8a53cb6613816c09f6e2e4d54f8fde072 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 12 Nov 2015 20:31:53 +0600 Subject: [PATCH 3/3] bumped to version 6.8.2 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 192f4a7f7b8..9e406d36e03 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.8.1' +__version__ = '6.8.2' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index a3c0194ee29..fd19dd3c211 100644 --- a/erpnext/hooks.py +++ b/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" diff --git a/setup.py b/setup.py index 2fbd4d3d5d2..5327ce769a2 100644 --- a/setup.py +++ b/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()