summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYannick Tivisse <yti@odoo.com>2018-11-07 15:28:41 +0000
committerYannick Tivisse <yti@odoo.com>2018-11-07 16:30:29 +0000
commit32051efdc99172931cfffe7b621d01b6d8ec8b3d (patch)
treeafacf4bf91864c049298f04d92eeb3bbdb2af024
parentfaf90c4f5254cd85b90c1d28672a71363c4c50ee (diff)
[IMP] hr_presence: Don't notify followers when sending a email
-rw-r--r--addons/hr_presence/data/mail_data.xml2
-rw-r--r--addons/hr_presence/models/hr_employee.py14
-rw-r--r--addons/hr_presence/views/hr_employee_views.xml4
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 @@
<data noupdate="1">
<record id="mail_template_presence" model="mail.template">
<field name="name">Presence: Contact Employee</field>
- <field name="model_id" ref="base.model_res_partner"/>
+ <field name="model_id" ref="hr.model_hr_employee"/>
<field name="subject">Unexpected Absence</field>
<field name="email_from">${ctx['email_from'] or ''}</field>
<field name="email_to">${ctx['email_to'] or ''}</field>
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 @@
<field name="hr_presence_state" invisible="1"/>
<button name="action_set_present" type="object" class="btn btn-primary btn-sm mt8 fa fa-check" title="Set as present" attrs="{'invisible': [('hr_presence_state', '!=', 'to_define')]}"> </button>
<button name="%(hr_holidays.hr_leave_action_all)d" type="action" class="btn btn-primary btn-sm mt8" context="{'default_employee_id': active_id}">Leaves</button>
- <button name="action_send_sms" type="object" class="btn btn-primary btn-sm mt8" context="{'active_id': active_id}">SMS</button>
- <button name="action_send_mail" type="object" class="btn btn-primary btn-sm mt8" context="{'active_id': active_id}">Mail</button>
+ <button name="action_send_sms" type="object" class="btn btn-primary btn-sm mt8">SMS</button>
+ <button name="action_send_mail" type="object" class="btn btn-primary btn-sm mt8">Mail</button>
</div>
</div>
</xpath>