From 6dbbf9e79d16f83d46087b50466c34827823e582 Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Thu, 19 Apr 2012 12:23:06 +0530 Subject: [PATCH] [IMP] resolve conflicts bzr revid: psi@tinyerp.com-20120419065306-2ie570l1mpu9jegt --- addons/mail/wizard/mail_compose_message.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index 107ddfbe764..59554acd57b 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -259,12 +259,7 @@ class mail_compose_message(osv.osv_memory): attachments=attachment, references=references, res_id=int(mail.res_id), subtype=mail.subtype, headers=headers, context=context)] # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small) -<<<<<<< TREE - mail_message.send(cr, uid, [msg_id], context=context) -======= mail_message.send(cr, uid, msg_ids, context=context) - ->>>>>>> MERGE-SOURCE return {'type': 'ir.actions.act_window_close'} def render_template(self, cr, uid, template, model, res_id, context=None):