Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.25.0'
+__version__ = '6.25.1'

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.25.0"
+app_version = "6.25.1"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"

erpnext/public/js/setup_wizard.js

@@ -24,12 +24,12 @@ function load_erpnext_slides() {
 					placeholder: __('e.g. "XYZ National Bank"'), reqd:1 },
 				{fieldname:'domain', label: __('Domain'), fieldtype:'Select',
 					options: [
-						__("Distribution"),
+						{"label": __("Distribution"), "value": "Distribution"},
-						__("Manufacturing"),
+						{"label": __("Manufacturing"), "value": "Manufacturing"},
-						__("Retail"),
+						{"label": __("Retail"), "value": "Retail"},
-						__("Services"),
+						{"label": __("Services"), "value": "Services"},
-						__("Education"),
+						{"label": __("Education"), "value": "Education"},
-						__("Other")
+						{"label": __("Other"), "value": "Other"},
 					], reqd:1},
 				{fieldname:'chart_of_accounts', label: __('Chart of Accounts'),
 					options: "", fieldtype: 'Select'},

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.25.0"
+version = "6.25.1"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(