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.4'
+__version__ = '9.2.5'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/utils/xlsxutils.py

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

frappe/website/doctype/web_form/templates/web_form.html

@@ -369,7 +369,7 @@ window.web_form_settings = {
 <script type="text/javascript" src="/assets/js/web_form.min.js"></script>
 <script>
 {% if script is defined %}
-{{ script.decode('utf-8') }}
+{{ script }}
 {% endif %}
 </script>
 {% endblock %}

frappe/website/doctype/web_form/web_form.py

@@ -255,7 +255,7 @@ def get_context(context):
 
 			js_path = os.path.join(os.path.dirname(self.web_form_module.__file__), scrub(self.name) + '.js')
 			if os.path.exists(js_path):
-				context.script = frappe.render_template(open(js_path, 'r').read(), context)
+				context.script = frappe.render_template(open(js_path, 'r').read().decode('utf-8'), context)
 
 			css_path = os.path.join(os.path.dirname(self.web_form_module.__file__), scrub(self.name) + '.css')
 			if os.path.exists(css_path):