From 4fcf7bf01aa8ba08d086c4eefb7887740b1dd58c Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 10 Feb 2016 14:16:01 +0530 Subject: [PATCH 1/2] [minor] Setup Wizard sample data: Clear Fiscal Year Error message --- erpnext/setup/setup_wizard/setup_wizard.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py index 049c1e95aa6..8b0189fd4f2 100644 --- a/erpnext/setup/setup_wizard/setup_wizard.py +++ b/erpnext/setup/setup_wizard/setup_wizard.py @@ -48,6 +48,10 @@ def setup_complete(args=None): make_sample_data() frappe.clear_cache() except FiscalYearError: + # clear message + if frappe.message_log: + frappe.message_log.pop() + pass From 477ddf9119bab7578ad830511f11aafcf79eb0b4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 10 Feb 2016 15:21:18 +0600 Subject: [PATCH 2/2] bumped to version 6.21.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 93c1037ea0d..087dba99935 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.21.1' +__version__ = '6.21.2' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 759e8201163..40b6903254b 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = """ERP made simple""" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "6.21.1" +app_version = "6.21.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 3754eb5be8c..f23c56540a8 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.21.1" +version = "6.21.2" requirements = parse_requirements("requirements.txt", session="") setup(