Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.21.1'
+__version__ = '6.21.2'

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"

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
 
 

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(