From 32051efdc99172931cfffe7b621d01b6d8ec8b3d Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Wed, 7 Nov 2018 15:28:41 +0000 Subject: [PATCH] [IMP] hr_presence: Don't notify followers when sending a email --- addons/hr_presence/data/mail_data.xml | 2 +- addons/hr_presence/models/hr_employee.py | 14 ++++++++------ addons/hr_presence/views/hr_employee_views.xml | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/addons/hr_presence/data/mail_data.xml b/addons/hr_presence/data/mail_data.xml index d6c1fb3539f..f2ab1ca0579 100644 --- a/addons/hr_presence/data/mail_data.xml +++ b/addons/hr_presence/data/mail_data.xml @@ -3,7 +3,7 @@ Presence: Contact Employee - + Unexpected Absence ${ctx['email_from'] or ''} ${ctx['email_to'] or ''} diff --git a/addons/hr_presence/models/hr_employee.py b/addons/hr_presence/models/hr_employee.py index 5e915db0050..79b9b9cbed5 100644 --- a/addons/hr_presence/models/hr_employee.py +++ b/addons/hr_presence/models/hr_employee.py @@ -101,6 +101,7 @@ class ResCompany(models.Model): self.write({'hr_presence_state': 'present'}) def action_send_sms(self): + self.ensure_one() if not self.env.user.has_group('hr.group_hr_manager'): raise UserError(_("You don't have the right to do this. Please contact an Administrator.")) if not self.mobile_phone: @@ -113,7 +114,7 @@ Do not hesitate to contact your manager or the human resource department.""") "res_model": "sms.send_sms", "view_mode": 'form', "context": { - 'active_id': self.env.context.get('active_id'), + 'active_id': self.id, 'default_message': body, 'default_recipients': self.mobile_phone, }, @@ -122,22 +123,23 @@ Do not hesitate to contact your manager or the human resource department.""") } def action_send_mail(self): + self.ensure_one() if not self.env.user.has_group('hr.group_hr_manager'): raise UserError(_("You don't have the right to do this. Please contact an Administrator.")) - employee = self.env['hr.employee'].sudo().browse(self.env.context.get('active_id')) - if not employee.work_email: + if not self.work_email: raise UserError(_("There is no professional email address for this employee.")) template = self.env.ref('hr_presence.mail_template_presence', False) compose_form = self.env.ref('mail.email_compose_message_wizard_form', False) ctx = dict( - default_model='hr.employee', - default_res_id=employee.id, + default_model="hr.employee", + default_res_id=self.id, default_use_template=bool(template), default_template_id=template.id, default_composition_mode='comment', + default_is_log=True, custom_layout='mail.mail_notification_light', email_from=self.env.user.email, - email_to=employee.work_email, + email_to=self.work_email, ) return { 'name': _('Compose Email'), diff --git a/addons/hr_presence/views/hr_employee_views.xml b/addons/hr_presence/views/hr_employee_views.xml index 55872c022e1..cedd1c780b4 100644 --- a/addons/hr_presence/views/hr_employee_views.xml +++ b/addons/hr_presence/views/hr_employee_views.xml @@ -25,8 +25,8 @@ - - + +