From f8928dc9999130fd53b8f6944adc2ca587143264 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 3 Nov 2017 14:21:27 +0530 Subject: [PATCH 1/5] [fix] Not able to export general ledger report's data if data has illegal characters --- frappe/utils/xlsxutils.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/utils/xlsxutils.py b/frappe/utils/xlsxutils.py index 462810e081..e74ecc9407 100644 --- a/frappe/utils/xlsxutils.py +++ b/frappe/utils/xlsxutils.py @@ -6,11 +6,12 @@ import frappe from frappe.utils import encode, cstr, cint, flt, comma_or import openpyxl +import re from openpyxl.styles import Font from openpyxl import load_workbook from six import StringIO, string_types - +ILLEGAL_CHARACTERS_RE = re.compile(r'[\000-\010]|[\013-\014]|[\016-\037]') # return xlsx file object def make_xlsx(data, sheet_name, wb=None): @@ -30,6 +31,10 @@ def make_xlsx(data, sheet_name, wb=None): else: value = item + if isinstance(item, string_types) and next(ILLEGAL_CHARACTERS_RE.finditer(value), None): + # Remove illegal characters from the string + value = re.sub(ILLEGAL_CHARACTERS_RE, '', value) + clean_row.append(value) ws.append(clean_row) From e9209151cf301f17521c5be0b9a6b8991e20401b Mon Sep 17 00:00:00 2001 From: pratu16x7 Date: Mon, 6 Nov 2017 09:58:05 +0530 Subject: [PATCH 2/5] [fix] setup complete state colors --- frappe/desk/page/setup_wizard/setup_wizard.js | 6 ++---- frappe/public/css/page.css | 7 ------- frappe/public/less/page.less | 8 -------- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js index bc4ce4f043..12ccc69cc3 100644 --- a/frappe/desk/page/setup_wizard/setup_wizard.js +++ b/frappe/desk/page/setup_wizard/setup_wizard.js @@ -237,7 +237,6 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { this.working_state_message = this.get_message( __("Setting Up"), __("Sit tight while your system is being setup. This may take a few moments."), - 'orange', true ).appendTo(this.parent); @@ -245,8 +244,7 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { this.current_slide = null; this.completed_state_message = this.get_message( __("Setup Complete"), - __("You're all set!"), - 'green' + __("You're all set!") ); } @@ -259,7 +257,7 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { const loading_html = loading ? '
' : `
-
`; diff --git a/frappe/public/css/page.css b/frappe/public/css/page.css index d856222fbc..3fae923d04 100644 --- a/frappe/public/css/page.css +++ b/frappe/public/css/page.css @@ -277,13 +277,6 @@ select.input-sm { opacity: 1; cursor: pointer; } -.page-card-container, -.setup-state { - background-color: #f5f7fa; -} -.page-container .page-card-container { - background-color: #fff; -} .page-card-container { padding: 70px; } diff --git a/frappe/public/less/page.less b/frappe/public/less/page.less index b9222ec835..0026d64fd2 100644 --- a/frappe/public/less/page.less +++ b/frappe/public/less/page.less @@ -335,14 +335,6 @@ select.input-sm { } } -.page-card-container, .setup-state { - background-color: #f5f7fa; -} - -.page-container .page-card-container { - background-color: #fff; -} - .page-card-container { padding: 70px; } From bdc87d437a287089ebcfc2fc8310f3f29426f2cf Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 6 Nov 2017 17:26:29 +0530 Subject: [PATCH 3/5] [fix] set skip_errors params from data import tool (#4438) --- frappe/core/page/data_import_tool/importer.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py index 083715b24d..a49110691b 100644 --- a/frappe/core/page/data_import_tool/importer.py +++ b/frappe/core/page/data_import_tool/importer.py @@ -41,6 +41,8 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, update_only = True if params.get('from_data_import'): from_data_import = params.get('from_data_import') + if not params.get('skip_errors'): + skip_errors = params.get('skip_errors') frappe.flags.mute_emails = no_email From 254043171e6c605e8e79eda2e4f49d58a4ac4424 Mon Sep 17 00:00:00 2001 From: ci2014 Date: Wed, 8 Nov 2017 07:07:56 +0100 Subject: [PATCH 4/5] Add no_letterhead to form_dict (#4444) no_letterhead in form_dict was missing --- frappe/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 7a68e56f6d..2dab5b194f 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1220,7 +1220,7 @@ def format(*args, **kwargs): import frappe.utils.formatters return frappe.utils.formatters.format_value(*args, **kwargs) -def get_print(doctype=None, name=None, print_format=None, style=None, html=None, as_pdf=False, doc=None, output = None): +def get_print(doctype=None, name=None, print_format=None, style=None, html=None, as_pdf=False, doc=None, output = None, no_letterhead = 0): """Get Print Format for given document. :param doctype: DocType of document. @@ -1236,6 +1236,7 @@ def get_print(doctype=None, name=None, print_format=None, style=None, html=None, local.form_dict.format = print_format local.form_dict.style = style local.form_dict.doc = doc + local.form_dict.no_letterhead = no_letterhead if not html: html = build_page("printview") From 8ef42b4ed6677ed265f21abd5c0d937ae66469a0 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 8 Nov 2017 12:33:43 +0600 Subject: [PATCH 5/5] bumped to version 9.2.7 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 2dab5b194f..0134829874 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.6' +__version__ = '9.2.7' __title__ = "Frappe Framework" local = Local()