diff options
| author | Xavier Morel <xmo@tinyerp.com> | 2009-12-02 08:30:41 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@tinyerp.com> | 2009-12-02 08:30:41 +0100 |
| commit | 474af4cd6e6f00759589c4bee9cebf9d7d26b0d8 (patch) | |
| tree | a523111f8866f8a69afadbba01bc169d92485f0d /bin/report/interface.py | |
| parent | 70ab8c460759f70e738f795bb2d1954af1a8f1ec (diff) | |
| parent | 1aceca7a8ca7a5e080cfbdcb957ada583ec05185 (diff) | |
[merge] osx-shutdown-fix branch into lxml-fixes
bzr revid: xmo@tinyerp.com-20091202073041-j5t9b0tm3m1znc5z
Diffstat (limited to 'bin/report/interface.py')
| -rw-r--r-- | bin/report/interface.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/report/interface.py b/bin/report/interface.py index e3804481e50..2bafcf3bb1a 100644 --- a/bin/report/interface.py +++ b/bin/report/interface.py @@ -86,14 +86,14 @@ class report_rml(report_int): def create(self, cr, uid, ids, datas, context): xml = self.create_xml(cr, uid, ids, datas, context) xml = tools.ustr(xml).encode('utf8') - if datas.get('report_type', 'pdf') == 'raw': - return xml + report_type = datas.get('report_type', 'pdf') + if report_type == 'raw': + return (xml,report_type) rml = self.create_rml(cr, xml, uid, context) pool = pooler.get_pool(cr.dbname) ir_actions_report_xml_obj = pool.get('ir.actions.report.xml') report_xml_ids = ir_actions_report_xml_obj.search(cr, uid, [('report_name', '=', self.name[7:])], context=context) self.title = report_xml_ids and ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name or 'OpenERP Report' - report_type = datas.get('report_type', 'pdf') create_doc = self.generators[report_type] pdf = create_doc(rml, title=self.title) return (pdf, report_type) |