From b04f7058db87b8aa11f6dcde801dbb1bc88af045 Mon Sep 17 00:00:00 2001 From: Arnaud Pineux Date: Wed, 26 Dec 2012 17:52:52 +0100 Subject: [PATCH 1/2] [FIX] mail is sent for a meeting invitation bzr revid: api@openerp.com-20121226165252-qrlmtmtz4lra2ijz --- addons/base_calendar/base_calendar.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index a06bfd485bb..8384d33dcbd 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -539,7 +539,8 @@ property or property parameter."), vals['attachment_ids'] = [(0,0,{'name': 'invitation.ics', 'datas_fname': 'invitation.ics', 'datas': str(ics_file).encode('base64')})] - self.pool.get('mail.mail').create(cr, uid, vals, context=context) + mail_id = self.pool.get('mail.mail').create(cr, uid, vals, context=context) + self.pool.get('mail.mail').browse(cr,uid,mail_id,context=context).send() return True def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv): @@ -1117,7 +1118,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), for att in event.attendee_ids: attendees[att.partner_id.id] = True new_attendees = [] - mail_to = [] + mail_to = "" for partner in event.partner_ids: if partner.id in attendees: continue @@ -1128,7 +1129,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), 'email': partner.email }, context=context) if partner.email: - mail_to.append(partner.email) + mail_to = mail_to+" "+partner.email self.write(cr, uid, [event.id], { 'attendee_ids': [(4, att_id)] }, context=context) From 4c5bc9c6a5d6cde63822d3845b8df4f22885e6d0 Mon Sep 17 00:00:00 2001 From: Arnaud Pineux Date: Thu, 27 Dec 2012 09:55:28 +0100 Subject: [PATCH 2/2] [IMP] remove followers because it creates confusion for users between attendees and followers. bzr revid: api@openerp.com-20121227085528-x30wpjwdklqhuskt --- addons/base_calendar/crm_meeting_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index 2efc76997cc..e1448e6cee1 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -181,10 +181,10 @@ -
+