[MERGE] OpenChatter "Invite Yur Mummy" Invite branch

Featuring :
- Invite wizard, to add followers to a document, and to send them an email
- Invite button in Chatter, that calls the Invite wizard
- each send notification is a distinct email, one for each partner to have to receive a notification. Changes in mail_followers and mail_mail to handle this. If send receives a notifier_ids parameter, it uses it instead of the mail_mail.email_to field, and send an email to each partner. Overriding some of the methods allow to somewhat personnalize the email
- Portal: add the signin url in notifications send to portal users
- Tests: made a class for tests using emails, defining and removing mockups for the gateway. Updated mail tests, added an invite test in portal.

bzr revid: tde@openerp.com-20120913163625-7ewt7j3m63ii71jf

addons/email_template/tests/test_mail.py

@@ -20,17 +20,10 @@
 ##############################################################################
 
 import base64
-from openerp.tests import common
+from openerp.addons.mail.tests import test_mail
 
-class test_message_compose(common.TransactionCase):
 
-    def _mock_smtp_gateway(self, *args, **kwargs):
-        return True
-
-    def _mock_build_email(self, *args, **kwargs):
-        self._build_email_args = args
-        self._build_email_kwargs = kwargs
-        return self.build_email_real(*args, **kwargs)
+class test_message_compose(test_mail.TestMailMockups):
 
     def setUp(self):
         super(test_message_compose, self).setUp()
@@ -40,11 +33,6 @@ class test_message_compose(common.TransactionCase):
         self.res_users = self.registry('res.users')
         self.res_partner = self.registry('res.partner')
 
-        # Install mock SMTP gateway
-        self.build_email_real = self.registry('ir.mail_server').build_email
-        self.registry('ir.mail_server').build_email = self._mock_build_email
-        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
-
         # create a 'pigs' and 'bird' groups that will be used through the various tests
         self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
             {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})

addons/mail/__openerp__.py

@@ -61,6 +61,7 @@ The main features of the module are:
     'website': 'http://www.openerp.com',
     'depends': ['base', 'base_tools', 'base_setup'],
     'data': [
+        'wizard/invite_view.xml',
         'wizard/mail_compose_message_view.xml',
         'res_config_view.xml',
         'mail_message_view.xml',

addons/mail/mail_followers.py

@@ -23,6 +23,7 @@ from osv import osv
 from osv import fields
 import tools
 
+
 class mail_followers(osv.Model):
     """ mail_followers holds the data related to the follow mechanism inside
         OpenERP. Partners can choose to follow documents (records) of any kind
@@ -84,16 +85,44 @@ class mail_notification(osv.Model):
         notif_ids = self.search(cr, uid, [('partner_id', '=', partner_id), ('message_id', '=', msg_id)], context=context)
         return self.write(cr, uid, notif_ids, {'read': True}, context=context)
 
+    def get_partners_to_notify(self, cr, uid, partner_ids, message, context=None):
+        """ Return the list of partners to notify, based on their preferences.
+
+            :param browse_record message: mail.message to notify
+        """
+        notify_pids = []
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+            # Do not send an email to the writer
+            if partner.user_ids and partner.user_ids[0].id == uid:
+                continue
+            # Do not send to partners without email address defined
+            if not partner.email:
+                continue
+            # Partner does not want to receive any emails
+            if partner.notification_email_send == 'none':
+                continue
+            # Partner wants to receive only emails and comments
+            if partner.notification_email_send == 'comment' and message.type not in ('email', 'comment'):
+                continue
+            # Partner wants to receive only emails
+            if partner.notification_email_send == 'email' and message.type != 'email':
+                continue
+            notify_pids.append(partner.id)
+        return notify_pids
+
     def notify(self, cr, uid, partner_ids, msg_id, context=None):
         """ Send by email the notification depending on the user preferences """
         context = context or {}
         # mail_noemail (do not send email) or no partner_ids: do not send, return
         if context.get('mail_noemail') or not partner_ids:
             return True
-
-        mail_mail = self.pool.get('mail.mail')
         msg = self.pool.get('mail.message').browse(cr, uid, msg_id, context=context)
 
+        notify_partner_ids = self.get_partners_to_notify(cr, uid, partner_ids, msg, context=context)
+        if not notify_partner_ids:
+            return True
+
+        mail_mail = self.pool.get('mail.mail')
         # add signature
         body_html = msg.body
         signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
@@ -107,27 +136,6 @@ class mail_notification(osv.Model):
             'body_html': body_html,
             'state': 'outgoing',
         }
-
-        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
-            # Do not send an email to the writer
-            if partner.user_ids and partner.user_ids[0].id == uid:
-                continue
-            # Do not send to partners without email address defined
-            if not partner.email:
-                continue
-            # Partner does not want to receive any emails
-            if partner.notification_email_send == 'none':
-                continue
-            # Partner wants to receive only emails and comments
-            if partner.notification_email_send == 'comment' and msg.type not in ('email', 'comment'):
-                continue
-            # Partner wants to receive only emails
-            if partner.notification_email_send == 'email' and msg.type != 'email':
-                continue
-            if partner.email not in mail_values['email_to']:
-                mail_values['email_to'].append(partner.email)
-        if mail_values['email_to']:
-            mail_values['email_to'] = ', '.join(mail_values['email_to'])
-            email_notif_id = mail_mail.create(cr, uid, mail_values, context=context)
-            mail_mail.send(cr, uid, [email_notif_id], context=context)
-        return True
+        mail_values['email_to'] = ', '.join(mail_values['email_to'])
+        email_notif_id = mail_mail.create(cr, uid, mail_values, context=context)
+        return mail_mail.send(cr, uid, [email_notif_id], recipient_ids=notify_partner_ids, context=context)

addons/mail/mail_group.py

@@ -19,13 +19,11 @@
 #
 ##############################################################################
 
-import datetime as DT
 import openerp
 import openerp.tools as tools
-from operator import itemgetter
 from osv import osv
 from osv import fields
-from tools.translate import _
+
 
 class mail_group(osv.Model):
     """ A mail_group is a collection of users sharing messages in a discussion
@@ -47,7 +45,7 @@ class mail_group(osv.Model):
     _columns = {
         'description': fields.text('Description'),
         'menu_id': fields.many2one('ir.ui.menu', string='Related Menu', required=True, ondelete="cascade"),
-        'public': fields.selection([('public','Public'),('private','Private'),('groups','Selected Group Only')], 'Privacy', required=True,
+        'public': fields.selection([('public', 'Public'), ('private', 'Private'), ('groups', 'Selected Group Only')], 'Privacy', required=True,
             help='This group is visible by non members. \
             Invisible groups can add members through the invite button.'),
         'group_public_id': fields.many2one('res.groups', string='Authorized Group'),
@@ -126,14 +124,14 @@ class mail_group(osv.Model):
             search_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'view_message_search')
             params = {
                 'search_view_id': search_ref and search_ref[1] or False,
-                'domain': [('model','=','mail.group'), ('res_id','=',mail_group_id)],
+                'domain': [('model', '=', 'mail.group'), ('res_id', '=', mail_group_id)],
                 'context': {'default_model': 'mail.group', 'default_res_id': mail_group_id},
                 'res_model': 'mail.message',
                 'thread_level': 1,
             }
             cobj = self.pool.get('ir.actions.client')
             newref = cobj.copy(cr, uid, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
-            self.write(cr, uid, [mail_group_id], {'action': 'ir.actions.client,'+str(newref), 'mail_group_id': mail_group_id}, context=context)
+            self.write(cr, uid, [mail_group_id], {'action': 'ir.actions.client,' + str(newref), 'mail_group_id': mail_group_id}, context=context)
 
         mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
 
@@ -142,9 +140,13 @@ class mail_group(osv.Model):
         return mail_group_id
 
     def unlink(self, cr, uid, ids, context=None):
+        groups = self.browse(cr, uid, ids, context=context)
         # Cascade-delete mail aliases as well, as they should not exist without the mail group.
         mail_alias = self.pool.get('mail.alias')
-        alias_ids = [group.alias_id.id for group in self.browse(cr, uid, ids, context=context) if group.alias_id]
+        alias_ids = [group.alias_id.id for group in groups if group.alias_id]
+        # Cascade-delete menu entries as well
+        self.pool.get('ir.ui.menu').unlink(cr, uid, [group.menu_id.id for group in groups if group.menu_id], context=context)
+        # Delete mail_group
         res = super(mail_group, self).unlink(cr, uid, ids, context=context)
         mail_alias.unlink(cr, uid, alias_ids, context=context)
         return res

addons/mail/mail_mail.py

@@ -30,6 +30,7 @@ from tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
+
 class mail_mail(osv.Model):
     """ Model holding RFC2822 email messages to send. This model also provides
         facilities to queue and send new email messages.  """
@@ -58,8 +59,8 @@ class mail_mail(osv.Model):
         '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 cascade delete the parent and its attachments 
-        'notification': fields.boolean('Is Notification') 
+        # and during unlink() we will not cascade delete the parent and its attachments
+        'notification': fields.boolean('Is Notification')
     }
 
     def _get_default_from(self, cr, uid, context=None):
@@ -76,21 +77,21 @@ class mail_mail(osv.Model):
     def create(self, cr, uid, values, context=None):
         if 'notification' not in values and values.get('mail_message_id'):
             values['notification'] = True
-        return super(mail_mail,self).create(cr, uid, values, context=context)
+        return super(mail_mail, self).create(cr, uid, values, context=context)
 
     def unlink(self, cr, uid, ids, context=None):
         # cascade-delete the parent message for all mails that are not created for a notification
-        ids_to_cascade = self.search(cr, uid, [('notification','=',False),('id','in',ids)])
+        ids_to_cascade = self.search(cr, uid, [('notification', '=', False), ('id', 'in', ids)])
         parent_msg_ids = [m.mail_message_id.id for m in self.browse(cr, uid, ids_to_cascade, context=context)]
-        res = super(mail_mail,self).unlink(cr, uid, ids, context=context)
+        res = super(mail_mail, self).unlink(cr, uid, ids, context=context)
         self.pool.get('mail.message').unlink(cr, uid, parent_msg_ids, context=context)
         return res
 
     def mark_outgoing(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'outgoing'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'outgoing'}, context=context)
 
     def cancel(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
     def process_email_queue(self, cr, uid, ids=None, context=None):
         """Send immediately queued messages, committing after each
@@ -127,7 +128,7 @@ class mail_mail(osv.Model):
         """Perform any post-processing necessary after sending ``mail``
         successfully, including deleting it completely along with its
         attachment if the ``auto_delete`` flag of the mail was set.
-        Overridden by subclasses for extra post-processing behaviors. 
+        Overridden by subclasses for extra post-processing behaviors.
 
         :param browse_record mail: the mail that was just sent
         :return: True
@@ -136,14 +137,46 @@ class mail_mail(osv.Model):
             mail.unlink()
         return True
 
-    def _send_get_mail_subject(self, cr, uid, mail, force=False, context=None):
-        """ if void and related document: '<Author> posted on <Resource>'
-            :param mail: mail.mail browse_record """
+    def send_get_mail_subject(self, cr, uid, mail, force=False, partner=None, context=None):
+        """ If subject is void and record_name defined: '<Author> posted on <Resource>'
+
+            :param boolean force: force the subject replacement
+            :param browse_record mail: mail.mail browse_record
+            :param browse_record partner: specific recipient partner
+        """
         if force or (not mail.subject and mail.model and mail.res_id):
             return '%s posted on %s' % (mail.author_id.name, mail.record_name)
         return mail.subject
 
-    def send(self, cr, uid, ids, auto_commit=False, context=None):
+    def send_get_mail_body(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
+        """
+        return mail.body_html
+
+    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.
+
+            :param browse_record mail: mail.mail browse_record
+            :param browse_record partner: specific recipient partner
+        """
+        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)
+        body_alternative = tools.html2plaintext(body)
+        email_to = [partner.email] if partner else tools.email_split(mail.email_to)
+        return {
+            'body': body,
+            'body_alternative': body_alternative,
+            'subject': subject,
+            'email_to': email_to,
+        }
+
+    def send(self, cr, uid, ids, auto_commit=False, recipient_ids=None, 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).
@@ -154,50 +187,55 @@ class mail_mail(osv.Model):
             :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):
             try:
-                body = mail.body_html
-                subject = self._send_get_mail_subject(cr, uid, mail, context=context)
-
                 # handle attachments
                 attachments = []
                 for attach in mail.attachment_ids:
                     attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
-
-                # use only sanitized html and set its plaintexted version as alternative
-                body_alternative = tools.html2plaintext(body)
-                content_subtype_alternative = 'plain'
+                # 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, uid, recipient_ids, context=context):
+                        email_list.append(self.send_get_email_dict(cr, uid, mail, partner=partner, context=context))
+                else:
+                    email_list.append(self.send_get_email_dict(cr, uid, mail, context=context))
 
                 # build an RFC2822 email.message.Message object and send it without queuing
-                msg = ir_mail_server.build_email(
-                    email_from = mail.email_from,
-                    email_to = tools.email_split(mail.email_to),
-                    subject = subject,
-                    body = body,
-                    body_alternative = body_alternative,
-                    email_cc = tools.email_split(mail.email_cc),
-                    reply_to = mail.reply_to,
-                    attachments = attachments,
-                    message_id = mail.message_id,
-                    references = mail.references,
-                    object_id = mail.res_id and ('%s-%s' % (mail.res_id, mail.model)),
-                    subtype = 'html',
-                    subtype_alternative = content_subtype_alternative)
-                res = ir_mail_server.send_email(cr, uid, msg,
-                    mail_server_id=mail.mail_server_id.id, context=context)
+                for email in email_list:
+                    msg = ir_mail_server.build_email(
+                        email_from = mail.email_from,
+                        email_to = email.get('email_to'),
+                        subject = email.get('subject'),
+                        body = email.get('body'),
+                        body_alternative = email.get('body_alternative'),
+                        email_cc = tools.email_split(mail.email_cc),
+                        reply_to = mail.reply_to,
+                        attachments = attachments,
+                        message_id = mail.message_id,
+                        references = mail.references,
+                        object_id = mail.res_id and ('%s-%s' % (mail.res_id, mail.model)),
+                        subtype = 'html',
+                        subtype_alternative = 'plain')
+                    res = ir_mail_server.send_email(cr, uid, msg,
+                        mail_server_id=mail.mail_server_id.id, context=context)
                 if res:
-                    mail.write({'state':'sent', 'message_id': res})
+                    mail.write({'state': 'sent', 'message_id': res})
                 else:
-                    mail.write({'state':'exception'})
+                    mail.write({'state': 'exception'})
                 mail.refresh()
                 if mail.state == 'sent':
                     self._postprocess_sent_message(cr, uid, mail, context=context)
             except Exception:
                 _logger.exception('failed sending mail.mail %s', mail.id)
-                mail.write({'state':'exception'})
+                mail.write({'state': 'exception'})
 
             if auto_commit == True:
                 cr.commit()

addons/mail/mail_message.py

@@ -20,11 +20,13 @@
 ##############################################################################
 
 import logging
+import openerp
 import tools
 
 from email.header import decode_header
 from operator import itemgetter
 from osv import osv, fields
+from tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
@@ -35,6 +37,7 @@ def decode(text):
         text = decode_header(text.replace('\r', ''))
         return ''.join([tools.ustr(x[0], x[1]) for x in text])
 
+
 class mail_message(osv.Model):
     """ Messages model: system notification (replacing res.log notifications),
         comments (OpenChatter discussion) and incoming emails. """
@@ -57,7 +60,10 @@ class mail_message(osv.Model):
         for message in self.browse(cr, uid, ids, context=context):
             if not message.model or not message.res_id:
                 continue
-            result[message.id] = self._shorten_name(self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1])
+            try:
+                result[message.id] = self._shorten_name(self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1])
+            except openerp.exceptions.AccessDenied, e:
+                pass
         return result
 
     def _get_unread(self, cr, uid, ids, name, arg, context=None):
@@ -341,3 +347,25 @@ class mail_message(osv.Model):
             default = {}
         default.update(message_id=False, headers=False)
         return super(mail_message, self).copy(cr, uid, id, default=default, context=context)
+
+    #------------------------------------------------------
+    # Tools
+    #------------------------------------------------------
+
+    def check_partners_email(self, cr, uid, partner_ids, context=None):
+        """ Verify that selected partner_ids have an email_address defined.
+            Otherwise throw a warning. """
+        partner_wo_email_lst = []
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+            if not partner.email:
+                partner_wo_email_lst.append(partner)
+        if not partner_wo_email_lst:
+            return {}
+        warning_msg = _('The following partners chosen as recipients for the email have no email address linked :')
+        for partner in partner_wo_email_lst:
+            warning_msg += '\n- %s' % (partner.name)
+        return {'warning': {
+                    'title': _('Partners email addresses not found'),
+                    'message': warning_msg,
+                    }
+                }

addons/mail/mail_thread.py

@@ -623,14 +623,8 @@ class mail_thread(osv.AbstractModel):
         return self.message_subscribe(cr, uid, ids, partner_ids, context=context)
 
     def message_subscribe(self, cr, uid, ids, partner_ids, context=None):
-        """ Add partners to the records followers.
-            :param partner_ids: a list of partner_ids to subscribe
-            :param return: new value of followers if read_back key in context
-        """
-        self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
-        if context and context.get('read_back'):
-            return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
-        return []
+        """ Add partners to the records followers. """
+        return self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
 
     def message_unsubscribe_users(self, cr, uid, ids, user_ids=None, context=None):
         """ Wrapper on message_subscribe, using users. If user_ids is not
@@ -640,14 +634,8 @@ class mail_thread(osv.AbstractModel):
         return self.message_unsubscribe(cr, uid, ids, partner_ids, context=context)
 
     def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
-        """ Remove partners from the records followers.
-            :param partner_ids: a list of partner_ids to unsubscribe
-            :param return: new value of followers if read_back key in context
-        """
-        self.write(cr, uid, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
-        if context and context.get('read_back'):
-            return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
-        return []
+        """ Remove partners from the records followers. """
+        return self.write(cr, uid, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
 
     #------------------------------------------------------
     # Thread state

addons/mail/static/src/css/mail.css

@@ -96,10 +96,6 @@
     width: 120px;
 }
 
-.openerp button.oe_mail_button_followers {
-    display: inline;
-}
-
 .openerp button.oe_mail_button_mouseout {
   color: white;
   background-color: #8a89ba;

addons/mail/static/src/js/mail_followers.js

@@ -31,33 +31,52 @@ openerp_mail_followers = function(session, mail) {
         },
 
         start: function() {
-            var self = this;
-            // NB: all the widget should be modified to check the actual_mode property on view, not use
-            // any other method to know if the view is in create mode anymore
+            // use actual_mode property on view to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
-            this.$el.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
-                .mouseover(function () { $(this).html('Follow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
-                .mouseleave(function () { $(this).html('Not following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
-            this.$el.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
-                .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
-                .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
             this.reinit();
+            this.bind_events();
         },
 
         _check_visibility: function() {
             this.$el.toggle(this.view.get("actual_mode") !== "create");
         },
 
-        destroy: function () {
-            this._super.apply(this, arguments);
-        },
-
         reinit: function() {
             this.$el.find('button.oe_mail_button_follow').hide();
             this.$el.find('button.oe_mail_button_unfollow').hide();
         },
 
+        bind_events: function() {
+            var self = this;
+            this.$('button.oe_mail_button_unfollow').on('click', function () { self.do_unfollow(); })
+                .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
+                .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
+            this.$el.on('click', 'button.oe_mail_button_follow', function () { self.do_follow(); });
+            this.$el.on('click', 'button.oe_mail_button_invite', function(event) {
+                action = {
+                    type: 'ir.actions.act_window',
+                    res_model: 'mail.wizard.invite',
+                    view_mode: 'form',
+                    view_type: 'form',
+                    views: [[false, 'form']],
+                    target: 'new',
+                    context: {
+                        'default_res_model': self.view.dataset.model,
+                        'default_res_id': self.view.datarecord.id
+                    },
+                }
+                self.do_action(action, function() { self.read_value(); });
+            });
+        },
+
+        read_value: function() {
+            var self = this;
+            return this.ds_model.read_ids([this.view.datarecord.id], ['message_follower_ids']).pipe(function (results) {
+                return results[0].message_follower_ids;
+            }).pipe(this.proxy('set_value'));
+        },
+
         set_value: function(value_) {
             this.reinit();
             if (! this.view.datarecord.id ||
@@ -65,11 +84,11 @@ openerp_mail_followers = function(session, mail) {
                 this.$el.find('div.oe_mail_recthread_aside').hide();
                 return;
             }
-            return this.fetch_followers(value_);
+            return this.fetch_followers(value_  || this.get_value());
         },
 
         fetch_followers: function (value_) {
-            return this.ds_follow.call('read', [value_ || this.get_value(), ['name', 'user_ids']]).then(this.proxy('display_followers'));
+            return this.ds_follow.call('read', [value_, ['name', 'user_ids']]).pipe(this.proxy('display_followers'));
         },
 
         /** Display the followers, evaluate is_follower directly */
@@ -91,13 +110,13 @@ openerp_mail_followers = function(session, mail) {
         },
 
         do_follow: function () {
-            var context = new session.web.CompoundContext(this.build_context(), {'read_back': true});
-            return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('set_value'));
+            var context = new session.web.CompoundContext(this.build_context(), {});
+            return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('read_value'));
         },
 
         do_unfollow: function () {
-            var context = new session.web.CompoundContext(this.build_context(), {'read_back': true});
-            return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('set_value'));
+            var context = new session.web.CompoundContext(this.build_context(), {});
+            return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('read_value'));
         },
     });
 };

addons/mail/static/src/xml/mail.xml

@@ -114,7 +114,7 @@
                 <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
-                        <li t-if="record.is_author &amp; options.show_dd_delete"><a class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+                        <li t-if="record.is_author and options.show_dd_delete"><a class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         <li t-if="options.show_dd_hide"><a class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li>
 <!--                    Uncomment when adding subtype hiding
                         <li t-if="display['show_hide']">
@@ -130,14 +130,14 @@
                         <t t-raw="record.subject"/>
                     </h1>
                     <div class="oe_mail_msg_body">
-                        <t t-if="options.show_record_name &amp; (!record.subject) &amp; (options.thread_level > 0)">
+                        <t t-if="options.show_record_name and record.record_name and (!record.subject) and (options.thread_level > 0)">
                             <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a>
                         </t>
                         <t t-raw="record.body"/>
                     </div>
                     <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
-                        <li t-if="options.show_record_name &amp; record.subject &amp; options.thread_level > 0">
+                        <li t-if="options.show_record_name and record.record_name and record.subject and options.thread_level > 0">
                             <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a>
                         </li>
                         <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>

addons/mail/static/src/xml/mail_followers.xml

@@ -7,7 +7,8 @@
         -->
     <div t-name="mail.followers" class="oe_mail_recthread_aside oe_semantic_html_override">
         <div class="oe_mail_recthread_actions">
-            <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
+            <button type="button" class="oe_mail_button_invite">Invite</button>
+            <button type="button" class="oe_mail_button_follow">Follow</button>
             <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
         </div>
         <div class="oe_mail_recthread_followers">

addons/mail/tests/test_mail.py

@@ -19,6 +19,8 @@
 #
 ##############################################################################
 
+import tools
+
 from openerp.tests import common
 from openerp.tools.html_sanitize import html_sanitize
 
@@ -82,15 +84,42 @@ Sylvie
 """
 
 
-class test_mail(common.TransactionCase):
+class TestMailMockups(common.TransactionCase):
 
     def _mock_smtp_gateway(self, *args, **kwargs):
         return True
 
+    def _init_mock_build_email(self):
+        self._build_email_args_list = []
+        self._build_email_kwargs_list = []
+
     def _mock_build_email(self, *args, **kwargs):
-        self._build_email_args = args
-        self._build_email_kwargs = kwargs
-        return self.build_email_real(*args, **kwargs)
+        self._build_email_args_list.append(args)
+        self._build_email_kwargs_list.append(kwargs)
+        return self._build_email(*args, **kwargs)
+
+    def setUp(self):
+        super(TestMailMockups, self).setUp()
+        # Install mock SMTP gateway
+        self._init_mock_build_email()
+        self._build_email = self.registry('ir.mail_server').build_email
+        self.registry('ir.mail_server').build_email = self._mock_build_email
+        self._send_email = self.registry('ir.mail_server').send_email
+        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
+
+    def tearDown(self):
+        # Remove mocks
+        self.registry('ir.mail_server').build_email = self._build_email
+        self.registry('ir.mail_server').send_email = self._send_email
+        super(TestMailMockups, self).tearDown()
+
+
+class test_mail(TestMailMockups):
+
+    def _mock_send_get_mail_body(self, *args, **kwargs):
+        # def _send_get_mail_body(self, cr, uid, mail, partner=None, context=None)
+        body = tools.append_content_to_html(args[2].body_html, kwargs.get('partner').name if kwargs.get('partner') else 'No specific partner')
+        return body
 
     def setUp(self):
         super(test_mail, self).setUp()
@@ -105,10 +134,9 @@ class test_mail(common.TransactionCase):
         self.res_users = self.registry('res.users')
         self.res_partner = self.registry('res.partner')
 
-        # Install mock SMTP gateway
-        self.build_email_real = self.registry('ir.mail_server').build_email
-        self.registry('ir.mail_server').build_email = self._mock_build_email
-        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
+        # Mock send_get_mail_body to test its functionality without other addons override
+        self._send_get_mail_body = self.registry('mail.mail').send_get_mail_body
+        self.registry('mail.mail').send_get_mail_body = self._mock_send_get_mail_body
 
         # groups@.. will cause the creation of new mail groups
         self.mail_group_model_id = self.ir_model.search(self.cr, self.uid, [('model', '=', 'mail.group')])[0]
@@ -118,6 +146,11 @@ class test_mail(common.TransactionCase):
         self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
             {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
 
+    def tearDown(self):
+        # Remove mocks
+        self.registry('mail.mail').send_get_mail_body = self._send_get_mail_body
+        super(test_mail, self).tearDown()
+
     def test_00_message_process(self):
         cr, uid = self.cr, self.uid
         # Incoming mail creates a new mail_group "frogs"
@@ -274,18 +307,20 @@ class test_mail(common.TransactionCase):
         _attachments = [('First', 'My first attachment'), ('Second', 'My second attachment')]
 
         # CASE1: post comment, body and subject specified
+        self._init_mock_build_email()
         msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, type='comment')
         message = self.mail_message.browse(cr, uid, msg_id)
-        sent_email = self._build_email_kwargs
+        sent_emails = self._build_email_kwargs_list
         # Test: notifications have been deleted
         self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', msg_id)]), 'mail.mail notifications should have been auto-deleted!')
         # Test: mail_message: subject is _subject, body is _body1 (no formatting done)
         self.assertEqual(message.subject, _subject, 'mail.message subject incorrect')
         self.assertEqual(message.body, _body1, 'mail.message body incorrect')
-        # Test: sent_email: email send by server: correct subject, body; body_alternative
-        self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
-        self.assertEqual(sent_email['body'], _mail_body1, 'sent_email body incorrect')
-        self.assertEqual(sent_email['body_alternative'], _mail_bodyalt1, 'sent_email body_alternative is incorrect')
+        # Test: sent_email: email send by server: correct subject, body, body_alternative
+        for sent_email in sent_emails:
+            self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
+            self.assertEqual(sent_email['body'], _mail_body1 + '\n<pre>Bert Tartopoils</pre>\n', 'sent_email body incorrect')
+            self.assertEqual(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils', 'sent_email body_alternative is incorrect')
         # Test: mail_message: partner_ids = group followers
         message_pids = set([partner.id for partner in message.partner_ids])
         test_pids = set([p_a_id, p_b_id, p_c_id])
@@ -295,14 +330,16 @@ class test_mail(common.TransactionCase):
         notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
         self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
         # Test: sent_email: email_to should contain b@b, not c@c (pref email), not a@a (writer)
-        self.assertEqual(sent_email['email_to'], ['b@b'], 'sent_email email_to is incorrect')
+        for sent_email in sent_emails:
+            self.assertEqual(sent_email['email_to'], ['b@b'], 'sent_email email_to is incorrect')
 
         # CASE2: post an email with attachments, parent_id, partner_ids
         # TESTS: automatic subject, signature in body_html, attachments propagation
+        self._init_mock_build_email()
         msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, type='email',
             partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id, attachments=_attachments)
         message = self.mail_message.browse(cr, uid, msg_id2)
-        sent_email = self._build_email_kwargs
+        sent_emails = self._build_email_kwargs_list
         self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', msg_id2)]), 'mail.mail notifications should have been auto-deleted!')
 
         # Test: mail_message: subject is False, body is _body2 (no formatting done), parent_id is msg_id
@@ -310,9 +347,11 @@ class test_mail(common.TransactionCase):
         self.assertEqual(message.body, html_sanitize(_body2), 'mail.message body incorrect')
         self.assertEqual(message.parent_id.id, msg_id, 'mail.message parent_id incorrect')
         # Test: sent_email: email send by server: correct subject, body, body_alternative
-        self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
-        self.assertEqual(sent_email['body'], _mail_body2, 'sent_email body incorrect')
-        self.assertEqual(sent_email['body_alternative'], _mail_bodyalt2, 'sent_email body_alternative incorrect')
+        self.assertEqual(len(sent_emails), 2, 'sent_email number of sent emails incorrect')
+        for sent_email in sent_emails:
+            self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
+            self.assertIn(_mail_body2, sent_email['body'], 'sent_email body incorrect')
+            self.assertIn(_mail_bodyalt2, sent_email['body_alternative'], 'sent_email body_alternative incorrect')
         # Test: mail_message: partner_ids = group followers
         message_pids = set([partner.id for partner in message.partner_ids])
         test_pids = set([p_a_id, p_b_id, p_c_id, p_d_id])
@@ -322,7 +361,8 @@ class test_mail(common.TransactionCase):
         notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
         self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
         # Test: sent_email: email_to should contain b@b, c@c, not a@a (writer)
-        self.assertEqual(set(sent_email['email_to']), set(['b@b', 'c@c']), 'sent_email email_to incorrect')
+        for sent_email in sent_emails:
+            self.assertTrue(set(sent_email['email_to']).issubset(set(['b@b', 'c@c'])), 'sent_email email_to incorrect')
         # Test: attachments
         for attach in message.attachment_ids:
             self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')

addons/mail/wizard/__init__.py

@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import invite
 import mail_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/mail/wizard/invite.py

@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+
+class invite_wizard(osv.osv_memory):
+    """ Wizard to invite partners and make them followers. """
+    _name = 'mail.wizard.invite'
+    _description = 'Invite wizard'
+
+    def default_get(self, cr, uid, fields, context=None):
+        result = super(invite_wizard, self).default_get(cr, uid, fields, context=context)
+        if 'message' in fields and result.get('res_model') and result.get('res_id'):
+            document_name = self.pool.get(result.get('res_model')).name_get(cr, uid, [result.get('res_id')], context=context)[0][1]
+            message = _('<div>You have been invited to follow %s.</div>' % document_name)
+            result['message'] = message
+        elif 'message' in fields:
+            result['message'] = _('<div>You have been invited to follow a new document.</div>')
+        return result
+
+    _columns = {
+        'res_model': fields.char('Related Document Model', size=128,
+                        required=True, select=1,
+                        help='Model of the followed resource'),
+        'res_id': fields.integer('Related Document ID', select=1,
+                        help='Id of the followed resource'),
+        'partner_ids': fields.many2many('res.partner', string='Partners'),
+        'message': fields.html('Message'),
+    }
+
+    def onchange_partner_ids(self, cr, uid, ids, value, context=None):
+        """ onchange_partner_ids (value format: [[6, 0, [3, 4]]]). The
+            basic purpose of this method is to check that destination partners
+            effectively have email addresses. Otherwise a warning is thrown.
+        """
+        res = {'value': {}}
+        if not value or not value[0] or not value[0][0] == 6:
+            return
+        res.update(self.pool.get('mail.message').check_partners_email(cr, uid, value[0][2], context=context))
+        return res
+
+    def add_followers(self, cr, uid, ids, context=None):
+        for wizard in self.browse(cr, uid, ids, context=context):
+            model_obj = self.pool.get(wizard.res_model)
+            document = model_obj.browse(cr, uid, wizard.res_id, context=context)
+
+            # filter partner_ids to get the new followers, to avoid sending email to already following partners
+            new_follower_ids = [p.id for p in wizard.partner_ids if p.id not in document.message_follower_ids]
+            model_obj.message_subscribe(cr, uid, [wizard.res_id], new_follower_ids, context=context)
+
+            # send an email
+            if wizard.message:
+                for follower_id in new_follower_ids:
+                    mail_mail = self.pool.get('mail.mail')
+                    mail_id = mail_mail.create(cr, uid, {
+                        '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)
+        return {'type': 'ir.actions.act_window_close'}

addons/mail/wizard/invite_view.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- wizard view -->
+        <record model="ir.ui.view" id="mail_wizard_invite_form">
+            <field name="name">Add Followers</field>
+            <field name="model">mail.wizard.invite</field>
+            <field name="arch" type="xml">
+                <form string="Add Followers" version="7.0">
+                    <group>
+                        <field name="res_model" invisible="1"/>
+                        <field name="res_id" invisible="1"/>
+                        <field name="partner_ids" widget="many2many_tags"
+                            on_change="onchange_partner_ids(partner_ids)" />
+                        <field name="message"/>
+                    </group>
+                    <footer>
+                        <button string="Add Followers"
+                            name="add_followers" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>

addons/mail/wizard/mail_compose_message.py

@@ -193,24 +193,6 @@ class mail_compose_message(osv.TransientModel):
         """
         return {'value': {'content_subtype': value}}
 
-    def _verify_partner_email(self, cr, uid, partner_ids, context=None):
-        """ Verify that selected partner_ids have an email_address defined.
-            Otherwise throw a warning. """
-        partner_wo_email_lst = []
-        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
-            if not partner.email:
-                partner_wo_email_lst.append(partner)
-        if not partner_wo_email_lst:
-            return {}
-        warning_msg = _('The following partners chosen as recipients for the email have no email address linked :')
-        for partner in partner_wo_email_lst:
-            warning_msg += '\n- %s' % (partner.name)
-        return {'warning': {
-                    'title': _('Partners email addresses not found'),
-                    'message': warning_msg,
-                    }
-                }
-
     def onchange_partner_ids(self, cr, uid, ids, value, context=None):
         """ The basic purpose of this method is to check that destination partners
             effectively have email addresses. Otherwise a warning is thrown.
@@ -219,7 +201,7 @@ class mail_compose_message(osv.TransientModel):
         res = {'value': {}}
         if not value or not value[0] or not value[0][0] == 6:
             return
-        res.update(self._verify_partner_email(cr, uid, value[0][2], context=context))
+        res.update(self.check_partners_email(cr, uid, value[0][2], context=context))
         return res
 
     def dummy(self, cr, uid, ids, context=None):

addons/portal/__init__.py

@@ -20,6 +20,7 @@
 ##############################################################################
 
 import portal
+import mail_mail
 import wizard
 
 

addons/portal/mail_mail.py

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tools
+from osv import osv
+
+
+class mail_mail_portal(osv.Model):
+    """ Update of mail_mail class, to add the signin URL to notifications.
+    """
+    _name = 'mail.mail'
+    _inherit = ['mail.mail']
+
+    def _generate_signin_url(self, cr, uid, partner_id, portal_group_id, key, context=None):
+        """ Generate the signin url """
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='', context=context)
+        return base_url + '/login?action=signin&partner_id=%s&group=%s&key=%s' % (partner_id, portal_group_id, key)
+
+    def send_get_mail_body(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 mail: mail.mail browse_record
+            :param partner: browse_record of the specific recipient partner
+        """
+        if partner:
+            portal_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal', 'portal')
+            portal_id = portal_ref and portal_ref[1] or False
+            url = self._generate_signin_url(cr, uid, partner.id, portal_id, 1234, context=context)
+            body = tools.append_content_to_html(mail.body_html, url)
+            return body
+        else:
+            return super(mail_mail_portal, self).send_get_mail_body(cr, uid, mail, partner=partner, context=context)

addons/portal/tests/__init__.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import test_portal
+
+checks = [
+    test_portal,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/portal/tests/test_portal.py

@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.addons.mail.tests import test_mail
+from openerp.tools import append_content_to_html
+
+
+class test_portal(test_mail.TestMailMockups):
+
+    def setUp(self):
+        super(test_portal, self).setUp()
+        self.ir_model = self.registry('ir.model')
+        self.mail_group = self.registry('mail.group')
+        self.mail_mail = self.registry('mail.mail')
+        self.res_users = self.registry('res.users')
+        self.res_partner = self.registry('res.partner')
+
+        # create a 'pigs' group that will be used through the various tests
+        self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
+
+    def test_00_mail_invite(self):
+        cr, uid = self.cr, self.uid
+        user_admin = self.res_users.browse(cr, uid, uid)
+        self.mail_invite = self.registry('mail.wizard.invite')
+        base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='')
+        portal_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'portal', 'portal')
+        portal_id = portal_ref and portal_ref[1] or False
+
+        # 0 - Admin
+        p_a_id = user_admin.partner_id.id
+        # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
+        p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
+
+        # ----------------------------------------
+        # CASE1: generated URL
+        # ----------------------------------------
+
+        url = self.mail_mail._generate_signin_url(cr, uid, p_b_id, portal_id, 1234)
+        self.assertEqual(url,  base_url + '/login?action=signin&partner_id=%s&group=%s&key=%s' % (p_b_id, portal_id, 1234),
+            'generated signin URL incorrect')
+
+        # ----------------------------------------
+        # CASE2: invite Bert
+        # ----------------------------------------
+
+        _sent_email_subject = 'Invitation to follow Pigs'
+        _sent_email_body = append_content_to_html('<div>You have been invited to follow Pigs.</div>', url)
+
+        # Do: create a mail_wizard_invite, validate it
+        self._init_mock_build_email()
+        mail_invite_id = self.mail_invite.create(cr, uid, {'partner_ids': [(4, p_b_id)]}, {'default_res_model': 'mail.group', 'default_res_id': self.group_pigs_id})
+        self.mail_invite.add_followers(cr, uid, [mail_invite_id])
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+
+        # Test: Pigs followers should contain Admin and Bert
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(set(follower_ids), set([p_a_id, p_b_id]), 'Pigs followers after invite is incorrect')
+        # Test: sent email subject, body
+        self.assertEqual(len(self._build_email_kwargs_list), 1, 'sent email number incorrect, should be only for Bert')
+        for sent_email in self._build_email_kwargs_list:
+            self.assertEqual(sent_email.get('subject'), _sent_email_subject, 'sent email subject incorrect')
+            self.assertEqual(sent_email.get('body'), _sent_email_body, 'sent email body incorrect')