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

[IMP] ir.actions.report.xml: allow for a smoother transition for reports still declared the old way (in Python). 

bzr revid: vmt@openerp.com-20130222142400-qoomw17s2u8a73kh
This commit is contained in:
Vo Minh Thu 2013-02-22 15:24:00 +01:00
parent 1ce0db171d
commit 460cc6f755
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,27 +118,29 @@ class report_xml(osv.osv):
import os
opj = os.path.join
cr.execute("SELECT * FROM ir_act_report_xml WHERE report_name=%s", (name,))
new_report = None
for r in cr.dictfetchall():
if r['report_rml'] or r['report_rml_content_data']:
if r['parser']:
kwargs = { 'parser': operator.attrgetter(r['parser'])(openerp.addons) }
else:
kwargs = {}
new_report = report_sxw('report.'+r['report_name'], r['model'],
opj('addons',r['report_rml'] or '/'), header=r['header'], register=False, **kwargs)
elif r['report_xsl']:
new_report = report_rml('report.'+r['report_name'], r['model'],
opj('addons',r['report_xml']),
r['report_xsl'] and opj('addons',r['report_xsl']), register=False)
else:
# TODO:
# Temporarily, we look reports up the _reports dict.
# raise Exception, "Unhandled report type: %s" % r
pass
if new_report is None:
# First lookup in the deprecated place, because if the report definition
# has not been updated, it is more likely the correct definition is there.
if 'report.' + name in openerp.report.interface.report_int._reports:
new_report = openerp.report.interface.report_int._reports['report.' + name]
else:
cr.execute("SELECT * FROM ir_act_report_xml WHERE report_name=%s", (name,))
r = cr.dictfetchone()
if r:
if r['report_rml'] or r['report_rml_content_data']:
if r['parser']:
kwargs = { 'parser': operator.attrgetter(r['parser'])(openerp.addons) }
else:
kwargs = {}
new_report = report_sxw('report.'+r['report_name'], r['model'],
opj('addons',r['report_rml'] or '/'), header=r['header'], register=False, **kwargs)
elif r['report_xsl']:
new_report = report_rml('report.'+r['report_name'], r['model'],
opj('addons',r['report_xml']),
r['report_xsl'] and opj('addons',r['report_xsl']), register=False)
else:
raise Exception, "Unhandled report type: %s" % r
else:
raise Exception, "Required report does not exist: %s" % r
return new_report.create(cr, uid, ids, data, context)