odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] [FIX] report: Skip register reports that have xsl but no xml 

bzr revid: mat@openerp.com-20130911092947-4gy77vtgddpk1odh
This commit is contained in:
Martin Trigaux 2013-09-11 09:29:47 +00:00
parent c1ee146f7b 37ce63ef6f
commit 16293621dd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/addons/base/ir/ir_actions.py
View File

@ -100,7 +100,7 @@ class report_xml(osv.osv):
if r['report_rml'] or r['report_rml_content_data']:
report_sxw('report.'+r['report_name'], r['model'],
opj('addons',r['report_rml'] or '/'), header=r['header'])
if r['report_xsl']:
elif r['report_xsl'] and r['report_xml']:
report_rml('report.'+r['report_name'], r['model'],
opj('addons',r['report_xml']),
r['report_xsl'] and opj('addons',r['report_xsl']))