From dabb11ab88720993a818003ae41a01913d7f5fcf Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Mon, 6 Jan 2014 14:36:00 +0100 Subject: [PATCH] [FIX] migrate_to_alias() of mail.alias didn't care about result value of _auto_init bzr revid: cto@openerp.com-20140106133600-o7a2p3pr1zlvjezb --- addons/hr_recruitment/hr_recruitment.py | 2 +- addons/mail/mail_alias.py | 4 +++- addons/mail/res_users.py | 2 +- addons/project/project.py | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 60b54df1aa1..5b798dc8cc1 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -479,7 +479,7 @@ class hr_job(osv.osv): if context is None: context = {} alias_context = dict(context, alias_model_name='hr.applicant') - self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job, self)._auto_init, + return self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job, self)._auto_init, self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=alias_context) def create(self, cr, uid, vals, context=None): diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py index 987ac32c76c..91ee6bd1f33 100644 --- a/addons/mail/mail_alias.py +++ b/addons/mail/mail_alias.py @@ -157,7 +157,7 @@ class mail_alias(osv.Model): alias_id_column.required = False # call _auto_init - child_model_auto_init_fct(cr, context=context) + result = child_model_auto_init_fct(cr, context=context) registry = RegistryManager.get(cr.dbname) mail_alias = registry.get('mail.alias') @@ -185,6 +185,8 @@ class mail_alias(osv.Model): # set back the unique alias_id constraint alias_id_column.required = True + return result + def create_unique_alias(self, cr, uid, vals, model_name=None, context=None): """Creates an email.alias record according to the values provided in ``vals``, with 2 alterations: the ``alias_name`` value may be suffixed in order to diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py index c6a935a62b7..3997188cd2b 100644 --- a/addons/mail/res_users.py +++ b/addons/mail/res_users.py @@ -60,7 +60,7 @@ class res_users(osv.Model): def _auto_init(self, cr, context=None): """ Installation hook: aliases, partner following themselves """ # create aliases for all users and avoid constraint errors - self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init, + return self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init, self._columns['alias_id'], 'login', alias_force_key='id', context=context) def create(self, cr, uid, data, context=None): diff --git a/addons/project/project.py b/addons/project/project.py index 8c72d38fbb8..2f8fb1a8204 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -83,7 +83,7 @@ class project(osv.osv): """ Installation hook: aliases, project.project """ # create aliases for all projects and avoid constraint errors alias_context = dict(context, alias_model_name='project.task') - self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(project, self)._auto_init, + return self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(project, self)._auto_init, self._columns['alias_id'], 'id', alias_prefix='project+', alias_defaults={'project_id':'id'}, context=alias_context) def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):