From bf9ca71abb3f713f4127ceb8bbed628858ede83f Mon Sep 17 00:00:00 2001 From: Ronak Baxi Date: Thu, 5 Feb 2015 10:28:26 +0530 Subject: [PATCH] [IMP]hr_recruitment: Replace hardcoded 'welcome message for new employee' with a email template. --- addons/hr_recruitment/hr_recruitment.py | 16 ++++++++++------ addons/hr_recruitment/hr_recruitment_data.xml | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index f339dd1fc04..de389c468ac 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -540,12 +540,16 @@ class hr_applicant(osv.Model): def _broadcast_welcome(self, cr, uid, employee_id, context=None): """ Broadcast the welcome message to all users in the employee company. """ - employee = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context) - mail_group_action, mail_group_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees') - self.pool.get('mail.group').message_post( - cr, uid, [mail_group_id], - body=_('Welcome to %s! Please help him/her take the first steps with Odoo!') % (employee.name), - subtype='mail.mt_comment', context=context) + IrModelData = self.pool['ir.model.data'] + group_all_employees = IrModelData.xmlid_to_object(cr, uid, 'mail.group_all_employees', context=context) + template_new_employee = IrModelData.xmlid_to_object(cr, uid, 'hr_recruitment.hr_welcome_new_employee', context=context) + if template_new_employee: + MailTemplate = self.pool['mail.template'] + body_html = MailTemplate.render_template(cr, uid, template_new_employee.body_html, 'hr.employee', employee_id, context=context) + subject = MailTemplate.render_template(cr, uid, template_new_employee.subject, 'hr.employee', employee_id, context=context) + self.pool['mail.group'].message_post(cr, uid, [group_all_employees.id], + body=body_html, subject=subject, + subtype='mail.mt_comment', context=context) return True def create_employee_from_applicant(self, cr, uid, ids, context=None): diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml index b4b84637525..15a625ecb42 100644 --- a/addons/hr_recruitment/hr_recruitment_data.xml +++ b/addons/hr_recruitment/hr_recruitment_data.xml @@ -36,6 +36,23 @@ ${object.user_id and object.user_id.signature | safe or ''}]]> + + Welcome New Employee + + Welcoming ${object.name} + + %if user.has_group('hr.group_multi_departments') and object.department_id: + I’m very pleased to announce that ${object.name} will be joining us as a ${object.job_id.name} + in ${object.department_id.name}. + %else: + I’m very pleased to announce that ${object.name} will be joining us as a ${object.job_id.name}. + %endif +

+

Please welcome him/her and help him/her finding his/her marks.

+ ]]>
+
+ Application approved Application approved