From f25249c911061b893c054c9e226aa1cd9c24c611 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <Yajo@users.noreply.github.com>
Date: Mon, 12 Sep 2016 08:43:32 +0200
Subject: [PATCH] [FIX] mass_mailing_partner: Several things:

* Exclude opt_out.

  Now opted-out records will not be counted in the "Mailing lists" smart button
  in the partner form.

* Avoid duplicate error.

  By indicating the exact `partner_id` and ensuring no contacts associated to it are found, you avoid possible duplication errors when several partners share the same name or email.
---
 mass_mailing_partner/README.rst                   |  3 ++-
 mass_mailing_partner/__openerp__.py               |  2 +-
 mass_mailing_partner/models/res_partner.py        | 15 ++++++++++-----
 mass_mailing_partner/views/res_partner_view.xml   |  4 ++--
 .../wizard/partner_mail_list_wizard.py            |  9 +++++++--
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/mass_mailing_partner/README.rst b/mass_mailing_partner/README.rst
index 0af7934d..a95f5175 100644
--- a/mass_mailing_partner/README.rst
+++ b/mass_mailing_partner/README.rst
@@ -79,9 +79,10 @@ Contributors
 ------------
 
 * Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
-* Rafael Blasco <rafabn@antiun.com>
+* Rafael Blasco <rafael.blasco@tecnativa.com>
 * Antonio Espinosa <antonioea@antiun.com>
 * Javier Iniesta <javieria@antiun.com>
+* Jairo Llopis <jairo.llopis@tecnativa.com>
 
 Maintainer
 ----------
diff --git a/mass_mailing_partner/__openerp__.py b/mass_mailing_partner/__openerp__.py
index bb49d895..b0dea3a4 100644
--- a/mass_mailing_partner/__openerp__.py
+++ b/mass_mailing_partner/__openerp__.py
@@ -7,7 +7,7 @@
 
 {
     "name": "Link partners with mass-mailing",
-    "version": "8.0.2.0.0",
+    "version": "8.0.2.1.0",
     "author": "Tecnativa, "
               "Antiun Ingeniería S.L., "
               "Serv. Tecnol. Avanzados - Pedro M. Baeza, "
diff --git a/mass_mailing_partner/models/res_partner.py b/mass_mailing_partner/models/res_partner.py
index d53b4728..708a0560 100644
--- a/mass_mailing_partner/models/res_partner.py
+++ b/mass_mailing_partner/models/res_partner.py
@@ -12,8 +12,10 @@ from openerp.exceptions import ValidationError
 class ResPartner(models.Model):
     _inherit = 'res.partner'
 
-    mass_mailing_contacts = fields.One2many(
+    mass_mailing_contact_ids = fields.One2many(
         string="Mailing lists",
+        oldname="mass_mailing_contacts",
+        domain=[('opt_out', '=', False)],
         comodel_name='mail.mass_mailing.contact', inverse_name='partner_id')
     mass_mailing_contacts_count = fields.Integer(
         string='Mailing list number',
@@ -28,15 +30,16 @@ class ResPartner(models.Model):
     @api.one
     @api.constrains('email')
     def _check_email_mass_mailing_contacts(self):
-        if self.mass_mailing_contacts and not self.email:
+        if self.mass_mailing_contact_ids and not self.email:
             raise ValidationError(
                 _("This partner '%s' is subscribed to one or more "
                   "mailing lists. Email must be assigned." % self.name))
 
     @api.one
-    @api.depends('mass_mailing_contacts')
+    @api.depends('mass_mailing_contact_ids',
+                 'mass_mailing_contact_ids.opt_out')
     def _compute_mass_mailing_contacts_count(self):
-        self.mass_mailing_contacts_count = len(self.mass_mailing_contacts)
+        self.mass_mailing_contacts_count = len(self.mass_mailing_contact_ids)
 
     @api.one
     @api.depends('mass_mailing_stats')
@@ -52,5 +55,7 @@ class ResPartner(models.Model):
                 mm_vals['name'] = vals['name']
             if vals.get('email'):
                 mm_vals['name'] = vals['email']
-            self.mapped('mass_mailing_contacts').write(mm_vals)
+            self.env["mail.mass_mailing.contact"].search([
+                ("partner_id", "in", self.ids),
+            ]).write(mm_vals)
         return res
diff --git a/mass_mailing_partner/views/res_partner_view.xml b/mass_mailing_partner/views/res_partner_view.xml
index 3e8d5712..81a552b1 100644
--- a/mass_mailing_partner/views/res_partner_view.xml
+++ b/mass_mailing_partner/views/res_partner_view.xml
@@ -44,8 +44,8 @@
     <field name="priority">20</field>
     <field name="arch" type="xml">
         <field name="category_id" position="after">
-            <field name="mass_mailing_contacts" string="Mailing List"
-                filter_domain="[('mass_mailing_contacts.list_id','ilike', self)]"/>
+            <field name="mass_mailing_contact_ids" string="Mailing List"
+                filter_domain="[('mass_mailing_contact_ids.list_id','ilike', self)]"/>
         </field>
     </field>
 </record>
diff --git a/mass_mailing_partner/wizard/partner_mail_list_wizard.py b/mass_mailing_partner/wizard/partner_mail_list_wizard.py
index 94e1065b..cdf34752 100644
--- a/mass_mailing_partner/wizard/partner_mail_list_wizard.py
+++ b/mass_mailing_partner/wizard/partner_mail_list_wizard.py
@@ -24,12 +24,17 @@ class PartnerMailListWizard(models.TransientModel):
         for partner in self.partner_ids:
             if not partner.email:
                 raise UserError(_("Partner '%s' has no email.") % partner.name)
-            criteria = [('email', '=', partner.email),
-                        ('list_id', '=', self.mail_list_id.id)]
+            criteria = [
+                '|',
+                ('email', '=', partner.email),
+                ('partner_id', '=', partner.id),
+                ('list_id', '=', self.mail_list_id.id),
+            ]
             contact_test = contact_obj.search(criteria)
             if contact_test:
                 continue
             contact_vals = {
+                'partner_id': partner.id,
                 'email': partner.email,
                 'name': partner.name,
                 'list_id': self.mail_list_id.id