From 7d09eacf9ad1444d1ab8117d3b53a0966c9f66ec Mon Sep 17 00:00:00 2001 From: Carlos Roca Date: Thu, 22 Jul 2021 11:28:44 +0200 Subject: [PATCH] [MIG] mail_tracking_mass_mailing: Migration to v14.0 --- mail_tracking_mass_mailing/README.rst | 11 ++++++----- mail_tracking_mass_mailing/__init__.py | 4 ++-- mail_tracking_mass_mailing/__manifest__.py | 10 +++++----- mail_tracking_mass_mailing/hooks.py | 6 +++--- mail_tracking_mass_mailing/i18n/ca.po | 3 --- mail_tracking_mass_mailing/i18n/de.po | 3 --- mail_tracking_mass_mailing/i18n/es.po | 3 --- mail_tracking_mass_mailing/i18n/fr.po | 3 --- mail_tracking_mass_mailing/i18n/pt.po | 3 --- mail_tracking_mass_mailing/i18n/sl.po | 3 --- mail_tracking_mass_mailing/models/__init__.py | 4 ++-- mail_tracking_mass_mailing/models/mail_mail.py | 6 +++--- .../models/mail_tracking_email.py | 12 +++++------- .../models/mail_tracking_event.py | 18 +++++++----------- .../models/mailing_contact.py | 4 ++-- .../models/mailing_trace.py | 4 ++-- .../readme/CONTRIBUTORS.rst | 1 + .../static/description/index.html | 9 +++++---- mail_tracking_mass_mailing/tests/__init__.py | 4 ++-- .../tests/test_mass_mailing.py | 17 ++++++++--------- .../views/mailing_contact_view.xml | 8 ++++---- 21 files changed, 57 insertions(+), 79 deletions(-) diff --git a/mail_tracking_mass_mailing/README.rst b/mail_tracking_mass_mailing/README.rst index f27321ea5..825413e12 100644 --- a/mail_tracking_mass_mailing/README.rst +++ b/mail_tracking_mass_mailing/README.rst @@ -14,13 +14,13 @@ Mail tracking for 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/13.0/mail_tracking_mass_mailing + :target: https://github.com/OCA/social/tree/14.0/mail_tracking_mass_mailing :alt: OCA/social .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/social-13-0/social-13-0-mail_tracking_mass_mailing + :target: https://translation.odoo-community.org/projects/social-14-0/social-14-0-mail_tracking_mass_mailing :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/13.0 + :target: https://runbot.odoo-community.org/runbot/205/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -58,7 +58,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. @@ -80,6 +80,7 @@ Contributors * Vicent Cubells * David Vidal * Ernesto Tejeda + * Carlos Roca Maintainers ~~~~~~~~~~~ @@ -94,6 +95,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/mail_tracking_mass_mailing/__init__.py b/mail_tracking_mass_mailing/__init__.py index 8ad4d1276..bce3b646a 100644 --- a/mail_tracking_mass_mailing/__init__.py +++ b/mail_tracking_mass_mailing/__init__.py @@ -1,5 +1,5 @@ -# Copyright 2016 Antonio Espinosa - -# Copyright 2017 Vicent Cubells - +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/mail_tracking_mass_mailing/__manifest__.py b/mail_tracking_mass_mailing/__manifest__.py index de327eb26..183768b66 100644 --- a/mail_tracking_mass_mailing/__manifest__.py +++ b/mail_tracking_mass_mailing/__manifest__.py @@ -1,16 +1,16 @@ -# Copyright 2016 Antonio Espinosa - -# Copyright 2017 Vicent Cubells - -# Copyright 2017 David Vidal - +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Vicent Cubells +# Copyright 2017 Tecnativa - David Vidal # Copyright 2018 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Mail tracking for mass mailing", "summary": "Improve mass mailing email tracking", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "category": "Social Network", "website": "https://github.com/OCA/social", - "author": "Tecnativa, " "Odoo Community Association (OCA)", + "author": "Tecnativa, Odoo Community Association (OCA)", "license": "AGPL-3", "application": False, "installable": True, diff --git a/mail_tracking_mass_mailing/hooks.py b/mail_tracking_mass_mailing/hooks.py index e1ed7ff34..a138a625a 100644 --- a/mail_tracking_mass_mailing/hooks.py +++ b/mail_tracking_mass_mailing/hooks.py @@ -1,5 +1,5 @@ -# Copyright 2016 Antonio Espinosa - -# Copyright 2017 Vicent Cubells - +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). import logging @@ -14,7 +14,7 @@ _logger = logging.getLogger(__name__) def pre_init_hook(cr): if column_add_with_value: - _logger.info("Creating mailing_contact.email_score column " "with value 50.0") + _logger.info("Creating mailing_contact.email_score column with value 50.0") column_add_with_value( cr, "mailing_contact", "email_score", "double precision", 50.0 ) diff --git a/mail_tracking_mass_mailing/i18n/ca.po b/mail_tracking_mass_mailing/i18n/ca.po index 74f130106..c5be53665 100644 --- a/mail_tracking_mass_mailing/i18n/ca.po +++ b/mail_tracking_mass_mailing/i18n/ca.po @@ -118,6 +118,3 @@ msgstr "Esdeveniments de seguiment" #: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "User agent" msgstr "Aplicació de l'usuari" - -#~ msgid "Email Statistics" -#~ msgstr "Estadístiques de correu electrònic" diff --git a/mail_tracking_mass_mailing/i18n/de.po b/mail_tracking_mass_mailing/i18n/de.po index 8161334ff..6afc934e8 100644 --- a/mail_tracking_mass_mailing/i18n/de.po +++ b/mail_tracking_mass_mailing/i18n/de.po @@ -118,6 +118,3 @@ msgstr "Verfolge Vorkommnisse" #: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "User agent" msgstr "Benutzervertreter" - -#~ msgid "Email Statistics" -#~ msgstr "Email-Statistiken" diff --git a/mail_tracking_mass_mailing/i18n/es.po b/mail_tracking_mass_mailing/i18n/es.po index 997367bac..b3e090252 100644 --- a/mail_tracking_mass_mailing/i18n/es.po +++ b/mail_tracking_mass_mailing/i18n/es.po @@ -118,6 +118,3 @@ msgstr "Eventos de seguimiento" #: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "User agent" msgstr "Aplicación del usuario" - -#~ msgid "Email Statistics" -#~ msgstr "Estadísticas de email" diff --git a/mail_tracking_mass_mailing/i18n/fr.po b/mail_tracking_mass_mailing/i18n/fr.po index 576a8106e..210556500 100644 --- a/mail_tracking_mass_mailing/i18n/fr.po +++ b/mail_tracking_mass_mailing/i18n/fr.po @@ -118,6 +118,3 @@ msgstr "Suivi du courriel: évènements" #: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "User agent" msgstr "Navigateur" - -#~ msgid "Email Statistics" -#~ msgstr "Statistiques de courriel" diff --git a/mail_tracking_mass_mailing/i18n/pt.po b/mail_tracking_mass_mailing/i18n/pt.po index 4184b7001..dc4eabc3a 100644 --- a/mail_tracking_mass_mailing/i18n/pt.po +++ b/mail_tracking_mass_mailing/i18n/pt.po @@ -119,6 +119,3 @@ msgstr "Eventos de rastreamento" #: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "User agent" msgstr "Agente do utilizador" - -#~ msgid "Email Statistics" -#~ msgstr "Estatísticas de Email" diff --git a/mail_tracking_mass_mailing/i18n/sl.po b/mail_tracking_mass_mailing/i18n/sl.po index ebdd54da1..1c72418a1 100644 --- a/mail_tracking_mass_mailing/i18n/sl.po +++ b/mail_tracking_mass_mailing/i18n/sl.po @@ -119,6 +119,3 @@ msgstr "Sledilni dogodki" #: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "User agent" msgstr "Uporabnikov odjemalec" - -#~ msgid "Email Statistics" -#~ msgstr "Statistika e-pošte" diff --git a/mail_tracking_mass_mailing/models/__init__.py b/mail_tracking_mass_mailing/models/__init__.py index 1a04775c1..7335ab6d1 100644 --- a/mail_tracking_mass_mailing/models/__init__.py +++ b/mail_tracking_mass_mailing/models/__init__.py @@ -1,5 +1,5 @@ -# Copyright 2016 Antonio Espinosa - -# Copyright 2017 Vicent Cubells - +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import mail_mail diff --git a/mail_tracking_mass_mailing/models/mail_mail.py b/mail_tracking_mass_mailing/models/mail_mail.py index b0ff8fb17..fe97fa63c 100644 --- a/mail_tracking_mass_mailing/models/mail_mail.py +++ b/mail_tracking_mass_mailing/models/mail_mail.py @@ -1,5 +1,5 @@ -# Copyright 2016 Antonio Espinosa - -# Copyright 2017 Vicent Cubells - +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, models @@ -10,7 +10,7 @@ class MailMail(models.Model): @api.model def _tracking_email_prepare(self, partner, email): - res = super(MailMail, self)._tracking_email_prepare(partner, email) + res = super()._tracking_email_prepare(partner, email) res["mail_id_int"] = self.id res["mass_mailing_id"] = self.mailing_id.id res["mail_stats_id"] = ( diff --git a/mail_tracking_mass_mailing/models/mail_tracking_email.py b/mail_tracking_mass_mailing/models/mail_tracking_email.py index 11cd7d5a4..7556cb1c8 100644 --- a/mail_tracking_mass_mailing/models/mail_tracking_email.py +++ b/mail_tracking_mass_mailing/models/mail_tracking_email.py @@ -1,5 +1,5 @@ -# Copyright 2016 Antonio Espinosa - -# Copyright 2017 Vicent Cubells - +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, fields, models @@ -23,7 +23,7 @@ class MailTrackingEmail(models.Model): @api.model def create(self, vals): - tracking = super(MailTrackingEmail, self).create(vals) + tracking = super().create(vals) # Link mail statistics with this tracking if tracking.mail_stats_id: tracking.mail_stats_id.write(self._statistics_link_prepare(tracking)) @@ -41,14 +41,12 @@ class MailTrackingEmail(models.Model): ).email_bounced_set(self, reason, event=event) def smtp_error(self, mail_server, smtp_server, exception): - res = super(MailTrackingEmail, self).smtp_error( - mail_server, smtp_server, exception - ) + res = super().smtp_error(mail_server, smtp_server, exception) self._contacts_email_bounced_set("error") return res def event_create(self, event_type, metadata): - res = super(MailTrackingEmail, self).event_create(event_type, metadata) + res = super().event_create(event_type, metadata) if event_type in {"hard_bounce", "spam", "reject"}: self._contacts_email_bounced_set(event_type) return res diff --git a/mail_tracking_mass_mailing/models/mail_tracking_event.py b/mail_tracking_mass_mailing/models/mail_tracking_event.py index 0f7ad1d7d..026d2e409 100644 --- a/mail_tracking_mass_mailing/models/mail_tracking_event.py +++ b/mail_tracking_mass_mailing/models/mail_tracking_event.py @@ -1,5 +1,5 @@ -# Copyright 2016 Antonio Espinosa - -# Copyright 2017 Vicent Cubells - +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, fields, models @@ -18,7 +18,7 @@ class MailTrackingEvent(models.Model): @api.model def process_open(self, tracking_email, metadata): - res = super(MailTrackingEvent, self).process_open(tracking_email, metadata) + res = super().process_open(tracking_email, metadata) mail_mail_stats = self.sudo().env["mailing.trace"] mail_mail_stats.set_opened(mail_mail_ids=[tracking_email.mail_id_int]) return res @@ -29,28 +29,24 @@ class MailTrackingEvent(models.Model): @api.model def process_hard_bounce(self, tracking_email, metadata): - res = super(MailTrackingEvent, self).process_hard_bounce( - tracking_email, metadata - ) + res = super().process_hard_bounce(tracking_email, metadata) self._tracking_set_bounce(tracking_email, metadata) return res @api.model def process_soft_bounce(self, tracking_email, metadata): - res = super(MailTrackingEvent, self).process_soft_bounce( - tracking_email, metadata - ) + res = super().process_soft_bounce(tracking_email, metadata) self._tracking_set_bounce(tracking_email, metadata) return res @api.model def process_reject(self, tracking_email, metadata): - res = super(MailTrackingEvent, self).process_reject(tracking_email, metadata) + res = super().process_reject(tracking_email, metadata) self._tracking_set_bounce(tracking_email, metadata) return res @api.model def process_spam(self, tracking_email, metadata): - res = super(MailTrackingEvent, self).process_spam(tracking_email, metadata) + res = super().process_spam(tracking_email, metadata) self._tracking_set_bounce(tracking_email, metadata) return res diff --git a/mail_tracking_mass_mailing/models/mailing_contact.py b/mail_tracking_mass_mailing/models/mailing_contact.py index 63b7398a9..162dd339c 100644 --- a/mail_tracking_mass_mailing/models/mailing_contact.py +++ b/mail_tracking_mass_mailing/models/mailing_contact.py @@ -1,5 +1,5 @@ -# Copyright 2016 Antonio Espinosa - -# Copyright 2017 Vicent Cubells - +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, fields, models diff --git a/mail_tracking_mass_mailing/models/mailing_trace.py b/mail_tracking_mass_mailing/models/mailing_trace.py index c5a4d2b19..57ccd061a 100644 --- a/mail_tracking_mass_mailing/models/mailing_trace.py +++ b/mail_tracking_mass_mailing/models/mailing_trace.py @@ -1,5 +1,5 @@ -# Copyright 2016 Antonio Espinosa - -# Copyright 2017 Vicent Cubells - +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import fields, models diff --git a/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst b/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst index 15c6cef1a..231e175b3 100644 --- a/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst +++ b/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst @@ -5,3 +5,4 @@ * Vicent Cubells * David Vidal * Ernesto Tejeda + * Carlos Roca diff --git a/mail_tracking_mass_mailing/static/description/index.html b/mail_tracking_mass_mailing/static/description/index.html index 0d6253ced..f7788a839 100644 --- a/mail_tracking_mass_mailing/static/description/index.html +++ b/mail_tracking_mass_mailing/static/description/index.html @@ -3,7 +3,7 @@ - + Mail tracking for mass mailing