From a05bd9300e22ddb991d31de9d7c4e609d0394305 Mon Sep 17 00:00:00 2001 From: ced <> Date: Mon, 16 Apr 2007 13:48:40 +0000 Subject: [PATCH] KERNEL/BASE: add tag header for report xml bzr revid: ced-8d83f844342fb6bc654289e8a1effd5dc4f40167 --- bin/addons/base/ir/ir_actions.py | 4 +++- bin/report/interface.py | 2 +- bin/tools/convert.py | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py index bc260d149fa..2297b949524 100644 --- a/bin/addons/base/ir/ir_actions.py +++ b/bin/addons/base/ir/ir_actions.py @@ -92,11 +92,13 @@ class report_xml(osv.osv): 'report_xml': fields.char('XML path', size=256), 'report_rml': fields.char('RML path', size=256), 'auto': fields.boolean('Automatic XSL:RML', required=True), - 'usage': fields.char('Action Usage', size=32) + 'usage': fields.char('Action Usage', size=32), + 'header': fields.boolean('Add RML header'), } _defaults = { 'type': lambda *a: 'ir.actions.report.xml', 'auto': lambda *a: True, + 'header': lambda *a: True, } report_xml() diff --git a/bin/report/interface.py b/bin/report/interface.py index 69d6f77c7a1..88036afcdc4 100644 --- a/bin/report/interface.py +++ b/bin/report/interface.py @@ -189,7 +189,7 @@ def register_all(db): cr.close() for r in result: if r['report_rml']: - report_sxw('report.'+r['report_name'], r['model'], opj('addons',r['report_rml'])) + report_sxw('report.'+r['report_name'], r['model'], opj('addons',r['report_rml']), header=r['header']) if r['report_xsl']: report_rml('report.'+r['report_name'], r['model'], opj('addons',r['report_xml']), r['report_xsl'] and opj('addons',r['report_xsl'])) diff --git a/bin/tools/convert.py b/bin/tools/convert.py index 8773228c97f..638c80111d7 100644 --- a/bin/tools/convert.py +++ b/bin/tools/convert.py @@ -132,6 +132,8 @@ class xml_import(object): res[dest] = rec.getAttribute(field).encode('utf8') if rec.hasAttribute('auto'): res['auto'] = eval(rec.getAttribute('auto')) + if rec.hasAttribute('header'): + res['header'] = eval(rec.getAttribute('header')) xml_id = rec.getAttribute('id').encode('utf8') id = self.pool.get('ir.model.data')._update(cr, self.uid, "ir.actions.report.xml", self.module, res, xml_id, mode=self.mode) self.idref[xml_id] = id