Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adapt overide of create_single_pdf to the fix made on report_webkit module for lp:1319109 and lp:1319095

pull/7/merge
Yannick Vaucher 2014-06-13 11:58:22 +02:00
parent dd6cd86fcd
commit a9a2f860fd
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
account_financial_report_webkit/report/webkit_parser_header_fix.py
View File

@ -32,6 +32,7 @@ import subprocess
import tempfile import tempfile
import time import time
import logging import logging
from functools import partial
from mako import exceptions from mako import exceptions
@ -90,8 +91,8 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
"""Call webkit in order to generate pdf""" """Call webkit in order to generate pdf"""
if not webkit_header: if not webkit_header:
webkit_header = report_xml.webkit_header webkit_header = report_xml.webkit_header
tmp_dir = tempfile.gettempdir() fd, out_filename = tempfile.mkstemp(suffix=".pdf",
out_filename = tempfile.mktemp(suffix=".pdf", prefix="webkit.tmp.") prefix="webkit.tmp.")
file_to_del = [out_filename] file_to_del = [out_filename]
if comm_path: if comm_path:
command = [comm_path] command = [comm_path]
@ -121,10 +122,10 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
count = 0 count = 0
for html in html_list: for html in html_list:
html_file = file(os.path.join(tmp_dir, str(time.time()) + str(count) +'.body.html'), 'w') with tempfile.NamedTemporaryFile(suffix="%d.body.html" %count,
count += 1 delete=False) as html_file:
html_file.write(html) count += 1
html_file.close() html_file.write(self._sanitize_html(html))
file_to_del.append(html_file.name) file_to_del.append(html_file.name)
command.append(html_file.name) command.append(html_file.name)
command.append(out_filename) command.append(out_filename)
@ -144,9 +145,9 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
if status: if status:
raise except_osv(_('Webkit error' ), raise except_osv(_('Webkit error' ),
_("The command 'wkhtmltopdf' failed with error code = %s. Message: %s") % (status, error_message)) _("The command 'wkhtmltopdf' failed with error code = %s. Message: %s") % (status, error_message))
pdf_file = open(out_filename, 'rb') with open(out_filename, 'rb') as pdf_file:
pdf = pdf_file.read() pdf = pdf_file.read()
pdf_file.close() os.close(fd)
finally: finally:
if stderr_fd is not None: if stderr_fd is not None:
os.close(stderr_fd) os.close(stderr_fd)
@ -160,20 +161,21 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
# override needed to keep the attachments' storing procedure # override needed to keep the attachments' storing procedure
def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None): def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None):
"""generate the PDF""" """generate the PDF"""
if context is None: if context is None:
context={} context={}
htmls = [] htmls = []
if report_xml.report_type != 'webkit': if report_xml.report_type != 'webkit':
return super(HeaderFooterTextWebKitParser,self).create_single_pdf(cursor, uid, ids, data, report_xml, context=context) return super(HeaderFooterTextWebKitParser,self).create_single_pdf(cursor, uid, ids, data, report_xml, context=context)
self.parser_instance = self.parser(cursor, parser_instance = self.parser(cursor,
uid, uid,
self.name2, self.name2,
context=context) context=context)
self.pool = pooler.get_pool(cursor.dbname) self.pool = pooler.get_pool(cursor.dbname)
objs = self.getObjects(cursor, uid, ids, context) objs = self.getObjects(cursor, uid, ids, context)
self.parser_instance.set_context(objs, data, ids, report_xml.report_type) parser_instance.set_context(objs, data, ids, report_xml.report_type)
template = False template = False
@ -190,7 +192,7 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
if not header and report_xml.header: if not header and report_xml.header:
raise except_osv( raise except_osv(
_('No header defined for this Webkit report!'), _('No header defined for this Webkit report!'),
_('Please set a header in company settings') _('Please set a header in company settings.')
) )
css = report_xml.webkit_header.css css = report_xml.webkit_header.css
@ -198,17 +200,18 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
css = '' css = ''
user = self.pool.get('res.users').browse(cursor, uid, uid) user = self.pool.get('res.users').browse(cursor, uid, uid)
translate_call = partial(self.translate_call, parser_instance)
#default_filters=['unicode', 'entity'] can be used to set global filter #default_filters=['unicode', 'entity'] can be used to set global filter
body_mako_tpl = mako_template(template) body_mako_tpl = mako_template(template)
helper = WebKitHelper(cursor, uid, report_xml.id, context) helper = WebKitHelper(cursor, uid, report_xml.id, context)
if report_xml.precise_mode: if report_xml.precise_mode:
for obj in objs: for obj in objs:
self.parser_instance.localcontext['objects'] = [obj] parser_instance.localcontext['objects'] = [obj]
try: try:
html = body_mako_tpl.render(helper=helper, html = body_mako_tpl.render(helper=helper,
css=css, css=css,
_=self.translate_call, _=translate_call,
**self.parser_instance.localcontext) **parser_instance.localcontext)
htmls.append(html) htmls.append(html)
except Exception, e: except Exception, e:
msg = exceptions.text_error_template().render() msg = exceptions.text_error_template().render()
@ -218,8 +221,8 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
try: try:
html = body_mako_tpl.render(helper=helper, html = body_mako_tpl.render(helper=helper,
css=css, css=css,
_=self.translate_call, _=translate_call,
**self.parser_instance.localcontext) **parser_instance.localcontext)
htmls.append(html) htmls.append(html)
except Exception, e: except Exception, e:
msg = exceptions.text_error_template().render() msg = exceptions.text_error_template().render()
@ -234,8 +237,8 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
deb = body_mako_tpl.render(helper=helper, deb = body_mako_tpl.render(helper=helper,
css=css, css=css,
_debug=tools.ustr("\n".join(htmls)), _debug=tools.ustr("\n".join(htmls)),
_=self.translate_call, _=translate_call,
**self.parser_instance.localcontext) **parser_instance.localcontext)
except Exception, e: except Exception, e:
msg = exceptions.text_error_template().render() msg = exceptions.text_error_template().render()
_logger.error(msg) _logger.error(msg)