diff options
| author | Damien Bouvy <dbo@odoo.com> | 2015-01-26 15:41:24 +0100 |
|---|---|---|
| committer | Damien Bouvy <dbo@odoo.com> | 2015-02-02 17:32:34 +0100 |
| commit | 91b2ec771f00567f2dacfcae919087e2b1e72e4c (patch) | |
| tree | c1c9017b2444bb7ed62cc3be6d2812fcabaf371f | |
| parent | 21c6996d2abe5f80a9fb8793cff03e883934c20c (diff) | |
[IMP] report: in convert.py, allows to use the tag 'paperformat' in a report definition using the paperformat id
| -rw-r--r-- | openerp/import_xml.rng | 1 | ||||
| -rw-r--r-- | openerp/tools/convert.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng index b2f48538675..6ebfa1445a7 100644 --- a/openerp/import_xml.rng +++ b/openerp/import_xml.rng @@ -89,6 +89,7 @@ <rng:optional> <rng:attribute name="attachment" /> </rng:optional> <rng:optional> <rng:attribute name="attachment_use" /> </rng:optional> <rng:optional> <rng:attribute name="groups"/> </rng:optional> + <rng:optional> <rng:attribute name="paperformat"/> </rng:optional> <!-- `Usage` may help identify the best report for a certain task, for example usage="default" for reports that are attached by default in EDI exports --> diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py index 843e25bd604..426e43b9d0c 100644 --- a/openerp/tools/convert.py +++ b/openerp/tools/convert.py @@ -342,6 +342,10 @@ form: module.record_id""" % (xml_id,) group_id = self.id_get(cr, group) groups_value.append((4, group_id)) res['groups_id'] = groups_value + if rec.get('paperformat'): + pf_name = rec.get('paperformat') + pf_id = self.id_get(cr,pf_name) + res['paperformat_id'] = pf_id id = self.pool['ir.model.data']._update(cr, self.uid, "ir.actions.report.xml", self.module, res, xml_id, noupdate=self.isnoupdate(data_node), mode=self.mode) self.idref[xml_id] = int(id) |