[MERGE] Sync with trunk, to benefit from freshly forward-ported 7.0 bugfixes.

bzr revid: tde@openerp.com-20130411082704-qce7e1moyo2sxz0c
bzr revid: tde@openerp.com-20130411141158-lk7lsf2haqbjit1u

diff --cc addons/mail/mail_alias.py
index 51f9d36,f806b32..8df7f03
--- 1/addons/mail/mail_alias.py
--- 2/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@@ -172,19 -164,17 +172,19 @@@ class mail_alias(osv.Model)
  
          registry = RegistryManager.get(cr.dbname)
          mail_alias = registry.get('mail.alias')
-         child_class_model = registry.get(child_model_name)
-         no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test': False})
+         child_class_model = registry[child_model_name]
+         no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test':False})
          # Use read() not browse(), to avoid prefetching uninitialized inherited fields
          for obj_data in child_class_model.read(cr, SUPERUSER_ID, no_alias_ids, [alias_key]):
 -            alias_vals = {'alias_name': '%s%s' % (alias_prefix, obj_data[alias_key]) }
 +            alias_vals = {'alias_name': False}
 +            if alias_generate_name:
 +                alias_vals['alias_name'] = '%s%s' % (alias_prefix, obj_data[alias_key])
              if alias_force_key:
                  alias_vals['alias_force_thread_id'] = obj_data[alias_force_key]
 -            alias_vals['alias_defaults'] = dict( (k, obj_data[v]) for k, v in alias_defaults.iteritems())
 -            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, alias_vals, model_name=child_model_name)
 +            alias_vals['alias_defaults'] = dict((k, obj_data[v]) for k, v in alias_defaults.iteritems())
 +            alias_id = mail_alias.create(cr, SUPERUSER_ID, alias_vals, {'alias_model_name': child_model_name})
              child_class_model.write(cr, SUPERUSER_ID, obj_data['id'], {'alias_id': alias_id})
 -            _logger.info('Mail alias created for %s %s (uid %s)', child_model_name, obj_data[alias_key], obj_data['id'])
 +            _logger.info('Mail alias created for %s %s (id %s)', child_model_name, obj_data[alias_key], obj_data['id'])
  
          # Finally attempt to reinstate the missing constraint
          try:

diff --cc addons/mail/mail_thread.py
Simple merge

diff --cc addons/mail/tests/test_mail_gateway.py
Simple merge