From 4635ef654cadc04f197df05eb901adca306914ff Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 9 Nov 2011 16:11:33 +0100 Subject: [PATCH] [FIX] always remove database ID from import-compatible exports bzr revid: xmo@openerp.com-20111109151133-xchgr9jr507jtv98 --- addons/web/controllers/main.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 74285b1f444..12c39d71a06 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1199,7 +1199,11 @@ class Export(View): fields = {} else: fields = self.fields_get(req, model) - fields['.id'] = fields.pop('id') if 'id' in fields else {'string': 'ID'} + + if import_compat: + fields.pop('id', None) + else: + fields['.id'] = fields.pop('id', {'string': 'ID'}) fields_sequence = sorted(fields.iteritems(), key=lambda field: field[1].get('string', '')) @@ -1249,7 +1253,6 @@ class Export(View): def fields_info(self, req, model, export_fields): info = {} fields = self.fields_get(req, model) - fields['.id'] = fields.pop('id') if 'id' in fields else {'string': 'ID'} # To make fields retrieval more efficient, fetch all sub-fields of a # given field at the same time. Because the order in the export list is