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

[odoo/odoo.git] / addons / mail / mail_alias.py

diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 51f9d36..8df7f03 100644 (file)
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -172,8 +172,8 @@ 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': False}