From 66ce2210f8262758adf6f1f763d0b5f62021a6a7 Mon Sep 17 00:00:00 2001 From: Jacques-Etienne Baudoux Date: Tue, 24 Dec 2013 13:55:19 +0100 Subject: [PATCH 1/2] [FIX] account_financial_report_webkit: force mako as jinja is new standard since saas-1 --- .../report/webkit_parser_header_fix.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/account_financial_report_webkit/report/webkit_parser_header_fix.py b/account_financial_report_webkit/report/webkit_parser_header_fix.py index 29d458ba..13d3acdc 100644 --- a/account_financial_report_webkit/report/webkit_parser_header_fix.py +++ b/account_financial_report_webkit/report/webkit_parser_header_fix.py @@ -41,7 +41,6 @@ from openerp import addons from openerp import pooler from openerp import tools from openerp.addons.report_webkit import webkit_report -from openerp.addons.report_webkit.webkit_report import mako_template from openerp.addons.report_webkit.report_helper import WebKitHelper _logger = logging.getLogger('financial.reports.webkit') @@ -71,6 +70,19 @@ _logger = logging.getLogger('financial.reports.webkit') # }) +# redefine mako_template as this is overriden by jinja since saas-1 +# from openerp.addons.report_webkit.webkit_report import mako_template +def mako_template(text): + """Build a Mako template. + + This template uses UTF-8 encoding + """ + from mako.template import Template + from mako.lookup import TemplateLookup + tmp_lookup = TemplateLookup() #we need it in order to allow inclusion and inheritance + return Template(text, input_encoding='utf-8', output_encoding='utf-8', lookup=tmp_lookup) + + class HeaderFooterTextWebKitParser(webkit_report.WebKitParser): def generate_pdf(self, comm_path, report_xml, header, footer, html_list, webkit_header=False): From c53e71aa5e76240045b92d49440bc91ef73f6324 Mon Sep 17 00:00:00 2001 From: Jacques-Etienne Baudoux Date: Tue, 14 Jan 2014 10:37:20 +0100 Subject: [PATCH 2/2] [FIX] moved imports out of the function --- .../report/webkit_parser_header_fix.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/account_financial_report_webkit/report/webkit_parser_header_fix.py b/account_financial_report_webkit/report/webkit_parser_header_fix.py index 13d3acdc..a6c24698 100644 --- a/account_financial_report_webkit/report/webkit_parser_header_fix.py +++ b/account_financial_report_webkit/report/webkit_parser_header_fix.py @@ -72,13 +72,14 @@ _logger = logging.getLogger('financial.reports.webkit') # redefine mako_template as this is overriden by jinja since saas-1 # from openerp.addons.report_webkit.webkit_report import mako_template +from mako.template import Template +from mako.lookup import TemplateLookup + def mako_template(text): """Build a Mako template. This template uses UTF-8 encoding """ - from mako.template import Template - from mako.lookup import TemplateLookup tmp_lookup = TemplateLookup() #we need it in order to allow inclusion and inheritance return Template(text, input_encoding='utf-8', output_encoding='utf-8', lookup=tmp_lookup)