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

[REV] revert of commit 8489. New patch incoming 

bzr revid: qdp-launchpad@openerp.com-20121227121345-60ocm72hxxu0qnlb
This commit is contained in:
Quentin (OpenERP) 2012-12-27 13:13:45 +01:00
parent 86954fd821
commit 3b0a21972d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/base_calendar/base_calendar.py
View File

@ -539,8 +539,7 @@ property or property parameter."),
vals['attachment_ids'] = [(0,0,{'name': 'invitation.ics',
'datas_fname': 'invitation.ics',
'datas': str(ics_file).encode('base64')})]
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()
self.pool.get('mail.mail').create(cr, uid, vals, context=context)
return True
def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
@ -1118,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
@ -1129,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 = mail_to+" "+partner.email
mail_to.append(partner.email)
self.write(cr, uid, [event.id], {
'attendee_ids': [(4, att_id)]
}, context=context)

4
addons/base_calendar/crm_meeting_view.xml
View File

@ -181,10 +181,10 @@
</notebook>
</sheet>
<!--<div class="oe_chatter">
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
</div>-->
</div>
</form>
</field>
</record>