odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] calendar: allow to force the sending of email in function _send_mail_to_attendees (even if email are himself) and use it for reminder.

This commit is contained in:
Jeremy Kersten 2015-02-06 14:01:45 +01:00
parent a6eac0f08e
commit e0c17258bd
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/calendar/calendar.py
View File

@ -172,10 +172,11 @@ class calendar_attendee(osv.Model):
return res
def _send_mail_to_attendees(self, cr, uid, ids, email_from=tools.config.get('email_from', False),
template_xmlid='calendar_template_meeting_invitation', context=None):
template_xmlid='calendar_template_meeting_invitation', force=False, context=None):
"""
Send mail for event invitation to event attendees.
@param email_from: email address for user sending the mail
@param force: If set to True, email will be sent to user himself. Usefull for example for alert, ...
"""
res = False
@ -208,7 +209,7 @@ class calendar_attendee(osv.Model):
})
for attendee in self.browse(cr, uid, ids, context=context):
if attendee.email and email_from and attendee.email != email_from:
if attendee.email and email_from and (attendee.email != email_from or force):
ics_file = self.get_ics_file(cr, uid, attendee.event_id, context=context)
mail_id = template_pool.send_mail(cr, uid, template_id, attendee.id, context=local_context)
@ -510,7 +511,14 @@ class calendar_alarm_manager(osv.AbstractModel):
alarm = self.pool['calendar.alarm'].browse(cr, uid, alert['alarm_id'], context=context)
if alarm.type == 'email':
res = self.pool['calendar.attendee']._send_mail_to_attendees(cr, uid, [att.id for att in event.attendee_ids], template_xmlid='calendar_template_meeting_reminder', context=context)
res = self.pool['calendar.attendee']._send_mail_to_attendees(
cr,
uid,
[att.id for att in event.attendee_ids],
template_xmlid='calendar_template_meeting_reminder',
force=True,
context=context
)
return res