From 0c261df33d1401d236b99213d3cd7a9fa0298a78 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 30 Jan 2018 16:11:08 +0100 Subject: [PATCH] [FIX] base: avoid conflict in xmlid name model: maintenance.fleet, field: category_id model: maintenance.fleet.category, field: id Remove check as should no longer be necessary --- odoo/addons/base/models/ir_model.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/odoo/addons/base/models/ir_model.py b/odoo/addons/base/models/ir_model.py index e45bf0037b2..50588e9f3e9 100644 --- a/odoo/addons/base/models/ir_model.py +++ b/odoo/addons/base/models/ir_model.py @@ -756,11 +756,8 @@ class IrModelFields(models.Model): # create a corresponding xml id module = field._module or self._context.get('module') if module: - model = self.env[field.model_name] - xmlid = 'field_%s_%s' % (model._table, field.name) - cr.execute("SELECT name FROM ir_model_data WHERE name=%s", (xmlid,)) - if cr.fetchone(): - xmlid = xmlid + "_" + str(record.id) + model_name = field.model_name.replace('.', '_') + xmlid = 'field_%s__%s' % (model_name, field.name) cr.execute(""" INSERT INTO ir_model_data (module, name, model, res_id, date_init, date_update) VALUES (%s, %s, %s, %s, (now() at time zone 'UTC'), (now() at time zone 'UTC')) """, (module, xmlid, record._name, record.id))