From 70ce1e5eb4586d6f08248430fe6bee9360dba285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 14 Mar 2013 09:53:15 +0100 Subject: [PATCH] [FIX] Fixed forgotten conflict when merging trunk. bzr revid: tde@openerp.com-20130314085315-m4didtupt20gmkyv --- addons/email_template/wizard/mail_compose_message.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index f70f29e4b5e..2e051338352 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -145,11 +145,7 @@ class mail_compose_message(osv.TransientModel): values['body'] = values.pop('body_html', '') # transform email_to, email_cc into partner_ids -<<<<<<< TREE - values['partner_ids'] = [] -======= partner_ids = set() ->>>>>>> MERGE-SOURCE mails = tools.email_split(values.pop('email_to', '') + ' ' + values.pop('email_cc', '')) for mail in mails: partner_id = self.pool.get('res.partner').find_or_create(cr, uid, mail, context=context)