From 8be3b386b59dc8850cc9669aea4d3cdf71a3179c Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Fri, 13 Jun 2014 13:56:34 +0200 Subject: [PATCH] adapt generate_pdf to fixes on report_webkit --- .../report/webkit_parser_header_fix.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 d558d66f..4e97736e 100644 --- a/account_financial_report_webkit/report/webkit_parser_header_fix.py +++ b/account_financial_report_webkit/report/webkit_parser_header_fix.py @@ -88,7 +88,8 @@ def mako_template(text): class HeaderFooterTextWebKitParser(webkit_report.WebKitParser): - def generate_pdf(self, comm_path, report_xml, header, footer, html_list, webkit_header=False): + def generate_pdf(self, comm_path, report_xml, header, footer, html_list, + webkit_header=False, parser_instance=False): """Call webkit in order to generate pdf""" if not webkit_header: webkit_header = report_xml.webkit_header @@ -117,8 +118,8 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser): if webkit_header.format: command.extend(['--page-size', str(webkit_header.format).replace(',', '.')]) - if self.parser_instance.localcontext.get('additional_args', False): - for arg in self.parser_instance.localcontext['additional_args']: + if parser_instance.localcontext.get('additional_args', False): + for arg in parser_instance.localcontext['additional_args']: command.extend(arg) count = 0 @@ -248,5 +249,6 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser): raise except_osv(_('Webkit render'), msg) return (deb, 'html') bin = self.get_lib(cursor, uid) - pdf = self.generate_pdf(bin, report_xml, head, foot, htmls) + pdf = self.generate_pdf(bin, report_xml, head, foot, htmls, + parser_instance=parser_instance) return (pdf, 'pdf')