[MIG] mass_mailing_partner: Migration to 11.0

mass_mailing_partner/README.rst

@@ -1,74 +1 @@
-.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
-    :alt: License: AGPL-3
-
-===============================
-Link partners with mass-mailing
-===============================
-
-This module links mass-mailing contacts with partners.
-
-Features
---------
-* When creating or saving a mass-mailing contact, partners are matched through
-  email, linking matched partner, or creating a new one if no match and the
-  maling list partner mandatory field is checked.
-* Mailing contacts smart button in partner form.
-* Mass mailing stats smart button in partner form.
-* Filter and group by partner in mail statistics tree view
-
-
-Configuration
-=============
-
-At first install, all existing mass mailing contacts are matched against
-partners. And also mass mailing statistics are matched using model and res_id.
-
-Usage
-=====
-
-In partner view, there is a new action called "Add to mailing list". This
-action open a pop-up to select a mailing list. Selected partners will be added
-as mailing list contacts.
-
-.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
-   :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/205/10.0
-
-
-Bug Tracker
-===========
-
-Bugs are tracked on `GitHub Issues
-<https://github.com/OCA/social/issues>`_. In case of trouble, please
-check there if your issue has already been reported. If you spotted it first,
-help us smash it by providing detailed and welcomed feedback.
-
-Credits
-=======
-
-Contributors
-------------
-
-* Pedro M. Baeza <pedro.baeza@tecnativa.com>
-* Rafael Blasco <rafael.blasco@tecnativa.com>
-* Antonio Espinosa <antonio.espinosa@tecnativa.com>
-* Javier Iniesta <javieria@antiun.com>
-* Jairo Llopis <jairo.llopis@tecnativa.com>
-* David Vidal <david.vidal@tecnativa.com>
-
-
-Maintainer
-----------
-
-.. image:: https://odoo-community.org/logo.png
-   :alt: Odoo Community Association
-   :target: https://odoo-community.org
-
-This module is maintained by the OCA.
-
-OCA, or the Odoo Community Association, is a nonprofit organization whose
-mission is to support the collaborative development of Odoo features and
-promote its widespread use.
-
-To contribute to this module, please visit https://odoo-community.org.
+**This file is going to be generated by oca-gen-addon-readme.**

mass_mailing_partner/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>

mass_mailing_partner/__manifest__.py

@@ -1,15 +1,14 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015-2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {
     "name": "Link partners with mass-mailing",
-    "version": "10.0.1.0.3",
+    "version": "11.0.1.0.0",
     "author": "Tecnativa, "
               "Odoo Community Association (OCA)",
-    "website": "https://www.tecnativa.com",
+    "website": "https://github.com/OCA/social",
     "license": "AGPL-3",
     "category": "Marketing",
     "depends": [

mass_mailing_partner/hooks.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>

mass_mailing_partner/models/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>

mass_mailing_partner/models/mail_mail_statistics.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 

mass_mailing_partner/models/mail_mass_mailing.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>

mass_mailing_partner/models/mail_mass_mailing_contact.py

@@ -1,11 +1,11 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
 # Copyright 2017 David Vidal <david.vidal@tecnativa.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
 
 
 class MailMassMailingContact(models.Model):
@@ -14,68 +14,84 @@ class MailMassMailingContact(models.Model):
     partner_id = fields.Many2one(comodel_name='res.partner', string="Partner",
                                  domain=[('email', '!=', False)])
 
-    _sql_constraints = [
-        ('partner_list_uniq', 'unique(partner_id, list_id)',
-         _('Partner already exists in this mailing list.'))
-    ]
+    @api.constrains('partner_id', 'list_ids')
+    def _check_partner_id_list_ids(self):
+        for contact in self:
+            if contact.partner_id:
+                other_contact = self.search([
+                    ('partner_id', '=', contact.partner_id.id),
+                    ('id', '!=', contact.id)
+                ])
+                if contact.list_ids & other_contact.mapped('list_ids'):
+                    raise ValidationError(_("Partner already exists in one of "
+                                            "these mailing lists"))
 
     @api.onchange('partner_id')
-    def _onchange_partner(self):
+    def _onchange_partner_mass_mailing_partner(self):
         if self.partner_id:
             self.name = self.partner_id.name
             self.email = self.partner_id.email
+            self.title_id = self.partner_id.title
+            self.company_name = self.partner_id.company_id.name
+            self.country_id = self.partner_id.country_id
+            category_ids = self.partner_id.category_id
+            if category_ids:
+                self.tag_ids = category_ids
 
     @api.model
-    @api.returns('self', lambda x: x.id)
     def create(self, vals):
-        if not vals.get('partner_id'):
-            vals = self._set_partner(vals)
-        vals = self._set_name_email(vals)
-        return super(MailMassMailingContact, self).create(vals)
+        record = self.new(vals)
+        if not record.partner_id:
+            record._set_partner()
+        record._onchange_partner_mass_mailing_partner()
+        new_vals = record._convert_to_write(record._cache)
+        return super(MailMassMailingContact, self).create(new_vals)
 
     def write(self, vals):
         for contact in self:
-            if vals.get('partner_id', None) is False:
-                # If removing partner, search again by email
-                vals = contact._set_partner(vals)
-            vals = contact._set_name_email(vals)
-        return super(MailMassMailingContact, self).write(vals)
+            new_vals = contact.copy_data(vals)[0]
+            record = self.new(new_vals)
+            if not record.partner_id:
+                record._set_partner()
+            record._onchange_partner_mass_mailing_partner()
+            new_vals = record._convert_to_write(record._cache)
+            super(MailMassMailingContact, contact).write(new_vals)
+        return True
+
+    def _get_company(self):
+        company_id = False
+        if self.company_name:
+            company_id = self.env['res.company'].search(
+                [('name', '=', self.company_name)]).id
+            if not company_id:
+                company_id = self.env['res.company'].create(
+                    {'name': self.company_name}).id
+        return company_id
 
-    def _prepare_partner(self, vals, mailing_list):
-        vals = {
-            'name': vals.get('name') or vals.get('email'),
-            'email': vals.get('email', False),
+    def _get_categories(self):
+        ca_ids = self.tag_ids.ids + self.list_ids.mapped('partner_category.id')
+        return [[6, 0, ca_ids]]
+
+    def _prepare_partner(self):
+        return {
+            'name': self.name or self.email,
+            'email': self.email,
+            'country_id': self.country_id.id,
+            'title': self.title_id.id,
+            'company_id': self._get_company(),
+            'category_id': self._get_categories(),
         }
-        if mailing_list.partner_category:
-            vals['category_id'] = [(4, mailing_list.partner_category.id, 0)]
-        return vals
 
-    def _set_partner(self, vals):
-        email = vals.get('email', self.email)
-        if not email:  # pragma: no cover
-            return vals
-        m_mailing = self.env['mail.mass_mailing.list']
+    @api.multi
+    def _set_partner(self):
+        self.ensure_one()
         m_partner = self.env['res.partner']
-        list_id = vals.get('list_id', self.list_id.id)
-        mailing_list = m_mailing.browse(list_id)
         # Look for a partner with that email
-        email = email.strip()
-        partners = m_partner.search([('email', '=ilike', email)], limit=1)
-        if partners:
+        email = self.email.strip()
+        partner = m_partner.search([('email', '=ilike', email)], limit=1)
+        if partner:
             # Partner found
-            vals['partner_id'] = partners[0].id
-        elif mailing_list.partner_mandatory:
+            self.partner_id = partner
+        elif self.list_ids.filtered('partner_mandatory'):
             # Create partner
-            partner = m_partner.sudo().create(
-                self._prepare_partner(vals, mailing_list))
-            vals['partner_id'] = partner.id
-        return vals
-
-    def _set_name_email(self, vals):
-        partner_id = vals.get('partner_id', self.partner_id.id)
-        if not partner_id:
-            return vals
-        partner = self.env['res.partner'].browse(partner_id)
-        vals['email'] = partner.email
-        vals['name'] = partner.name
-        return vals
+            self.partner_id = m_partner.sudo().create(self._prepare_partner())

mass_mailing_partner/models/res_partner.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>
@@ -13,15 +12,15 @@ class ResPartner(models.Model):
     _inherit = 'res.partner'
 
     mass_mailing_contact_ids = fields.One2many(
-        string="Mailing lists",
+        string="Mailing contacts",
         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',
+        string='Mailing contacts number',
         compute='_compute_mass_mailing_contacts_count', store=True,
         compute_sudo=True)
-    mass_mailing_stats = fields.One2many(
+    mass_mailing_stats_ids = fields.One2many(
         string="Mass mailing stats",
         comodel_name='mail.mail.statistics', inverse_name='partner_id')
     mass_mailing_stats_count = fields.Integer(
@@ -31,12 +30,12 @@ class ResPartner(models.Model):
     @api.constrains('email')
     def _check_email_mass_mailing_contacts(self):
         for partner in self:
-            if partner.sudo().mass_mailing_contact_ids and not partner.email:
-                raise ValidationError(
-                    _("This partner '%s' is subscribed to one or more "
-                      "mailing lists. Email must be assigned.") % partner.name)
+            if not partner.email and self.sudo().mass_mailing_contact_ids:
+                raise ValidationError(_(
+                    "This partner '%s' is linked to one or more mass "
+                    "mailing contact. Email must be assigned."
+                ) % partner.name)
 
-    @api.multi
     @api.depends('mass_mailing_contact_ids',
                  'mass_mailing_contact_ids.opt_out')
     def _compute_mass_mailing_contacts_count(self):
@@ -49,8 +48,7 @@ def _compute_mass_mailing_contacts_count(self):
             partner.mass_mailing_contacts_count = mapped_data.get(partner.id,
                                                                   0)
 
-    @api.multi
-    @api.depends('mass_mailing_stats')
+    @api.depends('mass_mailing_stats_ids')
     def _compute_mass_mailing_stats_count(self):
         contact_data = self.env['mail.mail.statistics'].read_group(
             [('partner_id', 'in', self.ids)], ['partner_id'], ['partner_id'])
@@ -62,12 +60,21 @@ def _compute_mass_mailing_stats_count(self):
 
     def write(self, vals):
         res = super(ResPartner, self).write(vals)
-        if vals.get('name') or vals.get('email'):
-            mm_vals = {}
-            if vals.get('name'):
-                mm_vals['name'] = vals['name']
-            if vals.get('email'):
-                mm_vals['email'] = vals['email']
+        mm_vals = {}
+        if vals.get('name'):
+            mm_vals['name'] = vals['name']
+        if vals.get('email'):
+            mm_vals['email'] = vals['email']
+        if vals.get('title'):
+            mm_vals['title_id'] = vals['title']
+        if vals.get('company_id'):
+            company = self.env['res.company'].browse(vals.get('company_id'))
+            mm_vals['company_name'] = company.name
+        if vals.get('country_id'):
+            mm_vals['country_id'] = vals['country_id']
+        if vals.get('category_id'):
+            mm_vals['tag_ids'] = vals['category_id']
+        if mm_vals:
             # Using sudo because ACLs shouldn't produce data inconsistency
             self.env["mail.mass_mailing.contact"].sudo().search([
                 ("partner_id", "in", self.ids),

mass_mailing_partner/readme/CONFIGURE.rst

@@ -0,0 +1,2 @@
+At first install, all existing mass mailing contacts are matched against
+partners. And also mass mailing statistics are matched using model and res_id.

mass_mailing_partner/readme/CONTRIBUTORS.rst

@@ -0,0 +1,9 @@
+* `Tecnativa <https://www.tecnativa.com>`_:
+
+    * Pedro M. Baeza
+    * Rafael Blasco
+    * Antonio Espinosa
+    * Javier Iniesta
+    * Jairo Llopis
+    * David Vidal
+    * Ernesto Tejeda

mass_mailing_partner/readme/DESCRIPTION.rst

@@ -0,0 +1,10 @@
+This module links mass-mailing contacts with partners.
+
+Features
+--------
+* When creating or saving a mass-mailing contact, partners are matched through
+  email, linking matched partner, or creating a new one if no match and the
+  maling list partner mandatory field is checked.
+* Mailing contacts smart button in partner form.
+* Mass mailing stats smart button in partner form.
+* Filter and group by partner in mail statistics tree view

mass_mailing_partner/readme/USAGE.rst

@@ -0,0 +1,3 @@
+In partner view, there is a new action called "Add to mailing list". This
+action open a pop-up to select a mailing list. Selected partners will be added
+as mailing list contacts.

mass_mailing_partner/tests/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
 # Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
 # Copyright 2015 Javier Iniesta <javieria@antiun.com>