From 7a5bc7090e4560a95d0a336c46271728c2a9ec88 Mon Sep 17 00:00:00 2001 From: Manuel Calero Date: Mon, 10 Feb 2020 11:40:11 +0100 Subject: [PATCH] [MIG] mass_mailing_partner: Migration to 13.0 --- mass_mailing_partner/README.rst | 11 +++-- mass_mailing_partner/__init__.py | 3 -- mass_mailing_partner/__manifest__.py | 9 ++-- mass_mailing_partner/hooks.py | 5 +- mass_mailing_partner/i18n/es.po | 8 ++-- .../i18n/mass_mailing_partner.pot | 2 +- mass_mailing_partner/models/__init__.py | 11 ++--- ..._mailing_contact.py => mailing_contact.py} | 10 ++-- ...rel.py => mailing_contact_subscription.py} | 7 +-- .../{mail_mass_mailing.py => mailing_list.py} | 7 +-- ...il_mail_statistics.py => mailing_trace.py} | 7 +-- mass_mailing_partner/models/res_partner.py | 19 ++++---- mass_mailing_partner/readme/CONTRIBUTORS.rst | 1 + .../static/description/index.html | 6 +-- mass_mailing_partner/tests/__init__.py | 3 -- mass_mailing_partner/tests/base.py | 5 +- .../tests/test_mail_mail_statistics.py | 7 +-- .../tests/test_mail_mass_mailing_contact.py | 9 ++-- .../tests/test_mail_mass_mailing_list.py | 6 +-- ...test_mail_mass_mailing_list_contact_rel.py | 12 ++--- .../tests/test_partner_mail_list_wizard.py | 4 +- .../tests/test_res_partner.py | 1 + ...tact_view.xml => mailing_contact_view.xml} | 11 +++-- ...istics_view.xml => mailing_trace_view.xml} | 19 ++++---- ...mass_mailing_view.xml => mailing_view.xml} | 9 ++-- .../views/res_partner_view.xml | 3 +- mass_mailing_partner/wizard/__init__.py | 3 -- .../wizard/partner_mail_list_wizard.py | 16 +++---- .../wizard/partner_mail_list_wizard.xml | 46 +++++++++---------- 29 files changed, 130 insertions(+), 130 deletions(-) rename mass_mailing_partner/models/{mail_mass_mailing_contact.py => mailing_contact.py} (94%) rename mass_mailing_partner/models/{mail_mass_mailing_list_contact_rel.py => mailing_contact_subscription.py} (72%) rename mass_mailing_partner/models/{mail_mass_mailing.py => mailing_list.py} (87%) rename mass_mailing_partner/models/{mail_mail_statistics.py => mailing_trace.py} (86%) rename mass_mailing_partner/views/{mail_mass_mailing_contact_view.xml => mailing_contact_view.xml} (89%) rename mass_mailing_partner/views/{mail_mail_statistics_view.xml => mailing_trace_view.xml} (64%) rename mass_mailing_partner/views/{mail_mass_mailing_view.xml => mailing_view.xml} (71%) diff --git a/mass_mailing_partner/README.rst b/mass_mailing_partner/README.rst index 2396a5a03..dbd4154cf 100644 --- a/mass_mailing_partner/README.rst +++ b/mass_mailing_partner/README.rst @@ -14,16 +14,16 @@ Link partners with mass-mailing :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github - :target: https://github.com/OCA/social/tree/12.0/mass_mailing_partner + :target: https://github.com/OCA/social/tree/13.0/mass_mailing_partner :alt: OCA/social .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png :target: https://translation.odoo-community.org/projects/social-12-0/social-12-0-mass_mailing_partner :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/205/12.0 + :target: https://runbot.odoo-community.org/runbot/205/13.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module links mass-mailing contacts with partners. @@ -61,7 +61,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -86,6 +86,7 @@ Contributors * David Vidal * Ernesto Tejeda * Victor M.M. Torres + * Manuel Calero Maintainers ~~~~~~~~~~~ @@ -100,6 +101,6 @@ 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. -This module is part of the `OCA/social `_ project on GitHub. +This module is part of the `OCA/social `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mass_mailing_partner/__init__.py b/mass_mailing_partner/__init__.py index 27d867f16..4f890c3e9 100644 --- a/mass_mailing_partner/__init__.py +++ b/mass_mailing_partner/__init__.py @@ -1,6 +1,3 @@ -# Copyright 2015 Pedro M. Baeza -# Copyright 2015 Antonio Espinosa -# Copyright 2015 Javier Iniesta # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/mass_mailing_partner/__manifest__.py b/mass_mailing_partner/__manifest__.py index 92bb68190..dcbac1bfb 100644 --- a/mass_mailing_partner/__manifest__.py +++ b/mass_mailing_partner/__manifest__.py @@ -1,11 +1,12 @@ # Copyright 2015 Pedro M. Baeza # Copyright 2015-2016 Antonio Espinosa # Copyright 2015 Javier Iniesta +# Copyright 2020 Tecnativa - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Link partners with mass-mailing", - "version": "12.0.1.0.2", + "version": "13.0.1.0.0", "author": "Tecnativa, " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/social", "license": "AGPL-3", @@ -13,9 +14,9 @@ "depends": ["mass_mailing"], "post_init_hook": "post_init_hook", "data": [ - "views/mail_mail_statistics_view.xml", - "views/mail_mass_mailing_contact_view.xml", - "views/mail_mass_mailing_view.xml", + "views/mailing_trace_view.xml", + "views/mailing_contact_view.xml", + "views/mailing_view.xml", "views/res_partner_view.xml", "wizard/partner_mail_list_wizard.xml", ], diff --git a/mass_mailing_partner/hooks.py b/mass_mailing_partner/hooks.py index f2200d926..f2fe4aa60 100644 --- a/mass_mailing_partner/hooks.py +++ b/mass_mailing_partner/hooks.py @@ -2,6 +2,7 @@ # Copyright 2015 Antonio Espinosa # Copyright 2015 Javier Iniesta # Copyright 2016 Antonio Espinosa - +# Copyright 2020 Tecnativa - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). import logging @@ -15,7 +16,7 @@ def post_init_hook(cr, registry): with api.Environment.manage(): env = api.Environment(cr, SUPERUSER_ID, {}) # ACTION 1: Match existing contacts - contact_model = env["mail.mass_mailing.contact"] + contact_model = env["mailing.contact"] partner_model = env["res.partner"] contacts = contact_model.search([("email", "!=", False)]) _logger.info("Trying to match %d contacts to partner by email", len(contacts)) @@ -26,7 +27,7 @@ def post_init_hook(cr, registry): if partners: contact.write({"partner_id": partners.id}) # ACTION 2: Match existing statistics - stat_model = env["mail.mail.statistics"] + stat_model = env["mailing.trace"] stats = stat_model.search([("model", "!=", False), ("res_id", "!=", False)]) _logger.info("Trying to link %d mass mailing statistics to partner", len(stats)) stats.partner_link() diff --git a/mass_mailing_partner/i18n/es.po b/mass_mailing_partner/i18n/es.po index 9693493e6..9cd8014d3 100644 --- a/mass_mailing_partner/i18n/es.po +++ b/mass_mailing_partner/i18n/es.po @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-02-26 01:46+0000\n" "PO-Revision-Date: 2018-02-26 01:46+0000\n" -"Last-Translator: enjolras , 2017\n" +"Last-Translator: Tecnativa - Manuel Calero, 2020\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgstr "" #: code:addons/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py:17 #, python-format msgid "A partner cannot be multiple times in the same list" -msgstr "" +msgstr "Un cliente no puede estar varias veces en la misma lista" #. module: mass_mailing_partner #: model_terms:ir.ui.view,arch_db:mass_mailing_partner.partner_mail_list_wizard_form @@ -44,7 +44,7 @@ msgstr "Cancelar" #. module: mass_mailing_partner #: model:ir.model,name:mass_mailing_partner.model_res_partner msgid "Contact" -msgstr "" +msgstr "Contacto" #. module: mass_mailing_partner #: model:ir.model,name:mass_mailing_partner.model_partner_mail_list_wizard @@ -127,7 +127,7 @@ msgstr "Contacto de envío masivo" #. module: mass_mailing_partner #: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list_contact_rel msgid "Mass Mailing Subscription Information" -msgstr "" +msgstr "Información de suscripción de correo masivo" #. module: mass_mailing_partner #: model:ir.model.fields,field_description:mass_mailing_partner.field_res_partner__mass_mailing_stats_ids diff --git a/mass_mailing_partner/i18n/mass_mailing_partner.pot b/mass_mailing_partner/i18n/mass_mailing_partner.pot index 2474274bd..3999de193 100644 --- a/mass_mailing_partner/i18n/mass_mailing_partner.pot +++ b/mass_mailing_partner/i18n/mass_mailing_partner.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" diff --git a/mass_mailing_partner/models/__init__.py b/mass_mailing_partner/models/__init__.py index 6b7444238..19ba29ac8 100644 --- a/mass_mailing_partner/models/__init__.py +++ b/mass_mailing_partner/models/__init__.py @@ -1,10 +1,7 @@ -# Copyright 2015 Pedro M. Baeza -# Copyright 2015 Antonio Espinosa -# Copyright 2015 Javier Iniesta # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import mail_mass_mailing_contact +from . import mailing_contact +from . import mailing_list +from . import mailing_trace +from . import mailing_contact_subscription from . import res_partner -from . import mail_mass_mailing -from . import mail_mail_statistics -from . import mail_mass_mailing_list_contact_rel diff --git a/mass_mailing_partner/models/mail_mass_mailing_contact.py b/mass_mailing_partner/models/mailing_contact.py similarity index 94% rename from mass_mailing_partner/models/mail_mass_mailing_contact.py rename to mass_mailing_partner/models/mailing_contact.py index 263040ddc..ce3af7ee2 100644 --- a/mass_mailing_partner/models/mail_mass_mailing_contact.py +++ b/mass_mailing_partner/models/mailing_contact.py @@ -2,14 +2,15 @@ # Copyright 2015 Antonio Espinosa # Copyright 2015 Javier Iniesta # Copyright 2017 David Vidal +# Copyright 2020 Tecnativa - Manuel Calero # 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): - _inherit = "mail.mass_mailing.contact" +class MailingContact(models.Model): + _inherit = "mailing.contact" partner_id = fields.Many2one( comodel_name="res.partner", string="Partner", domain=[("email", "!=", False)] @@ -53,7 +54,7 @@ class MailMassMailingContact(models.Model): subscription_list_ids=vals.get("subscription_list_ids", False), list_ids=vals.get("list_ids", False), ) - return super(MailMassMailingContact, self).create(new_vals) + return super(MailingContact, self).create(new_vals) def write(self, vals): for contact in self: @@ -67,7 +68,7 @@ class MailMassMailingContact(models.Model): subscription_list_ids=vals.get("subscription_list_ids", False), list_ids=vals.get("list_ids", False), ) - super(MailMassMailingContact, contact).write(new_vals) + super(MailingContact, contact).write(new_vals) return True def _get_company(self): @@ -96,7 +97,6 @@ class MailMassMailingContact(models.Model): "category_id": self._get_categories(), } - @api.multi def _set_partner(self): self.ensure_one() m_partner = self.env["res.partner"] diff --git a/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py b/mass_mailing_partner/models/mailing_contact_subscription.py similarity index 72% rename from mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py rename to mass_mailing_partner/models/mailing_contact_subscription.py index 42cef70b9..cec47dda5 100644 --- a/mass_mailing_partner/models/mail_mass_mailing_list_contact_rel.py +++ b/mass_mailing_partner/models/mailing_contact_subscription.py @@ -1,12 +1,13 @@ # Copyright 2018 Tecnativa - Ernesto Tejeda +# Copyright 2020 Tecnativa - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import _, api, models from odoo.exceptions import ValidationError -class MassMailingContactListRel(models.Model): - _inherit = "mail.mass_mailing.list_contact_rel" +class MailingContactSubscription(models.Model): + _inherit = "mailing.contact.subscription" @api.constrains("contact_id", "list_id") def _check_contact_id_partner_id_list_id(self): @@ -15,5 +16,5 @@ class MassMailingContactListRel(models.Model): contacts = rel.list_id.contact_ids - rel.contact_id if rel.contact_id.partner_id in contacts.mapped("partner_id"): raise ValidationError( - _("A partner cannot be multiple " "times in the same list") + _("A partner cannot be multiple times in the same list") ) diff --git a/mass_mailing_partner/models/mail_mass_mailing.py b/mass_mailing_partner/models/mailing_list.py similarity index 87% rename from mass_mailing_partner/models/mail_mass_mailing.py rename to mass_mailing_partner/models/mailing_list.py index 6887d9f48..f6d9727e1 100644 --- a/mass_mailing_partner/models/mail_mass_mailing.py +++ b/mass_mailing_partner/models/mailing_list.py @@ -1,14 +1,15 @@ # Copyright 2015 Pedro M. Baeza # Copyright 2015 Antonio Espinosa # Copyright 2015 Javier Iniesta +# Copyright 2020 Tecnativa - Manuel Calero # 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 MailMassMailingList(models.Model): - _inherit = "mail.mass_mailing.list" +class MailingList(models.Model): + _inherit = "mailing.list" partner_mandatory = fields.Boolean(string="Mandatory Partner", default=False) partner_category = fields.Many2one( @@ -17,7 +18,7 @@ class MailMassMailingList(models.Model): @api.constrains("contact_ids") def _check_contact_ids_partner_id(self): - contact_obj = self.env["mail.mass_mailing.contact"] + contact_obj = self.env["mailing.contact"] for mailing_list in self: data = contact_obj.read_group( [ diff --git a/mass_mailing_partner/models/mail_mail_statistics.py b/mass_mailing_partner/models/mailing_trace.py similarity index 86% rename from mass_mailing_partner/models/mail_mail_statistics.py rename to mass_mailing_partner/models/mailing_trace.py index b7aca9e0b..f41b0bd60 100644 --- a/mass_mailing_partner/models/mail_mail_statistics.py +++ b/mass_mailing_partner/models/mailing_trace.py @@ -1,11 +1,12 @@ # Copyright 2016 Antonio Espinosa - +# Copyright 2020 Tecnativa - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, fields, models -class MailMailStatistics(models.Model): - _inherit = "mail.mail.statistics" +class MailingTrace(models.Model): + _inherit = "mailing.trace" partner_id = fields.Many2one( string="Partner", comodel_name="res.partner", readonly=True @@ -31,6 +32,6 @@ class MailMailStatistics(models.Model): @api.model def create(self, vals): - stat = super(MailMailStatistics, self).create(vals) + stat = super(MailingTrace, self).create(vals) stat.partner_link() return stat diff --git a/mass_mailing_partner/models/res_partner.py b/mass_mailing_partner/models/res_partner.py index 96ae35964..9c46b1993 100644 --- a/mass_mailing_partner/models/res_partner.py +++ b/mass_mailing_partner/models/res_partner.py @@ -2,6 +2,7 @@ # Copyright 2015 Antonio Espinosa # Copyright 2015 Javier Iniesta # Copyright 2017 David Vidal +# Copyright 2020 Tecnativa - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import _, api, fields, models @@ -13,7 +14,7 @@ class ResPartner(models.Model): mass_mailing_contact_ids = fields.One2many( string="Mailing contacts", - comodel_name="mail.mass_mailing.contact", + comodel_name="mailing.contact", inverse_name="partner_id", ) mass_mailing_contacts_count = fields.Integer( @@ -24,7 +25,7 @@ class ResPartner(models.Model): ) mass_mailing_stats_ids = fields.One2many( string="Mass mailing stats", - comodel_name="mail.mail.statistics", + comodel_name="mailing.trace", inverse_name="partner_id", ) mass_mailing_stats_count = fields.Integer( @@ -47,24 +48,24 @@ class ResPartner(models.Model): @api.depends("mass_mailing_contact_ids") def _compute_mass_mailing_contacts_count(self): - contact_data = self.env["mail.mass_mailing.contact"].read_group( + contact_data = self.env["mailing.contact"].read_group( [("partner_id", "in", self.ids)], ["partner_id"], ["partner_id"] ) mapped_data = { - contact["partner_id"][0]: contact["partner_id_count"] - for contact in contact_data + contact["partner_id"][0]: contact["partner_id_count"] + for contact in contact_data } for partner in self: partner.mass_mailing_contacts_count = mapped_data.get(partner.id, 0) @api.depends("mass_mailing_stats_ids") def _compute_mass_mailing_stats_count(self): - contact_data = self.env["mail.mail.statistics"].read_group( + contact_data = self.env["mailing.trace"].read_group( [("partner_id", "in", self.ids)], ["partner_id"], ["partner_id"] ) mapped_data = { - contact["partner_id"][0]: contact["partner_id_count"] - for contact in contact_data + contact["partner_id"][0]: contact["partner_id_count"] + for contact in contact_data } for partner in self: partner.mass_mailing_stats_count = mapped_data.get(partner.id, 0) @@ -87,7 +88,7 @@ class ResPartner(models.Model): 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( + self.env["mailing.contact"].sudo().search( [("partner_id", "in", self.ids)] ).write(mm_vals) return res diff --git a/mass_mailing_partner/readme/CONTRIBUTORS.rst b/mass_mailing_partner/readme/CONTRIBUTORS.rst index 1b0b2ac3d..ab4be7126 100644 --- a/mass_mailing_partner/readme/CONTRIBUTORS.rst +++ b/mass_mailing_partner/readme/CONTRIBUTORS.rst @@ -8,3 +8,4 @@ * David Vidal * Ernesto Tejeda * Victor M.M. Torres + * Manuel Calero diff --git a/mass_mailing_partner/static/description/index.html b/mass_mailing_partner/static/description/index.html index 3b36c92a6..cb1bd861e 100644 --- a/mass_mailing_partner/static/description/index.html +++ b/mass_mailing_partner/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/social Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/social Translate me on Weblate Try me on Runbot

This module links mass-mailing contacts with partners.

Features

@@ -404,7 +404,7 @@ as mailing list contacts.

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -443,7 +443,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

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.

-

This module is part of the OCA/social project on GitHub.

+

This module is part of the OCA/social project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/mass_mailing_partner/tests/__init__.py b/mass_mailing_partner/tests/__init__.py index f98b3f15d..cb4bd1405 100644 --- a/mass_mailing_partner/tests/__init__.py +++ b/mass_mailing_partner/tests/__init__.py @@ -1,6 +1,3 @@ -# Copyright 2015 Pedro M. Baeza -# Copyright 2015 Antonio Espinosa -# Copyright 2015 Javier Iniesta # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import test_mail_mass_mailing_contact, test_res_partner diff --git a/mass_mailing_partner/tests/base.py b/mass_mailing_partner/tests/base.py index c03a025ab..77b9e949c 100644 --- a/mass_mailing_partner/tests/base.py +++ b/mass_mailing_partner/tests/base.py @@ -1,6 +1,7 @@ # Copyright 2015 Pedro M. Baeza # Copyright 2015 Antonio Espinosa # Copyright 2015 Javier Iniesta +# Copyright 2020 Tecnativa - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo.tests.common import TransactionCase @@ -41,11 +42,11 @@ class BaseCase(TransactionCase): return m_partner.create(vals) def create_mailing_contact(self, vals): - m_mailing_contact = self.env["mail.mass_mailing.contact"] + m_mailing_contact = self.env["mailing.contact"] return m_mailing_contact.create(vals) def create_mailing_list(self, vals): - m_mailing_list = self.env["mail.mass_mailing.list"] + m_mailing_list = self.env["mailing.list"] return m_mailing_list.create(vals) def check_mailing_contact_partner(self, mailing_contact): diff --git a/mass_mailing_partner/tests/test_mail_mail_statistics.py b/mass_mailing_partner/tests/test_mail_mail_statistics.py index 6344dbdbf..1ecdf2b53 100644 --- a/mass_mailing_partner/tests/test_mail_mail_statistics.py +++ b/mass_mailing_partner/tests/test_mail_mail_statistics.py @@ -1,6 +1,7 @@ # Copyright 2015 Pedro M. Baeza # Copyright 2015 Antonio Espinosa # Copyright 2015 Javier Iniesta +# Copyright 2020 Tecnativa - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import base @@ -9,7 +10,7 @@ from . import base class MailMailStatisticsCase(base.BaseCase): def test_link_partner(self): partner = self.create_partner({"name": "Test partner"}) - stat = self.env["mail.mail.statistics"].create( + stat = self.env["mailing.trace"].create( {"model": "res.partner", "res_id": partner.id} ) self.assertEqual(partner.id, stat.partner_id.id) @@ -23,7 +24,7 @@ class MailMailStatisticsCase(base.BaseCase): "list_ids": [[6, 0, [self.mailing_list.id]]], } contact = self.create_mailing_contact(contact_vals) - stat = self.env["mail.mail.statistics"].create( - {"model": "mail.mass_mailing.contact", "res_id": contact.id} + stat = self.env["mailing.trace"].create( + {"model": "mailing.contact", "res_id": contact.id} ) self.assertEqual(partner.id, stat.partner_id.id) diff --git a/mass_mailing_partner/tests/test_mail_mass_mailing_contact.py b/mass_mailing_partner/tests/test_mail_mass_mailing_contact.py index c1d84ac4e..ffcbb6ab9 100644 --- a/mass_mailing_partner/tests/test_mail_mass_mailing_contact.py +++ b/mass_mailing_partner/tests/test_mail_mass_mailing_contact.py @@ -1,6 +1,7 @@ # Copyright 2015 Pedro M. Baeza # Copyright 2015 Antonio Espinosa # Copyright 2015 Javier Iniesta +# Copyright 2020 Tecnativa - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo.exceptions import ValidationError @@ -104,7 +105,7 @@ class MailMassMailingContactCase(base.BaseCase): "category_id": [(6, 0, (category_8 | category_11).ids)], } partner = self.create_partner(partner_vals) - with self.env.do_in_onchange(): - contact.partner_id = partner - contact._onchange_partner_mass_mailing_partner() - self.check_mailing_contact_partner(contact) + # with self.env.do_in_onchange(): + contact.partner_id = partner + contact._onchange_partner_mass_mailing_partner() + self.check_mailing_contact_partner(contact) diff --git a/mass_mailing_partner/tests/test_mail_mass_mailing_list.py b/mass_mailing_partner/tests/test_mail_mass_mailing_list.py index e433fe7c8..08b9d9f26 100644 --- a/mass_mailing_partner/tests/test_mail_mass_mailing_list.py +++ b/mass_mailing_partner/tests/test_mail_mass_mailing_list.py @@ -1,4 +1,5 @@ # Copyright 2018 Tecnativa - Ernesto tejeda +# Copyright 2020 Tecnativa - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo.exceptions import ValidationError @@ -33,9 +34,6 @@ class MailMassMailingListCase(base.BaseCase): self.create_mailing_list( { "name": "List test 3", - "subscription_contact_ids": [ - (0, 0, {"contact_id": contact_test_1.id}), - (0, 0, {"contact_id": contact_test_2.id}), - ], + "contact_ids": [(4, contact_test_1.id), (4, contact_test_2.id)], } ) diff --git a/mass_mailing_partner/tests/test_mail_mass_mailing_list_contact_rel.py b/mass_mailing_partner/tests/test_mail_mass_mailing_list_contact_rel.py index 20cdb3352..5d19b214a 100644 --- a/mass_mailing_partner/tests/test_mail_mass_mailing_list_contact_rel.py +++ b/mass_mailing_partner/tests/test_mail_mass_mailing_list_contact_rel.py @@ -1,4 +1,5 @@ # Copyright 2018 Tecnativa - Ernesto tejeda +# Copyright 2020 Tecnativa - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo.exceptions import ValidationError @@ -14,13 +15,8 @@ class MailMassMailingListContactRelCase(base.BaseCase): contact_test_2 = self.create_mailing_contact( {"name": "Contact test 2", "partner_id": self.partner.id} ) - list_3 = self.create_mailing_list({"name": "List test 3"}) - - self.env["mail.mass_mailing.list_contact_rel"].create( - {"list_id": list_3.id, "contact_id": contact_test_1.id} + list_3 = self.create_mailing_list( + {"name": "List test 3", "contact_ids": [(4, contact_test_1.id)]} ) - with self.assertRaises(ValidationError): - self.env["mail.mass_mailing.list_contact_rel"].create( - {"list_id": list_3.id, "contact_id": contact_test_2.id} - ) + list_3.contact_ids = [(4, contact_test_2.id)] diff --git a/mass_mailing_partner/tests/test_partner_mail_list_wizard.py b/mass_mailing_partner/tests/test_partner_mail_list_wizard.py index 896629ab4..f88137104 100644 --- a/mass_mailing_partner/tests/test_partner_mail_list_wizard.py +++ b/mass_mailing_partner/tests/test_partner_mail_list_wizard.py @@ -1,6 +1,7 @@ # Copyright 2015 Pedro M. Baeza # Copyright 2015 Antonio Espinosa # Copyright 2015 Javier Iniesta +# Copyright 2020 Tecnativa - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo.exceptions import UserError @@ -15,7 +16,7 @@ class PartnerMailListWizardCase(base.BaseCase): ) wizard.partner_ids = [self.partner.id] wizard.add_to_mail_list() - contacts = self.env["mail.mass_mailing.contact"].search( + contacts = self.env["mailing.contact"].search( [("partner_id", "=", self.partner.id)] ) cont = contacts.filtered(lambda r: wizard.mail_list_id in r.list_ids) @@ -24,6 +25,7 @@ class PartnerMailListWizardCase(base.BaseCase): # This line does not create a new contact wizard.add_to_mail_list() self.assertEqual(len(self.partner.mass_mailing_contact_ids), 1) + self.assertEqual( self.partner.mass_mailing_contact_ids.list_ids, self.mailing_list ) diff --git a/mass_mailing_partner/tests/test_res_partner.py b/mass_mailing_partner/tests/test_res_partner.py index c059bcce4..ef1ff3cb8 100644 --- a/mass_mailing_partner/tests/test_res_partner.py +++ b/mass_mailing_partner/tests/test_res_partner.py @@ -1,6 +1,7 @@ # Copyright 2015 Pedro M. Baeza # Copyright 2015 Antonio Espinosa # Copyright 2015 Javier Iniesta +# Copyright 2020 Tecnativa - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo.exceptions import ValidationError diff --git a/mass_mailing_partner/views/mail_mass_mailing_contact_view.xml b/mass_mailing_partner/views/mailing_contact_view.xml similarity index 89% rename from mass_mailing_partner/views/mail_mass_mailing_contact_view.xml rename to mass_mailing_partner/views/mailing_contact_view.xml index dcbac3516..38804ae6f 100644 --- a/mass_mailing_partner/views/mail_mass_mailing_contact_view.xml +++ b/mass_mailing_partner/views/mailing_contact_view.xml @@ -3,12 +3,13 @@ Copyright 2015 Antonio Espinosa Copyright 2015 Javier Iniesta Copyright 2016 Antonio Espinosa - + Copyright 2020 Tecnativa - Manuel Calero License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). --> - mail.mass_mailing.contact.tree.inherit - mail.mass_mailing.contact + mailing.contact.tree.inherit + mailing.contact @@ -18,8 +19,8 @@ - mail.mass_mailing.contact.form.partner - mail.mass_mailing.contact + mailing.contact.form.partner + mailing.contact @@ -48,7 +49,7 @@ Add partner search field and group by - mail.mass_mailing.contact + mailing.contact diff --git a/mass_mailing_partner/views/mail_mail_statistics_view.xml b/mass_mailing_partner/views/mailing_trace_view.xml similarity index 64% rename from mass_mailing_partner/views/mail_mail_statistics_view.xml rename to mass_mailing_partner/views/mailing_trace_view.xml index 40808a516..dfc371493 100644 --- a/mass_mailing_partner/views/mail_mail_statistics_view.xml +++ b/mass_mailing_partner/views/mailing_trace_view.xml @@ -1,12 +1,13 @@ - + Add partner field - mail.mail.statistics - + mailing.trace + @@ -14,10 +15,10 @@ - + Add partner column - mail.mail.statistics - + mailing.trace + @@ -25,10 +26,10 @@ - + Add partner search field and group by - mail.mail.statistics - + mailing.trace + diff --git a/mass_mailing_partner/views/mail_mass_mailing_view.xml b/mass_mailing_partner/views/mailing_view.xml similarity index 71% rename from mass_mailing_partner/views/mail_mass_mailing_view.xml rename to mass_mailing_partner/views/mailing_view.xml index 7ae983369..f34b8a100 100644 --- a/mass_mailing_partner/views/mail_mass_mailing_view.xml +++ b/mass_mailing_partner/views/mailing_view.xml @@ -2,13 +2,14 @@ - - mail.mass_mailing.list.form - mail.mass_mailing.list - + + mailing.list.form + mailing.list + diff --git a/mass_mailing_partner/views/res_partner_view.xml b/mass_mailing_partner/views/res_partner_view.xml index 18e8bf57c..aafa5bf8d 100644 --- a/mass_mailing_partner/views/res_partner_view.xml +++ b/mass_mailing_partner/views/res_partner_view.xml @@ -3,6 +3,7 @@ Copyright 2015-16 Antonio Espinosa Copyright 2015 Javier Iniesta Copyright 2016 Antonio Espinosa - + Copyright 2020 Tecnativa - Manuel Calero License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). --> @@ -23,7 +24,7 @@ widget="statinfo" string="Mailing contacts"/> -