projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d91ba40
)
[FIX] Skip register reports that have xsl but no xml
author
Cecile Tonglet
<cto@openerp.com>
Fri, 30 Aug 2013 12:54:28 +0000
(14:54 +0200)
committer
Cecile Tonglet
<cto@openerp.com>
Fri, 30 Aug 2013 12:54:28 +0000
(14:54 +0200)
bzr revid: cto@openerp.com-
20130830125428
-s1ameps865er1r7f
openerp/addons/base/ir/ir_actions.py
patch
|
blob
|
history
diff --git
a/openerp/addons/base/ir/ir_actions.py
b/openerp/addons/base/ir/ir_actions.py
index
1b88f29
..
97996a1
100644
(file)
--- a/
openerp/addons/base/ir/ir_actions.py
+++ b/
openerp/addons/base/ir/ir_actions.py
@@
-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']))