Techsystech
/
OCA_Reporting_engine_17.0
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] fallback to libreoffice conversion when no server is configured 

fixes #200
pull/347/head
Holger Brunn 2018-03-22 00:29:59 +01:00 committed by Laurent Mignon (ACSONE)
parent 9aa7f7249e
commit 095f710517
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
report_py3o/models/py3o_report.py
View File

@ -253,6 +253,9 @@ class Py3oReport(models.TransientModel):
out_stream.seek(0)
tmpl_data = out_stream.read()
if self.env.context.get('report_py3o_skip_conversion'):
return result_path
result_path = self._convert_single_report(
result_path, model_instance, data
)

12
report_py3o_fusion_server/models/py3o_report.py
View File

@ -32,8 +32,16 @@ class Py3oReport(models.TransientModel):
self.ensure_one()
report_xml = self.ir_actions_report_xml_id
filetype = report_xml.py3o_filetype
if report_xml.py3o_is_local_fusion:
result_path = super(Py3oReport, self)._create_single_report(
if not report_xml.py3o_server_id:
return super(Py3oReport, self)._create_single_report(
model_instance, data, save_in_attachment,
)
elif report_xml.py3o_is_local_fusion:
result_path = super(
Py3oReport, self.with_context(
report_py3o_skip_conversion=True,
)
)._create_single_report(
model_instance, data, save_in_attachment,
)
with closing(open(result_path, 'r')) as out_stream: