Merge branch 'master' into staging

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '9.2.3'
+__version__ = '9.2.4'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/patches.txt

@@ -17,6 +17,7 @@ frappe.patches.v8_0.update_records_in_global_search #11-05-2017
 frappe.patches.v8_0.update_published_in_global_search
 execute:frappe.reload_doc('core', 'doctype', 'custom_docperm')
 execute:frappe.reload_doc('core', 'doctype', 'deleted_document')
+execute:frappe.reload_doc('core', 'doctype', 'domain_settings')
 execute:frappe.reload_doc('core', 'doctype', 'version') #2017-04-01
 frappe.patches.v8_0.rename_page_role_to_has_role #2017-03-16
 frappe.patches.v7_2.setup_custom_perms #2017-01-19

frappe/utils/xlsxutils.py

@@ -29,6 +29,10 @@ def make_xlsx(data, sheet_name, wb=None):
 				value = handle_html(item)
 			else:
 				value = item
+
+			if isinstance(value, basestring):
+				value = value.encode('unicode_escape').decode('utf-8')
+
 			clean_row.append(value)
 
 		ws.append(clean_row)