Forward port of branch saas-5 up to rev 4895281e

diff --cc addons/account_budget/account_budget.py
Simple merge

diff --cc openerp/addons/base/ir/ir_model.py
index b0c32cd,c8c7b77..e3de7fb
--- 1/openerp/addons/base/ir/ir_model.py
--- 2/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@@ -364,13 -359,13 +364,17 @@@ class ir_model_fields(osv.osv)
                  raise except_orm(_('Error'), _("Model %s does not exist!") % vals['relation'])
  
              if vals['model'] in self.pool:
 +                model = self.pool[vals['model']]
                  if vals['model'].startswith('x_') and vals['name'] == 'x_name':
 -                    self.pool[vals['model']]._rec_name = 'x_name'
 +                    model._rec_name = 'x_name'
+ 
+                 if self.pool.fields_by_model is not None:
+                     cr.execute('SELECT * FROM ir_model_fields WHERE id=%s', (res,))
+                     self.pool.fields_by_model.setdefault(vals['model'], []).append(cr.dictfetchone())
 -                self.pool[vals['model']].__init__(self.pool, cr)
 +                model.__init__(self.pool, cr)
 +                model._prepare_setup_fields(cr, SUPERUSER_ID)
 +                model._setup_fields(cr, SUPERUSER_ID)
 +
                  #Added context to _auto_init for special treatment to custom field for select_level
                  ctx = dict(context,
                      field_name=vals['name'],

diff --cc openerp/addons/base/tests/__init__.py
Simple merge

diff --cc openerp/tools/mail.py
Simple merge