From 05808554a04d9892f575b96aaccfa057d3a58846 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 30 Oct 2017 13:42:49 +0530 Subject: [PATCH 1/3] [fix] Not able to export general ledger report's data in excel --- frappe/utils/xlsxutils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/utils/xlsxutils.py b/frappe/utils/xlsxutils.py index d4c4727299..c9ce1867f2 100644 --- a/frappe/utils/xlsxutils.py +++ b/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) From ba6d004fa6877581b369a7272454b992bf7afc5c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 31 Oct 2017 12:03:21 +0530 Subject: [PATCH 2/3] [fix] patch for domain settings --- frappe/patches.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/patches.txt b/frappe/patches.txt index e570a8d899..4dad6a7cd7 100644 --- a/frappe/patches.txt +++ b/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 From 60d89603e0d7ac248d0072fbc2528182ed40adda Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 31 Oct 2017 12:56:47 +0600 Subject: [PATCH 3/3] bumped to version 9.2.4 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index b12ae372bd..f09be0ecae 100644 --- a/frappe/__init__.py +++ b/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()