[FIX] Fixed forgotten conflict when merging trunk.

bzr revid: tde@openerp.com-20130314085315-m4didtupt20gmkyv
2013-03-14 09:53:15 +01:00
parent 272501d66c
commit 70ce1e5eb4
1 changed files with 0 additions and 4 deletions
@@ -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)