vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into develop

Browse source
This commit is contained in:
Saurabh 2017-10-31 12:26:48 +05:30
commit a5ffa5755a
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -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()

1
frappe/patches.txt
View file

@ -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

4
frappe/utils/xlsxutils.py
View file

@ -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)