diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml index aeade8b672d..fd59c775882 100644 --- a/addons/hr_recruitment/hr_recruitment_demo.yml +++ b/addons/hr_recruitment/hr_recruitment_demo.yml @@ -1,12 +1,99 @@ - - !record {model: mail.alias, id: alias_id_1, view: False}: - alias_name: 'Developer@openerp.my.openerp.com' + !record {model: mail.alias, id: alias_job_devloper, view: False}: + alias_name: 'developer@openerp.my.openerp.com' alias_model_id: model_hr_applicant alias_user_id: base.user_root alias_defaults: '{}' +- + !python {model: mail.alias}: | + self.write(cr, uid, [ref('alias_job_devloper')], {"alias_defaults": {'job_id': ref('hr.job_developer')}}) - !record {model: hr.job, id: hr.job_developer, view: False}: - alias_id: alias_id_1 + alias_id: alias_job_devloper +- + !record {model: mail.alias, id: alias_job_ceo, view: False}: + alias_name: 'ceo@openerp.my.openerp.com' + alias_model_id: model_hr_applicant + alias_user_id: base.user_root + alias_defaults: '{}' +- + !python {model: mail.alias}: | + self.write(cr, uid, [ref('alias_job_ceo')], {'alias_defaults': {'job_id': ref('hr.job_ceo')}}) +- + !record {model: hr.job, id: hr.job_ceo, view: False}: + alias_id: alias_job_ceo +- + !record {model: mail.alias, id: alias_job_cto, view: False}: + alias_name: 'cto@openerp.my.openerp.com' + alias_model_id: model_hr_applicant + alias_user_id: base.user_root + alias_defaults: '{}' +- + !python {model: mail.alias}: | + self.write(cr, uid, [ref('alias_job_cto')], {"alias_defaults": {'job_id': ref('hr.job_cto')}}) +- + !record {model: hr.job, id: hr.job_cto, view: False}: + alias_id: alias_job_cto +- + !record {model: mail.alias, id: alias_job_hr_manager, view: False}: + alias_name: 'hr-manager@openerp.my.openerp.com' + alias_model_id: model_hr_applicant + alias_user_id: base.user_root + alias_defaults: '{}' +- + !python {model: mail.alias}: | + self.write(cr, uid, [ref('alias_job_hr_manager')], {"alias_defaults": {'job_id': ref('hr.job_hr_manager')}}) +- + !record {model: hr.job, id: hr.job_hr_manager, view: False}: + alias_id: alias_job_hr_manager +- + !record {model: mail.alias, id: alias_job_consultant, view: False}: + alias_name: 'consultant@openerp.my.openerp.com' + alias_model_id: model_hr_applicant + alias_user_id: base.user_root + alias_defaults: '{}' +- + !python {model: mail.alias}: | + self.write(cr, uid, [ref('alias_job_consultant')], {"alias_defaults": {'job_id': ref('hr.job_consultant')}}) +- + !record {model: hr.job, id: hr.job_consultant, view: False}: + alias_id: alias_job_consultant +- + !record {model: mail.alias, id: alias_job_hrm, view: False}: + alias_name: 'hrm@openerp.my.openerp.com' + alias_model_id: model_hr_applicant + alias_user_id: base.user_root + alias_defaults: '{}' +- + !python {model: mail.alias}: | + self.write(cr, uid, [ref('alias_job_hrm')], {"alias_defaults": {'job_id': ref('hr.job_hrm')}}) +- + !record {model: hr.job, id: hr.job_hrm, view: False}: + alias_id: alias_job_hrm +- + !record {model: mail.alias, id: alias_job_marketing, view: False}: + alias_name: 'marketing@openerp.my.openerp.com' + alias_model_id: model_hr_applicant + alias_user_id: base.user_root + alias_defaults: '{}' +- + !python {model: mail.alias}: | + self.write(cr, uid, [ref('alias_job_marketing')], {"alias_defaults": {'job_id': ref('hr.job_marketing')}}) +- + !record {model: hr.job, id: hr.job_marketing, view: False}: + alias_id: alias_job_marketing +- + !record {model: mail.alias, id: alias_job_trainee, view: False}: + alias_name: 'trainee@openerp.my.openerp.com' + alias_model_id: model_hr_applicant + alias_user_id: base.user_root + alias_defaults: '{}' +- + !python {model: mail.alias}: | + self.write(cr, uid, [ref('alias_job_trainee')], {"alias_defaults": {'job_id': ref('hr.job_trainee')}}) +- + !record {model: hr.job, id: hr.job_trainee, view: False}: + alias_id: alias_job_trainee - !record {model: hr.applicant, id: hr_case_salesman0}: date: !eval time.strftime('%Y-%m-01 10:35:50') diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py index c769e3eff04..b3644dfa3d6 100644 --- a/addons/mail/res_users.py +++ b/addons/mail/res_users.py @@ -64,10 +64,10 @@ class res_users(osv.osv): res_id = model_pool.get_object( cr, uid, "mail", "model_res_users") data.update({'alias_name': data.get('login'), 'alias_model_id': res_id.id}) - alias_pool.create_unique_alias(cr, uid, data, sequence=False ,context=context) + name = alias_pool.create_unique_alias(cr, uid, data, sequence=False ,context=context) user_id = super(res_users, self).create(cr, uid, data, context=context) - user = self.read(cr, uid, user_id, context=context) - alias_pool.write(cr, uid, [user['alias_id']], {"alias_force_thread_id": user_id}, context) + user = self.browse(cr, uid, user_id, context=context) + alias_pool.write(cr, uid, [user.alias_id.id], {"alias_force_thread_id": user.id}, context) # make user follow itself self.message_subscribe(cr, uid, [user_id], [user_id], context=context) # create a welcome message to broadcast