[FIX] ir_model: always setup models before calling _auto_init()

This commit is contained in:
Raphael Collet 2014-11-06 15:16:02 +01:00
parent e3580ab884
commit 3c203703db
1 changed files with 2 additions and 1 deletions

View File

@ -501,6 +501,7 @@ class ir_model_fields(osv.osv):
# we want to change the key of field in obj._fields and obj._columns
field = obj._pop_field(rename[1])
obj._add_field(rename[2], field)
self.pool.setup_models(cr, partial=(not self.pool.ready))
if patches:
# We have to update _columns of the model(s) and then call their
@ -521,11 +522,11 @@ class ir_model_fields(osv.osv):
obj._add_field(field_name, field.new(**attrs))
# update database schema
self.pool.setup_models(cr, partial=(not self.pool.ready))
obj._auto_init(cr, ctx)
obj._auto_end(cr, ctx) # actually create FKs!
if column_rename or patches:
self.pool.setup_models(cr, partial=(not self.pool.ready))
RegistryManager.signal_registry_change(cr.dbname)
return res