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

[IMP] Add the possiblity to get the template from an absolute path on the server

pull/744/head
Laurent Mignon 2016-10-04 09:52:00 +02:00 committed by Alexandre D. Díaz
parent 9aa0227c52
commit a4cea21ecc
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
report_py3o/models/ir_report.py
View File

@ -38,7 +38,8 @@ class ReportXml(models.Model):
size=128, size=128,
help=( help=(
"If the user does not provide a template this will be used " "If the user does not provide a template this will be used "
"it should be a relative path to root of YOUR module" "it should be a relative path to root of YOUR module "
"or an absolute path on your server."
)) ))
report_type = fields.Selection(selection_add=[('py3o', "Py3o")]) report_type = fields.Selection(selection_add=[('py3o', "Py3o")])

26
report_py3o/py3o_parser.py
View File

@ -88,16 +88,22 @@ class Py3oParser(report_sxw):
report_obj.py3o_template_id.py3o_template_data report_obj.py3o_template_id.py3o_template_data
) )
elif report_obj.py3o_template_fallback and report_obj.module: elif report_obj.py3o_template_fallback:
# if the default is defined tmpl_name = report_obj.py3o_template_fallback
flbk_filename = pkg_resources.resource_filename( flbk_filename = None
"openerp.addons.%s" % report_obj.module, if report_obj.module:
report_obj.py3o_template_fallback, # if the default is defined
) flbk_filename = pkg_resources.resource_filename(
if os.path.exists(flbk_filename): "openerp.addons.%s" % report_obj.module,
# and it exists on the fileystem tmpl_name,
with open(flbk_filename, 'r') as tmpl: )
tmpl_data = tmpl.read() elif os.path.isabs(tmpl_name):
# It is an absolute path
flbk_filename = os.path.normcase(os.path.normpath(tmpl_name))
if flbk_filename and os.path.exists(flbk_filename):
# and it exists on the fileystem
with open(flbk_filename, 'r') as tmpl:
tmpl_data = tmpl.read()
if tmpl_data is None: if tmpl_data is None:
# if for any reason the template is not found # if for any reason the template is not found