[MERGE] new fix from api for the invitation to attendees (first attempt was revision 8489, reverted in revision 8495)

bzr revid: qdp-launchpad@openerp.com-20121228111853-4v61clp8v3tkvosi
This commit is contained in:
Quentin (OpenERP) 2012-12-28 12:18:53 +01:00
commit de7cd5331a
2 changed files with 5 additions and 9 deletions

View File

@ -847,7 +847,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
@ -896,9 +896,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',
@ -1122,7 +1122,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
@ -1133,7 +1133,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)

View File

@ -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>