From 1cc8d504ab7ed272389de509433b3e011997b610 Mon Sep 17 00:00:00 2001
From: Arnaud Pineux <api@openerp.com>
Date: Fri, 28 Dec 2012 09:48:40 +0100
Subject: [PATCH] [FIX] base_calendar: remove followers & change the mail_to
 format in str to match with mail.mail

bzr revid: api@openerp.com-20121228084840-a1ii9os6dn2xcw0q
---
 addons/base_calendar/base_calendar.py     | 10 +++++-----
 addons/base_calendar/crm_meeting_view.xml |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 297fc68be58..718521c8b08 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -842,7 +842,7 @@ class calendar_alarm(osv.osv):
         current_datetime = datetime.now()
         alarm_ids = self.search(cr, uid, [('state', '!=', 'done')], context=context)
 
-        mail_to = []
+        mail_to = ""
 
         for alarm in self.browse(cr, uid, alarm_ids, context=context):
             next_trigger_date = None
@@ -891,9 +891,9 @@ From:
 </pre>
 """  % (alarm.name, alarm.trigger_date, alarm.description, \
                         alarm.user_id.name, alarm.user_id.signature)
-                    mail_to = [alarm.user_id.email]
+                    mail_to = alarm.user_id.email
                     for att in alarm.attendee_ids:
-                        mail_to.append(att.user_id.email)
+                        mail_to = mail_to+" "+att.user_id.email
                     if mail_to:
                         vals = {
                             'state': 'outgoing',
@@ -1117,7 +1117,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 +1128,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)
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 2efc76997cc..c2adc01cd54 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -181,10 +181,6 @@
 
                     </notebook>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
-                </div>
             </form>
         </field>
     </record>