Merge lp:~openerp-dev/openobject-addons/trunk-mass-mailing-tde into lp:openobject-addons

[Thibault Delavallée (OpenERP)]

=== modified file 'account/edi/invoice_action_data.xml'
--- account/edi/invoice_action_data.xml	2012-12-14 11:31:32 +0000
+++ account/edi/invoice_action_data.xml	2013-03-13 13:50:27 +0000
@@ -24,7 +24,7 @@
             <field name="name">Invoice - Send by Email</field>
             <field name="email_from">${object.user_id.email or object.company_id.email or 'noreply@localhost'}</field>
             <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})</field>
-            <field name="email_recipients">${object.partner_id.id}</field>
+            <field name="partner_to">${object.partner_id.id}</field>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field name="auto_delete" eval="True"/>
             <field name="report_template" ref="account_invoices"/>

=== modified file 'crm/crm_data.xml'
--- crm/crm_data.xml	2012-12-21 16:48:08 +0000
+++ crm/crm_data.xml	2013-03-13 13:50:27 +0000
@@ -72,20 +72,4 @@
         </record>
     </data>
 
-    <!-- Mail template is done in a NOUPDATE block
-         so users can freely customize/delete them -->
-    <data noupdate="1">
-
-        <!--Definition of an email template with an empty body that will be used in opportunity mailing. Used to give a
-            basis for email recipients, name and to ease the definition of a further elaborated template. -->
-        <record id="email_template_opportunity_mail" model="email.template">
-            <field name="name">Opportunity - Send Emails</field>
-            <field name="email_from">${object.user_id.email or ''}</field>
-            <field name="subject">Opportunity ${object.name | h})</field>
-            <field name="model_id" ref="crm.model_crm_lead"/>
-            <field name="auto_delete" eval="True"/>
-            <field name="email_recipients">${object.partner_id.id}</field>
-            <field name="body_html"></field> 
-        </record>
-    </data>
 </openerp>

=== modified file 'crm/crm_lead_data.xml'
--- crm/crm_lead_data.xml	2013-01-30 09:09:42 +0000
+++ crm/crm_lead_data.xml	2013-03-13 13:50:27 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="1">
+    <!-- <data noupdate="1"> -->
+    <data>
 
         <!-- Crm stages -->
         <record model="crm.case.stage" id="stage_lead1">
@@ -221,5 +222,16 @@
             <field name="relation_field">section_id</field>
         </record>
 
+        <!--Definition of an email template with an empty body that will be used in opportunity mailing. Used to give a
+            basis for email recipients, name and to ease the definition of a further elaborated template. -->
+        <record id="lead_template" model="email.template">
+            <field name="name">Lead/Opportunity Mass Mail</field>
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="partner_to">${object.partner_id and object.partner_id.id}</field>
+            <field name="email_to">${! object.partner_id and object.email}</field>
+            <field name="body_html"></field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2013-02-21 10:52:47 +0000
+++ crm/crm_lead_view.xml	2013-03-13 13:50:27 +0000
@@ -339,6 +339,8 @@
                     <filter string="Assigned to My Team(s)"
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
                             help="Leads that are assigned to any sales teams I am member of"/>
+                    <filter string="Not opt-out" domain="[('opt_out', '=', False)]"
+                            help="Is not opt-out and can be included in mass mailing campaigns"/>
                     <separator/>
                     <group expand="0" string="Group By...">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
@@ -577,5 +579,29 @@
             </field>
         </record>
 
+        <!--
+            MASS MAILING
+        -->
+        <act_window name="Lead/Opportunity Mass Mail"
+                res_model="mail.compose.message"
+                src_model="crm.lead"
+                view_mode="form"
+                multi="True"
+                target="new"
+                key2="client_action_multi"
+                id="crm.action_lead_mass_mail"
+                context="{
+                            'default_composition_mode': 'mass_mail',
+                            'default_email_to':'{$object.email or \'\'}',
+                            'default_use_template': True,
+                            'default_template_id': ref('crm.lead_template'),
+                        }"/>
+
+        <!--Definition of an email template with an empty body that will be used in opportunity mailing. Used to give a
+            basis for email recipients, name and to ease the definition of a further elaborated template. -->
+        <record id="lead_template" model="email.template">
+            <field name="ref_ir_act_window" ref="crm.action_lead_mass_mail"/>
+        </record>
+
     </data>
 </openerp>

=== modified file 'crm/res_partner_view.xml'
--- crm/res_partner_view.xml	2012-11-29 22:26:45 +0000
+++ crm/res_partner_view.xml	2013-03-13 13:50:27 +0000
@@ -15,6 +15,18 @@
                 </field>
         </record>
 
+       <record id="view_res_partner_filter_crm" model="ir.ui.view">
+            <field name="name">res.partner.select.crm</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_res_partner_filter"/>
+            <field name="arch" type="xml">
+                    <filter string="Suppliers" position="after">
+                        <filter string="Not opt-out"  domain="[('opt_out', '=', False)]"
+                                help="Is not opt-out and can be included in mass mailing campaigns" />
+                    </filter>
+            </field>
+        </record>
+
         <!-- open meetings related to given partner -->
         <record id="crm_meeting_partner" model="ir.actions.act_window">
             <field name="name">Meetings</field>

=== modified file 'email_template/email_template.py'
--- email_template/email_template.py	2012-12-17 14:43:06 +0000
+++ email_template/email_template.py	2013-03-13 13:50:27 +0000
@@ -143,7 +143,9 @@
         'subject': fields.char('Subject', translate=True, help="Subject (placeholders may be used here)",),
         'email_from': fields.char('From', help="Sender address (placeholders may be used here)"),
         'email_to': fields.char('To (Emails)', help="Comma-separated recipient addresses (placeholders may be used here)"),
-        'email_recipients': fields.char('To (Partners)', help="Comma-separated ids of recipient partners (placeholders may be used here)"),
+        'partner_to': fields.char('To (Partners)',
+            help="Comma-separated ids of recipient partners (placeholders may be used here)",
+            oldname='email_recipients'),
         'email_cc': fields.char('Cc', help="Carbon copy recipients (placeholders may be used here)"),
         'reply_to': fields.char('Reply-To', help="Preferred response address (placeholders may be used here)"),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False,
@@ -311,7 +313,7 @@
         template = self.get_email_template(cr, uid, template_id, res_id, context)
         values = {}
         for field in ['subject', 'body_html', 'email_from',
-                      'email_to', 'email_recipients', 'email_cc', 'reply_to']:
+                      'email_to', 'partner_to', 'email_cc', 'reply_to']:
             values[field] = self.render_template(cr, uid, getattr(template, field),
                                                  template.model, res_id, context=context) \
                                                  or False
@@ -371,7 +373,7 @@
         values = self.generate_email(cr, uid, template_id, res_id, context=context)
         assert 'email_from' in values, 'email_from is missing or empty after template rendering, send_mail() cannot proceed'
         attachments = values.pop('attachments') or {}
-        del values['email_recipients'] # TODO Properly use them.
+        del values['partner_to'] # TODO Properly use them.
         msg_id = mail_mail.create(cr, uid, values, context=context)
         # link attachments
         attachment_ids = []

=== modified file 'email_template/email_template_view.xml'
--- email_template/email_template_view.xml	2012-11-29 22:26:45 +0000
+++ email_template/email_template_view.xml	2013-03-13 13:50:27 +0000
@@ -28,9 +28,9 @@
                             <page string="Email Details">
                                 <group>
                                     <group string="Addressing">
-                                      <field name="email_from" required="1"/>
+                                      <field name="email_from"/>
                                       <field name="email_to"/>
-                                      <field name="email_recipients"/>
+                                      <field name="partner_to"/>
                                       <field name="email_cc"/>
                                       <field name="reply_to"/>
                                       <field name="user_signature"/>
@@ -78,7 +78,7 @@
                     <field name="subject"/>
                     <field name="email_from"/>
                     <field name="email_to"/>
-                    <field name="email_recipients"/>
+                    <field name="partner_to"/>
                     <field name="report_name"/>
                 </tree>
             </field>

=== modified file 'email_template/res_partner_view.xml'
--- email_template/res_partner_view.xml	2012-11-29 22:26:45 +0000
+++ email_template/res_partner_view.xml	2013-03-13 13:50:27 +0000
@@ -11,5 +11,35 @@
                 </xpath>
             </field>
         </record>
+
+        <!--Definition of an email template with an empty body that will be used in opportunity mailing. Used to give a
+            basis for email recipients, name and to ease the definition of a further elaborated template. -->
+        <record id="partner_template" model="email.template">
+            <field name="name">Partner Mass Mail</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="partner_to">${object.id}</field>
+        </record>
+
+        <!--  Replace the default mass-mailing wizard in base with the composition wizard -->
+        <act_window name="Partner Mass Mailing"
+                res_model="mail.compose.message"
+                src_model="res.partner"
+                view_mode="form"
+                multi="True"
+                target="new"
+                key2="client_action_multi"
+                id="base.action_partner_mass_mail"
+                context="{
+                            'default_composition_mode': 'mass_mail',
+                            'default_partner_to': '${object.id or \'\'}',
+                            'default_use_template': True,
+                            'default_template_id': ref('partner_template'),
+                        }"/>
+
+        <record id="partner_template" model="email.template">
+            <field name="ref_ir_act_window" ref="base.action_partner_mass_mail"/>
+        </record>
+
     </data>
 </openerp>

=== modified file 'email_template/tests/test_mail.py'
--- email_template/tests/test_mail.py	2013-02-14 11:12:30 +0000
+++ email_template/tests/test_mail.py	2013-03-13 13:50:27 +0000
@@ -130,6 +130,7 @@
         # 1. Mass_mail on pigs and bird, with a default_partner_ids set to check he is correctly added
         context = {
             'default_composition_mode': 'mass_mail',
+            'default_notify': True,
             'default_model': 'mail.group',
             'default_res_id': self.group_pigs_id,
             'default_template_id': email_template_id,
@@ -170,20 +171,20 @@
         self.assertEqual(set(message_bird_pids), set(partner_ids), 'mail.message on bird notified_partner_ids incorrect')
 
         # ----------------------------------------
-        # CASE4: test newly introduced email_recipients field
+        # CASE4: test newly introduced partner_to field
         # ----------------------------------------
 
         # get already-created partners back
         p_b_id = self.res_partner.search(cr, uid, [('email', '=', 'b@b.b')])[0]
         p_c_id = self.res_partner.search(cr, uid, [('email', '=', 'c@c.c')])[0]
         p_d_id = self.res_partner.search(cr, uid, [('email', '=', 'd@d.d')])[0]
-        # modify template: use email_recipients, use template and email address in email_to to test all features together
+        # modify template: use partner_to, use template and email address in email_to to test all features together
         user_model_id = self.registry('ir.model').search(cr, uid, [('model', '=', 'res.users')])[0]
         email_template.write(cr, uid, [email_template_id], {
             'model_id': user_model_id,
             'body_html': '${object.login}',
             'email_to': '${object.email} c@c',
-            'email_recipients': '%i,%i' % (p_b_id, p_c_id),
+            'partner_to': '%i,%i' % (p_b_id, p_c_id),
             'email_cc': 'd@d',
             })
         # patner by email + partner by id (no double)

=== modified file 'email_template/wizard/email_template_preview_view.xml'
--- email_template/wizard/email_template_preview_view.xml	2012-11-29 22:26:45 +0000
+++ email_template/wizard/email_template_preview_view.xml	2013-03-13 13:50:27 +0000
@@ -17,7 +17,7 @@
                     <group>
                       <field name="email_from" readonly="1"/>
                       <field name="email_to" readonly="1"/>
-                      <field name="email_recipients" readonly="1"/>
+                      <field name="partner_to" readonly="1"/>
                       <field name="email_cc" readonly="1" attrs="{'invisible':[('email_cc','=',False)]}"/>
                       <field name="reply_to" readonly="1" attrs="{'invisible':[('reply_to','=',False)]}"/>
                       <field name="subject" readonly="1"/>

=== modified file 'email_template/wizard/mail_compose_message.py'
--- email_template/wizard/mail_compose_message.py	2013-02-13 17:39:40 +0000
+++ email_template/wizard/mail_compose_message.py	2013-03-13 13:50:27 +0000
@@ -22,6 +22,7 @@
 from openerp import tools
 from openerp.osv import osv, fields
 
+
 def _reopen(self, res_id, model):
     return {'type': 'ir.actions.act_window',
             'view_mode': 'form',
@@ -36,6 +37,7 @@
             },
     }
 
+
 class mail_compose_message(osv.TransientModel):
     _inherit = 'mail.compose.message'
 
@@ -59,13 +61,25 @@
     _columns = {
         # incredible hack of the day: size=-1 means we want an int db column instead of an str one
         'template_id': fields.selection(_get_templates, 'Template', size=-1),
+        'partner_to': fields.char('To (Partner IDs)', readonly=True,
+            help="Comma-separated list of recipient partners ids (placeholders may be used here)"),
+        'email_to': fields.char('To (Emails)', readonly=True,
+            help="Comma-separated recipient addresses (placeholders may be used here)",),
+        'email_cc': fields.char('Cc (Emails)', readonly=True,
+            help="Carbon copy recipients (placeholders may be used here)"),
+    }
+
+    _defaults = {
+        'partner_to': lambda self, cr, uid, ctx={}: '',
+        'email_to': lambda self, cr, uid, ctx={}: '',
+        'email_cc': lambda self, cr, uid, ctx={}: '',
     }
 
     def onchange_template_id(self, cr, uid, ids, template_id, composition_mode, model, res_id, context=None):
         """ - mass_mailing: we cannot render, so return the template values
             - normal mode: return rendered values """
         if template_id and composition_mode == 'mass_mail':
-            values = self.pool.get('email.template').read(cr, uid, template_id, ['subject', 'body_html'], context)
+            values = self.pool.get('email.template').read(cr, uid, template_id, ['subject', 'body_html', 'email_from', 'email_to', 'email_cc', 'partner_to', 'reply_to'], context)
             values.pop('id')
         elif template_id:
             # FIXME odo: change the mail generation to avoid attachment duplication
@@ -80,11 +94,11 @@
                     'datas_fname': attach_fname,
                     'res_model': model,
                     'res_id': res_id,
-                    'type': 'binary', # override default_type from context, possibly meant for another model!
+                    'type': 'binary',  # override default_type from context, possibly meant for another model!
                 }
                 values['attachment_ids'].append(ir_attach_obj.create(cr, uid, data_attach, context=context))
         else:
-            values = self.default_get(cr, uid, ['body', 'subject', 'partner_ids', 'attachment_ids'], context=context)
+            values = self.default_get(cr, uid, ['subject', 'body', 'email_from', 'email_to', 'email_cc', 'partner_to', 'reply_to', 'attachment_ids'], context=context)
 
         if values.get('body_html'):
             values['body'] = values.pop('body_html')
@@ -117,28 +131,29 @@
     # Wizard validation and send
     #------------------------------------------------------
 
+    def _get_or_create_partners_from_values(self, cr, uid, rendered_values, context=None):
+        """ Check for email_to, email_cc, partner_to """
+        partner_ids = []
+        mails = tools.email_split(rendered_values.pop('email_to', '') + ' ' + rendered_values.pop('email_cc', ''))
+        for mail in mails:
+            partner_id = self.pool.get('res.partner').find_or_create(cr, uid, mail, context=context)
+            partner_ids.append(partner_id)
+        partner_to = rendered_values.pop('partner_to', '')
+        if partner_to:
+            for partner_id in partner_to.split(','):
+                partner_ids.append(int(partner_id))
+        return partner_ids
+
     def generate_email_for_composer(self, cr, uid, template_id, res_id, context=None):
         """ Call email_template.generate_email(), get fields relevant for
             mail.compose.message, transform email_cc and email_to into partner_ids """
         template_values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
         # filter template values
-        fields = ['body_html', 'subject', 'email_to', 'email_recipients', 'email_cc', 'attachments']
+        fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc',  'reply_to', 'attachments']
         values = dict((field, template_values[field]) for field in fields if template_values.get(field))
         values['body'] = values.pop('body_html', '')
         # transform email_to, email_cc into partner_ids
-        values['partner_ids'] = []
-
-        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)
-            values['partner_ids'].append(partner_id)
-        email_recipients = values.pop('email_recipients', '')
-        if email_recipients:
-            for partner_id in email_recipients.split(','):
-                values['partner_ids'].append(int(partner_id))
-
-        values['partner_ids'] = list(set(values['partner_ids']))
-
+        values['partner_ids'] = self._get_or_create_partners_from_values(cr, uid, values, context=context)
         return values
 
     def render_message(self, cr, uid, wizard, res_id, context=None):
@@ -150,6 +165,12 @@
             values = {}
         # get values to return
         email_dict = super(mail_compose_message, self).render_message(cr, uid, wizard, res_id, context)
+        email_dict['email_to'] = self.render_template(cr, uid, wizard.email_to, wizard.model, res_id, context)
+        email_dict['email_cc'] = self.render_template(cr, uid, wizard.email_cc, wizard.model, res_id, context)
+        email_dict['partner_to'] = self.render_template(cr, uid, wizard.partner_to, wizard.model, res_id, context)
+        # transform email_to, email_cc into partner_ids
+        email_dict['partner_ids'] = self._get_or_create_partners_from_values(cr, uid, email_dict, context=context)
+        # update template values by wizard values
         values.update(email_dict)
         return values
 

=== modified file 'email_template/wizard/mail_compose_message_view.xml'
--- email_template/wizard/mail_compose_message_view.xml	2012-11-29 22:26:45 +0000
+++ email_template/wizard/mail_compose_message_view.xml	2013-03-13 13:50:27 +0000
@@ -7,6 +7,14 @@
             <field name="model">mail.compose.message</field>
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='subject']" position="after">
+                    <field name="partner_to" groups="base.group_no_one"
+                        attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>/>
+                    <field name="email_to" groups="base.group_no_one"
+                        attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>/>
+                    <field name="email_cc" groups="base.group_no_one"
+                        attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>/>
+                </xpath>
                 <xpath expr="//footer" position="inside">
                     <group class="oe_right" col="1">
                         <div>Use template

=== modified file 'mail/mail_followers.py'
--- mail/mail_followers.py	2013-01-30 13:44:47 +0000
+++ mail/mail_followers.py	2013-03-13 13:50:27 +0000
@@ -75,7 +75,7 @@
         if not cr.fetchone():
             cr.execute('CREATE INDEX mail_notification_partner_id_read_starred_message_id ON mail_notification (partner_id, read, starred, message_id)')
 
-    def get_partners_to_notify(self, cr, uid, message, context=None):
+    def get_partners_to_notify(self, cr, uid, message, partners_to_notify=[], context=None):
         """ Return the list of partners to notify, based on their preferences.
 
             :param browse_record message: mail.message to notify
@@ -85,10 +85,13 @@
             if notification.read:
                 continue
             partner = notification.partner_id
+            # NOtify only required partners
+            if partner.id not in partners_to_notify:
+                continue
             # Do not send to partners without email address defined
             if not partner.email:
                 continue
-            # Partner does not want to receive any emails
+            # Partner does not want to receive any emails or is opt-out
             if partner.notification_email_send == 'none':
                 continue
             # Partner wants to receive only emails and comments
@@ -100,17 +103,26 @@
             notify_pids.append(partner.id)
         return notify_pids
 
-    def _notify(self, cr, uid, msg_id, context=None):
+    def _notify(self, cr, uid, msg_id, partners_to_notify=[], context=None):
         """ Send by email the notification depending on the user preferences """
         if context is None:
             context = {}
+        if not partners_to_notify:
+            return True
+        mail_message_obj = self.pool.get('mail.message')
+
+        # update message
+        mail_message_obj.write(cr, uid, msg_id, {'notified_partner_ids': [(4, id) for id in partners_to_notify]}, context=context)
+
         # mail_notify_noemail (do not send email) or no partner_ids: do not send, return
         if context.get('mail_notify_noemail'):
             return True
         # browse as SUPERUSER_ID because of access to res_partner not necessarily allowed
         msg = self.pool.get('mail.message').browse(cr, SUPERUSER_ID, msg_id, context=context)
-        notify_partner_ids = self.get_partners_to_notify(cr, uid, msg, context=context)
-        if not notify_partner_ids:
+        print 'before partner_to_notify', partners_to_notify
+        partners_to_notify = self.get_partners_to_notify(cr, uid, msg, partners_to_notify=partners_to_notify, context=context)
+        print 'partner_to_notify', partners_to_notify
+        if not partners_to_notify:
             return True
 
         # add the context in the email
@@ -126,26 +138,18 @@
         if signature:
             body_html = tools.append_content_to_html(body_html, signature, plaintext=True, container_tag='div')
 
-        # email_from: partner-user alias or partner email or mail.message email_from
-        if msg.author_id and msg.author_id.user_ids and msg.author_id.user_ids[0].alias_domain and msg.author_id.user_ids[0].alias_name:
-            email_from = '%s <%s@%s>' % (msg.author_id.name, msg.author_id.user_ids[0].alias_name, msg.author_id.user_ids[0].alias_domain)
-        elif msg.author_id:
-            email_from = '%s <%s>' % (msg.author_id.name, msg.author_id.email)
-        else:
-            email_from = msg.email_from
-
         mail_values = {
             'mail_message_id': msg.id,
-            'email_to': [],
             'auto_delete': True,
             'body_html': body_html,
-            'email_from': email_from,
-            'state': 'outgoing',
+            'recipient_ids': [(4, id) for id in partners_to_notify]
         }
-        mail_values['email_to'] = ', '.join(mail_values['email_to'])
+        if msg.email_from:
+            mail_values['email_from'] = msg.email_from
+        if msg.reply_to:
+            mail_values['reply_to'] = msg.reply_to
         email_notif_id = mail_mail.create(cr, uid, mail_values, context=context)
         try:
-            return mail_mail.send(cr, uid, [email_notif_id], recipient_ids=notify_partner_ids, context=context)
+            return mail_mail.send(cr, uid, [email_notif_id], context=context)
         except Exception:
             return False
-

=== modified file 'mail/mail_mail.py'
--- mail/mail_mail.py	2013-02-14 12:39:25 +0000
+++ mail/mail_mail.py	2013-03-13 13:50:27 +0000
@@ -55,10 +55,13 @@
             help="Permanently delete this email after sending it, to save space"),
         'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
         'email_from': fields.char('From', help='Message sender, taken from user preferences.'),
-        'email_to': fields.text('To', help='Message recipients'),
+        'email_to': fields.text('To', help='Message recipients (emails)'),
+        'recipient_ids': fields.many2many('res.partner', string='Message recipients (partners)'),
         'email_cc': fields.char('Cc', help='Carbon copy message recipients'),
+        'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML message"),
+
+        # If not set in create values, auto-detected based on create values (res_id, model, email_from)
         'reply_to': fields.char('Reply-To', help='Preferred response address for the message'),
-        'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML message"),
 
         # Auto-detected based on create() - if 'mail_message_id' was passed then this mail is a notification
         # and during unlink() we will not cascade delete the parent and its attachments
@@ -66,11 +69,11 @@
     }
 
     def _get_default_from(self, cr, uid, context=None):
-        this = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        this = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
         if this.alias_domain:
-            return '%s@%s' % (this.alias_name, this.alias_domain)
+            return '%s <%s@%s>' % (this.name, this.alias_name, this.alias_domain)
         elif this.email:
-            return this.email
+            return '%s <%s>' % (this.name, this.email)
         raise osv.except_osv(_('Invalid Action!'), _("Unable to send email, please configure the sender's email address or alias."))
 
     _defaults = {
@@ -82,12 +85,16 @@
         # protection for `default_type` values leaking from menu action context (e.g. for invoices)
         # To remove when automatic context propagation is removed in web client
         if context and context.get('default_type') and context.get('default_type') not in self._all_columns['type'].column.selection:
-            context = dict(context, default_type = None)
+            context = dict(context, default_type=None)
         return super(mail_mail, self).default_get(cr, uid, fields, context=context)
 
     def create(self, cr, uid, values, context=None):
         if 'notification' not in values and values.get('mail_message_id'):
             values['notification'] = True
+        if not values.get('reply_to') and values.get('res_id') and values.get('model') and hasattr(self.pool.get(values.get('model')), 'message_get_reply_to'):
+            values['reply_to'] = self.pool.get(values.get('model')).message_get_reply_to(cr, uid, [values.get('res_id')], context=context)[0]
+        elif not values.get('reply_to'):
+            values['reply_to'] = values.get('email_from', False)
         return super(mail_mail, self).create(cr, uid, values, context=context)
 
     def unlink(self, cr, uid, ids, context=None):
@@ -190,22 +197,6 @@
                 pass
         return body
 
-    def send_get_mail_reply_to(self, cr, uid, mail, partner=None, context=None):
-        """ Return a specific ir_email body. The main purpose of this method
-            is to be inherited by Portal, to add a link for signing in, in
-            each notification email a partner receives.
-
-            :param browse_record mail: mail.mail browse_record
-            :param browse_record partner: specific recipient partner
-        """
-        if mail.reply_to:
-            return mail.reply_to
-        if not mail.model or not mail.res_id:
-            return False
-        if not hasattr(self.pool.get(mail.model), 'message_get_reply_to'):
-            return False
-        return self.pool.get(mail.model).message_get_reply_to(cr, uid, [mail.res_id], context=context)[0]
-
     def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
         """ Return a dictionary for specific email values, depending on a
             partner, or generic to the whole recipients given by mail.email_to.
@@ -215,7 +206,6 @@
         """
         body = self.send_get_mail_body(cr, uid, mail, partner=partner, context=context)
         subject = self.send_get_mail_subject(cr, uid, mail, partner=partner, context=context)
-        reply_to = self.send_get_mail_reply_to(cr, uid, mail, partner=partner, context=context)
         body_alternative = tools.html2plaintext(body)
         email_to = [partner.email] if partner else tools.email_split(mail.email_to)
         return {
@@ -223,10 +213,9 @@
             'body_alternative': body_alternative,
             'subject': subject,
             'email_to': email_to,
-            'reply_to': reply_to,
         }
 
-    def send(self, cr, uid, ids, auto_commit=False, recipient_ids=None, context=None):
+    def send(self, cr, uid, ids, auto_commit=False, context=None):
         """ Sends the selected emails immediately, ignoring their current
             state (mails that have already been sent should not be passed
             unless they should actually be re-sent).
@@ -237,14 +226,10 @@
             :param bool auto_commit: whether to force a commit of the mail status
                 after sending each mail (meant only for scheduler processing);
                 should never be True during normal transactions (default: False)
-            :param list recipient_ids: specific list of res.partner recipients.
-                If set, one email is sent to each partner. Its is possible to
-                tune the sent email through ``send_get_mail_body`` and ``send_get_mail_subject``.
-                If not specified, one email is sent to mail_mail.email_to.
             :return: True
         """
         ir_mail_server = self.pool.get('ir.mail_server')
-        for mail in self.browse(cr, uid, ids, context=context):
+        for mail in self.browse(cr, SUPERUSER_ID, ids, context=context):
             try:
                 # handle attachments
                 attachments = []
@@ -252,11 +237,10 @@
                     attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
                 # specific behavior to customize the send email for notified partners
                 email_list = []
-                if recipient_ids:
-                    for partner in self.pool.get('res.partner').browse(cr, SUPERUSER_ID, recipient_ids, context=context):
-                        email_list.append(self.send_get_email_dict(cr, uid, mail, partner=partner, context=context))
-                else:
+                if mail.email_to:
                     email_list.append(self.send_get_email_dict(cr, uid, mail, context=context))
+                for partner in mail.recipient_ids:
+                    email_list.append(self.send_get_email_dict(cr, uid, mail, partner=partner, context=context))
 
                 # build an RFC2822 email.message.Message object and send it without queuing
                 for email in email_list:
@@ -267,7 +251,7 @@
                         body = email.get('body'),
                         body_alternative = email.get('body_alternative'),
                         email_cc = tools.email_split(mail.email_cc),
-                        reply_to = email.get('reply_to'),
+                        reply_to = mail.reply_to,
                         attachments = attachments,
                         message_id = mail.message_id,
                         references = mail.references,

=== modified file 'mail/mail_mail_view.xml'
--- mail/mail_mail_view.xml	2012-09-04 09:28:20 +0000
+++ mail/mail_mail_view.xml	2013-03-13 13:50:27 +0000
@@ -25,6 +25,8 @@
                                     </group>
                                     <group>
                                         <field name="partner_ids" widget="many2many_tags"/>
+                                        <field name="notified_partner_ids" widget="many2many_tags"/>
+                                        <field name="recipient_ids" widget="many2many_tags"/>
                                     </group>
                                 </group>
                                 <notebook>
@@ -67,7 +69,7 @@
                     <field name="subject"/>
                     <field name="author_id" string="User"/>
                     <field name="message_id" invisible="1"/>
-                    <field name="partner_ids" invisible="1"/>
+                    <field name="recipient_ids" invisible="1"/>
                     <field name="model" invisible="1"/>
                     <field name="res_id" invisible="1"/>
                     <field name="email_from" invisible="1"/>
@@ -97,7 +99,7 @@
                     <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="author_id"/>
-                        <field name="partner_ids"/>
+                        <field name="recipient_ids"/>
                         <field name="model"/>
                         <field name="res_id"/>
                     </group>

=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2013-02-08 11:52:38 +0000
+++ mail/mail_message.py	2013-03-13 13:50:27 +0000
@@ -139,6 +139,8 @@
                  "message, comment for other messages such as user replies"),
         'email_from': fields.char('From',
             help="Email address of the sender. This field is set when no matching partner is found for incoming emails."),
+        'reply_to': fields.char('Reply-To',
+            help='Reply email address. Setting the reply_to bypasses the automatic thread creation.'),
         'author_id': fields.many2one('res.partner', 'Author', select=1,
             ondelete='set null',
             help="Author of the message. If not set, email_from may hold an email address that did not match any partner."),
@@ -185,8 +187,9 @@
     _defaults = {
         'type': 'email',
         'date': lambda *a: fields.datetime.now(),
-        'author_id': lambda self, cr, uid, ctx={}: self._get_default_author(cr, uid, ctx),
+        'author_id': lambda self, cr, uid, ctx=None: self._get_default_author(cr, uid, ctx),
         'body': '',
+        'email_from': lambda self, cr, uid, ctx=None: self.pool.get('mail.mail')._get_default_from(cr, uid, ctx),
     }
 
     #------------------------------------------------------
@@ -731,7 +734,10 @@
         if context is None:
             context = {}
         default_starred = context.pop('default_starred', False)
-        if not values.get('message_id') and values.get('res_id') and values.get('model'):
+        # generate message_id, to redirect answers to the right discussion thread
+        if not values.get('message_id') and values.get('reply_to'):
+            values['message_id'] = tools.generate_tracking_message_id('reply_to-%(model)s' % values)
+        elif not values.get('message_id') and values.get('res_id') and values.get('model'):
             values['message_id'] = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values)
         elif not values.get('message_id'):
             values['message_id'] = tools.generate_tracking_message_id('private')
@@ -861,7 +867,7 @@
         # message has no subtype_id: pure log message -> no partners, no one notified
         if not message.subtype_id:
             return True
-            
+
         # all followers of the mail.message document have to be added as partners and notified
         if message.model and message.res_id:
             fol_obj = self.pool.get("mail.followers")
@@ -883,9 +889,7 @@
             partners_to_notify |= set(message.partner_ids)
 
         # notify
-        if partners_to_notify:
-            self.write(cr, SUPERUSER_ID, [newid], {'notified_partner_ids': [(4, p.id) for p in partners_to_notify]}, context=context)
-        notification_obj._notify(cr, uid, newid, context=context)
+        notification_obj._notify(cr, uid, newid, partners_to_notify=[p.id for p in partners_to_notify], context=context)
         message.refresh()
 
         # An error appear when a user receive a notification without notifying

=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py	2013-03-01 07:07:43 +0000
+++ mail/mail_thread.py	2013-03-13 13:50:27 +0000
@@ -468,6 +468,7 @@
         # 1. Verify if this is a reply to an existing thread
         thread_references = references or in_reply_to
         ref_match = thread_references and tools.reference_re.search(thread_references)
+
         if ref_match:
             thread_id = int(ref_match.group(1))
             model = ref_match.group(2) or model
@@ -480,7 +481,10 @@
 
         # Verify whether this is a reply to a private message
         if in_reply_to:
-            message_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', in_reply_to)], limit=1, context=context)
+            message_ids = self.pool.get('mail.message').search(cr, uid, [
+                                ('message_id', '=', in_reply_to),
+                                '!', ('message_id', 'ilike', 'reply_to')
+                            ], limit=1, context=context)
             if message_ids:
                 message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context)
                 _logger.debug('Routing mail with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s',
@@ -772,8 +776,7 @@
             author_ids = self._message_find_partners(cr, uid, message, ['From'], context=context)
             if author_ids:
                 msg_dict['author_id'] = author_ids[0]
-            else:
-                msg_dict['email_from'] = decode(message.get('from'))
+            msg_dict['email_from'] = decode(message.get('from'))
         partner_ids = self._message_find_partners(cr, uid, message, ['To', 'Cc'], context=context)
         msg_dict['partner_ids'] = [(4, partner_id) for partner_id in partner_ids]
 

=== modified file 'mail/res_partner_view.xml'
--- mail/res_partner_view.xml	2012-11-29 22:26:45 +0000
+++ mail/res_partner_view.xml	2013-03-13 13:50:27 +0000
@@ -7,6 +7,9 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='active']" position="after">
+                    <field name='notification_email_send'/>
+                </xpath>
                 <xpath expr="//sheet" position="after">
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>

=== modified file 'mail/tests/test_mail_features.py'
--- mail/tests/test_mail_features.py	2013-02-14 12:39:25 +0000
+++ mail/tests/test_mail_features.py	2013-03-13 13:50:27 +0000
@@ -154,7 +154,7 @@
         new_mail = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [('message_id', '=', test_msg_id)])[0])
         # Test: author_id set, not email_from
         self.assertEqual(new_mail.author_id, user_raoul.partner_id, 'message process wrong author found')
-        self.assertFalse(new_mail.email_from, 'message process should not set the email_from when an author is found')
+        self.assertEqual(new_mail.email_from, user_raoul.email, 'message process wrong email_from')
 
         # Do: post a new message, with a unknown partner
         test_msg_id = '<[e-mail]>'
@@ -524,7 +524,7 @@
         # 1. mass_mail on pigs and bird
         compose_id = mail_compose.create(cr, uid,
             {'subject': _subject, 'body': '${object.description}'},
-            {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group', 'default_res_id': False,
+            {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group', 'default_res_id': False, 'default_notify': True,
                 'active_ids': [self.group_pigs_id, group_bird_id]})
         compose = mail_compose.browse(cr, uid, compose_id)
 

=== modified file 'mail/wizard/invite.py'
--- mail/wizard/invite.py	2013-02-21 14:22:49 +0000
+++ mail/wizard/invite.py	2013-03-13 13:50:27 +0000
@@ -66,16 +66,17 @@
                 signature = user_id and user_id["signature"] or ''
                 if signature:
                     wizard.message = tools.append_content_to_html(wizard.message, signature, plaintext=True, container_tag='div')
+
                 # send mail to new followers
-                for follower_id in new_follower_ids:
-                    mail_mail = self.pool.get('mail.mail')
-                    # the invite wizard should create a private message not related to any object -> no model, no res_id
-                    mail_id = mail_mail.create(cr, uid, {
-                        'model': wizard.res_model,
-                        'res_id': wizard.res_id,
-                        'subject': 'Invitation to follow %s' % document.name_get()[0][1],
-                        'body_html': '%s' % wizard.message,
-                        'auto_delete': True,
-                        }, context=context)
-                    mail_mail.send(cr, uid, [mail_id], recipient_ids=[follower_id], context=context)
+                # the invite wizard should create a private message not related to any object -> no model, no res_id
+                mail_mail = self.pool.get('mail.mail')
+                mail_id = mail_mail.create(cr, uid, {
+                    'model': wizard.res_model,
+                    'res_id': wizard.res_id,
+                    'subject': 'Invitation to follow %s' % document.name_get()[0][1],
+                    'body_html': '%s' % wizard.message,
+                    'auto_delete': True,
+                    'recipient_ids': [(4, id) for id in new_follower_ids]
+                    }, context=context)
+                mail_mail.send(cr, uid, [mail_id], context=context)
         return {'type': 'ir.actions.act_window_close'}

=== modified file 'mail/wizard/mail_compose_message.py'
--- mail/wizard/mail_compose_message.py	2013-01-08 16:13:32 +0000
+++ mail/wizard/mail_compose_message.py	2013-03-13 13:50:27 +0000
@@ -113,6 +113,12 @@
         'partner_ids': fields.many2many('res.partner',
             'mail_compose_message_res_partner_rel',
             'wizard_id', 'partner_id', 'Additional contacts'),
+        'post': fields.boolean('Post a copy in the document',
+            help='Post a copy of the message on the document communication history.'),
+        'notify': fields.boolean('Notify followers',
+            help='Notify followers of the document'),
+        'same_thread': fields.boolean('Replies in the document',
+            help='Replies to the messages will go into the selected document.'),
         'attachment_ids': fields.many2many('ir.attachment',
             'mail_compose_message_ir_attachments_rel',
             'wizard_id', 'attachment_id', 'Attachments'),
@@ -121,9 +127,13 @@
 
     _defaults = {
         'composition_mode': 'comment',
+        'email_from': lambda self, cr, uid, ctx={}: self.pool.get('mail.mail')._get_default_from(cr, uid, context=ctx),
         'body': lambda self, cr, uid, ctx={}: '',
         'subject': lambda self, cr, uid, ctx={}: False,
         'partner_ids': lambda self, cr, uid, ctx={}: [],
+        'notify': lambda self, cr, uid, ctx={}: False,
+        'post': lambda self, cr, uid, ctx={}: True,
+        'same_thread': lambda self, cr, uid, ctx={}: True,
     }
 
     def _notify(self, cr, uid, newid, context=None):
@@ -215,15 +225,27 @@
                     new_attachments = email_dict.pop('attachments', [])
                     post_values['attachments'] += new_attachments
                     post_values.update(email_dict)
+                    # email_from: mass mailing only can specify another email_from
+                    if email_dict.get('email_from'):
+                        post_values['email_from'] = email_dict.pop('email_from')
+                    # replies redirection: mass mailing only
+                    if not wizard.same_thread:
+                        post_values['reply_to'] = email_dict.pop('reply_to')
                 # automatically subscribe recipients if asked to
                 if context.get('mail_post_autofollow') and wizard.model and post_values.get('partner_ids'):
                     active_model_pool.message_subscribe(cr, uid, [res_id], [item[1] for item in post_values.get('partner_ids')], context=context)
                 # post the message
-                active_model_pool.message_post(cr, uid, [res_id], type='comment', subtype='mt_comment', context=context, **post_values)
-
-            # post process: update attachments, because id is not necessarily known when adding attachments in Chatter
-            # self.pool.get('ir.attachment').write(cr, uid, [attach.id for attach in wizard.attachment_ids], {
-            #     'res_id': wizard.id, 'res_model': wizard.model or False}, context=context)
+                if mass_mail_mode and not wizard.post:
+                    post_values['recipient_ids'] = post_values.pop('partner_ids')
+                    self.pool.get('mail.mail').create(cr, uid, post_values, context=context)
+                else:
+                    subtype = 'mail.mt_comment'
+                    if mass_mail_mode and not wizard.notify:
+                        subtype = False
+                    msg_id = active_model_pool.message_post(cr, uid, [res_id], type='comment', subtype=subtype, context=context, **post_values)
+                    # mass_mailing, post without notify: notify specific partners
+                    if mass_mail_mode and not wizard.notify and post_values['partner_ids']:
+                        self.pool.get('mail.notification')._notify(cr, uid, msg_id, [item[1] for item in post_values['partner_ids']], context=context)
 
         return {'type': 'ir.actions.act_window_close'}
 
@@ -234,6 +256,8 @@
         return {
             'subject': self.render_template(cr, uid, wizard.subject, wizard.model, res_id, context),
             'body': self.render_template(cr, uid, wizard.body, wizard.model, res_id, context),
+            'email_from': self.render_template(cr, uid, wizard.email_from, wizard.model, res_id, context),
+            'reply_to': self.render_template(cr, uid, wizard.reply_to, wizard.model, res_id, context),
         }
 
     def render_template(self, cr, uid, template, model, res_id, context=None):
@@ -258,7 +282,7 @@
             result = eval(exp, {
                 'user': self.pool.get('res.users').browse(cr, uid, uid, context=context),
                 'object': self.pool.get(model).browse(cr, uid, res_id, context=context),
-                'context': dict(context), # copy context to prevent side-effects of eval
+                'context': dict(context),  # copy context to prevent side-effects of eval
                 })
             return result and tools.ustr(result) or ''
         return template and EXPRESSION_PATTERN.sub(merge, template)

=== modified file 'mail/wizard/mail_compose_message_view.xml'
--- mail/wizard/mail_compose_message_view.xml	2012-12-20 17:20:12 +0000
+++ mail/wizard/mail_compose_message_view.xml	2013-03-13 13:50:27 +0000
@@ -13,24 +13,33 @@
                         <field name="res_id" invisible="1"/>
                         <field name="parent_id" invisible="1"/>
                         <!-- visible wizard -->
-                        <label for="partner_ids" string="Recipients"/>
-                        <div groups="base.group_user">
-                            <span attrs="{'invisible':['|', ('model', '=', False), ('composition_mode', '!=', 'mass_mail')]}">
-                                Followers of selected items and
-                            </span>
-                            <span attrs="{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}">
+                        <field name="email_from"
+                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
+                        <field name="subject" placeholder="Subject..." required="True"/>
+                        <field name="post"  groups="base.group_no_one"
+                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
+                        <field name="notify"  groups="base.group_no_one"
+                            attrs="{'invisible':['|', ('post', '!=', True), ('composition_mode', '!=', 'mass_mail')]}"/>
+                        <field name="same_thread"
+                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
+                        <field name="reply_to" placeholder="Email address te redirect replies..."
+                            attrs="{'invisible':['|', ('same_thread', '=', True), ('composition_mode', '!=', 'mass_mail')],
+                                    'required':[('same_thread', '!=', True)]}"/>
+                        <label for="partner_ids" string="Recipients"
+                            attrs="{'invisible':[('composition_mode', '=', 'mass_mail')]}"/>
+                        <div groups="base.group_user"
+                            attrs="{'invisible':[('composition_mode', '=', 'mass_mail')]}">
+                            <span attrs="{'invisible':[('model', '=', False)]}">
                                 Followers of
-                                <field name="record_name" readonly="1" class="oe_inline"
-                                    attrs="{'invisible':[('model', '=', False)]}"/>
-                                and 
+                                <field name="record_name" readonly="1" class="oe_inline"/>
+                                and
                             </span>
                             <field name="partner_ids" widget="many2many_tags_email" placeholder="Add contacts to notify..."
                                 context="{'force_email':True, 'show_email':True}"/>
                         </div>
-                        <field name="subject" placeholder="Subject..."/>
                     </group>
                     <field name="body"/>
-                    <field name="attachment_ids" widget="many2many_binary"/>
+                    <field name="attachment_ids" widget="many2many_binary" string="Attach a file"/>
                     <footer>
                         <button string="Send" name="send_mail" type="object" class="oe_highlight"/>
                         or
@@ -51,7 +60,7 @@
         </record>
 
         <!--  Replace the default mass-mailing wizard in base with the composition wizard -->
-        <act_window name="Mass Mailing"
+        <act_window name="Partner Mass Mailing"
                 res_model="mail.compose.message"
                 src_model="res.partner"
                 view_mode="form"
@@ -59,6 +68,10 @@
                 target="new"
                 key2="client_action_multi"
                 id="base.action_partner_mass_mail"
-                context="{'default_composition_mode': 'mass_mail'}"/>
+                context="{
+                            'default_composition_mode': 'mass_mail',
+                            'default_partner_to': '${object.id or \'\'}',
+                        }"/>
+
     </data>
 </openerp>

=== modified file 'portal_sale/portal_sale.py'
--- portal_sale/portal_sale.py	2012-12-21 11:53:15 +0000
+++ portal_sale/portal_sale.py	2013-03-13 13:50:27 +0000
@@ -59,12 +59,11 @@
         assert len(ids) == 1
         document = self.browse(cr, uid, ids[0], context=context)
         partner = document.partner_id
+        # TDE note: this code should be improved: used a real invite wizard instead of an ugly email
         if partner.id not in document.message_follower_ids:
             self.message_subscribe(cr, uid, ids, [partner.id], context=context)
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             mail_values = {
-                'email_from': user.partner_id.email,
-                'email_to': partner.email,
+                'recipient_ids': [(4, partner.id)],
                 'subject': 'Invitation to follow %s' % document.name_get()[0][1],
                 'body_html': 'You have been invited to follow %s' % document.name_get()[0][1],
                 'auto_delete': True,
@@ -72,7 +71,7 @@
             }
             mail_obj = self.pool.get('mail.mail')
             mail_id = mail_obj.create(cr, uid, mail_values, context=context)
-            mail_obj.send(cr, uid, [mail_id], recipient_ids=[partner.id], context=context)
+            mail_obj.send(cr, uid, [mail_id], context=context)
         return super(sale_order, self).action_button_confirm(cr, uid, ids, context=context)
 
     def get_signup_url(self, cr, uid, ids, context=None):
@@ -120,12 +119,11 @@
         # fetch the partner's id and subscribe the partner to the invoice
         document = self.browse(cr, uid, ids[0], context=context)
         partner = document.partner_id
+        # TDE note: this code should be improved: used a real invite wizard instead of an ugly email
         if partner.id not in document.message_follower_ids:
             self.message_subscribe(cr, uid, ids, [partner.id], context=context)
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             mail_values = {
-                'email_from': user.partner_id.email,
-                'email_to': partner.email,
+                'recipient_ids': [(4, partner.id)],
                 'subject': 'Invitation to follow %s' % document.name_get()[0][1],
                 'body_html': 'You have been invited to follow %s' % document.name_get()[0][1],
                 'auto_delete': True,
@@ -133,7 +131,7 @@
             }
             mail_obj = self.pool.get('mail.mail')
             mail_id = mail_obj.create(cr, uid, mail_values, context=context)
-            mail_obj.send(cr, uid, [mail_id], recipient_ids=[partner.id], context=context)
+            mail_obj.send(cr, uid, [mail_id], context=context)
         return super(account_invoice, self).invoice_validate(cr, uid, ids, context=context)
 
     def get_signup_url(self, cr, uid, ids, context=None):

=== modified file 'portal_sale/portal_sale_data.xml'
--- portal_sale/portal_sale_data.xml	2012-12-21 16:48:08 +0000
+++ portal_sale/portal_sale_data.xml	2013-03-13 13:50:27 +0000
@@ -8,7 +8,7 @@
             <field name="name">Sales Order - Send by Email (Portal)</field>
             <field name="email_from">${object.user_id.email or ''}</field>
             <field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
-            <field name="email_recipients">${object.partner_invoice_id.id}</field>
+            <field name="partner_to">${object.partner_invoice_id.id}</field>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="auto_delete" eval="True"/>
             <field name="report_template" ref="sale.report_sale_order"/>
@@ -97,7 +97,7 @@
             <field name="name">Invoice - Send by Email (Portal)</field>
             <field name="email_from">${object.user_id.email or object.company_id.email or 'noreply@localhost'}</field>
             <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field>
-            <field name="email_recipients">${object.partner_id.id}</field>
+            <field name="partner_to">${object.partner_id.id}</field>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field name="auto_delete" eval="True"/>
             <field name="report_template" ref="account.account_invoices"/>

=== modified file 'purchase/edi/purchase_order_action_data.xml'
--- purchase/edi/purchase_order_action_data.xml	2012-12-14 09:10:57 +0000
+++ purchase/edi/purchase_order_action_data.xml	2013-03-13 13:50:27 +0000
@@ -21,7 +21,7 @@
             <field name="name">Purchase Order - Send by mail</field>
             <field name="email_from">${object.validator.email or ''}</field>
             <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
-            <field name="email_recipients">${object.partner_id.id}</field>
+            <field name="partner_to">${object.partner_id.id}</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field name="auto_delete" eval="True"/>
             <field name="report_template" ref="report_purchase_quotation"/>

=== modified file 'sale/edi/sale_order_action_data.xml'
--- sale/edi/sale_order_action_data.xml	2012-12-21 16:48:08 +0000
+++ sale/edi/sale_order_action_data.xml	2013-03-13 13:50:27 +0000
@@ -22,7 +22,7 @@
             <field name="name">Sales Order - Send by Email</field>
             <field name="email_from">${object.user_id.email or ''}</field>
             <field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
-            <field name="email_recipients">${object.partner_invoice_id.id}</field>
+            <field name="partner_to">${object.partner_invoice_id.id}</field>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="auto_delete" eval="True"/>
             <field name="report_template" ref="report_sale_order"/>