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

[FIX] reapply fixes from main branch

pull/7/merge
Guewen Baconnier @ Camptocamp 2012-12-11 14:53:10 +01:00
parent 641c106468
commit 407b53b644
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
account_financial_report_webkit/report/webkit_parser_header_fix.py
View File

@ -34,12 +34,12 @@ import time
import pooler import pooler
import tools import tools
import logging import logging
import openerp.addons
from mako import exceptions from mako import exceptions
from osv.osv import except_osv from osv.osv import except_osv
from tools.translate import _ from tools.translate import _
from openerp import addons
from openerp.addons.report_webkit import webkit_report from openerp.addons.report_webkit import webkit_report
from openerp.addons.report_webkit.webkit_report import mako_template from openerp.addons.report_webkit.webkit_report import mako_template
from openerp.addons.report_webkit.report_helper import WebKitHelper from openerp.addons.report_webkit.report_helper import WebKitHelper
@ -79,7 +79,6 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
webkit_header = report_xml.webkit_header webkit_header = report_xml.webkit_header
tmp_dir = tempfile.gettempdir() tmp_dir = tempfile.gettempdir()
out_filename = tempfile.mktemp(suffix=".pdf", prefix="webkit.tmp.") out_filename = tempfile.mktemp(suffix=".pdf", prefix="webkit.tmp.")
files = []
file_to_del = [out_filename] file_to_del = [out_filename]
if comm_path: if comm_path:
command = [comm_path] command = [comm_path]
@ -120,8 +119,8 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
file_to_del.append(stderr_path) file_to_del.append(stderr_path)
try: try:
status = subprocess.call(command, stderr=stderr_fd) status = subprocess.call(command, stderr=stderr_fd)
os.close(stderr_fd) # force flush os.close(stderr_fd) # ensure flush before reading
stderr_fd = None # avoid closing again in finally stderr_fd = None # avoid closing again in finally block
fobj = open(stderr_path, 'r') fobj = open(stderr_path, 'r')
error_message = fobj.read() error_message = fobj.read()
fobj.close() fobj.close()
@ -167,7 +166,7 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
template = False template = False
if report_xml.report_file : if report_xml.report_file :
path =openerp.addons.get_module_resource(report_xml.report_file) path = addons.get_module_resource(*report_xml.report_file.split(os.path.sep))
if os.path.exists(path) : if os.path.exists(path) :
template = file(path).read() template = file(path).read()
if not template and report_xml.report_webkit_data : if not template and report_xml.report_webkit_data :
@ -233,3 +232,4 @@ class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
bin = self.get_lib(cursor, uid) 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)
return (pdf, 'pdf') return (pdf, 'pdf')