From 7d3e6c0aab4d154d6e735473c03f2b65f324a48e Mon Sep 17 00:00:00 2001 From: sergio-teruel Date: Thu, 8 Dec 2022 09:16:40 +0100 Subject: [PATCH] [MIG] mail_tracking_mass_mailing: Migration to v15.0 --- mail_tracking_mass_mailing/README.rst | 11 +++--- mail_tracking_mass_mailing/__manifest__.py | 2 +- mail_tracking_mass_mailing/i18n/ca.po | 8 +++-- mail_tracking_mass_mailing/i18n/da.po | 8 +++-- mail_tracking_mass_mailing/i18n/de.po | 8 +++-- mail_tracking_mass_mailing/i18n/el_GR.po | 8 +++-- mail_tracking_mass_mailing/i18n/es.po | 8 +++-- mail_tracking_mass_mailing/i18n/es_CO.po | 8 +++-- mail_tracking_mass_mailing/i18n/eu.po | 8 +++-- mail_tracking_mass_mailing/i18n/fi.po | 8 +++-- mail_tracking_mass_mailing/i18n/fr.po | 8 +++-- mail_tracking_mass_mailing/i18n/gl.po | 8 +++-- mail_tracking_mass_mailing/i18n/hr.po | 8 +++-- mail_tracking_mass_mailing/i18n/hr_HR.po | 8 +++-- mail_tracking_mass_mailing/i18n/it.po | 8 +++-- .../i18n/mail_tracking_mass_mailing.pot | 34 +------------------ mail_tracking_mass_mailing/i18n/nb_NO.po | 8 +++-- mail_tracking_mass_mailing/i18n/nl.po | 8 +++-- mail_tracking_mass_mailing/i18n/nl_NL.po | 8 +++-- mail_tracking_mass_mailing/i18n/pl.po | 8 +++-- mail_tracking_mass_mailing/i18n/pt.po | 8 +++-- mail_tracking_mass_mailing/i18n/pt_BR.po | 8 +++-- mail_tracking_mass_mailing/i18n/ro.po | 8 +++-- mail_tracking_mass_mailing/i18n/ru.po | 8 +++-- mail_tracking_mass_mailing/i18n/sl.po | 8 +++-- mail_tracking_mass_mailing/i18n/tr.po | 8 +++-- .../models/mail_mail.py | 7 ++-- .../models/mail_tracking_email.py | 8 +++++ .../models/mail_tracking_event.py | 6 ++-- .../readme/CONTRIBUTORS.rst | 1 + .../static/description/index.html | 7 ++-- .../tests/test_mass_mailing.py | 11 +++--- .../views/mail_trace_view.xml | 6 ++-- 33 files changed, 175 insertions(+), 102 deletions(-) diff --git a/mail_tracking_mass_mailing/README.rst b/mail_tracking_mass_mailing/README.rst index 825413e12..d35ad9688 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/14.0/mail_tracking_mass_mailing + :target: https://github.com/OCA/social/tree/15.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-14-0/social-14-0-mail_tracking_mass_mailing + :target: https://translation.odoo-community.org/projects/social-15-0/social-15-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/14.0 + :target: https://runbot.odoo-community.org/runbot/205/15.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. @@ -81,6 +81,7 @@ Contributors * David Vidal * Ernesto Tejeda * Carlos Roca + * Sergio Teruel Maintainers ~~~~~~~~~~~ @@ -95,6 +96,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/__manifest__.py b/mail_tracking_mass_mailing/__manifest__.py index b74ed444e..db88d50e5 100644 --- a/mail_tracking_mass_mailing/__manifest__.py +++ b/mail_tracking_mass_mailing/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Mail tracking for mass mailing", "summary": "Improve mass mailing email tracking", - "version": "14.0.1.0.1", + "version": "15.0.1.0.0", "category": "Social Network", "website": "https://github.com/OCA/social", "author": "Tecnativa, Odoo Community Association (OCA)", diff --git a/mail_tracking_mass_mailing/i18n/ca.po b/mail_tracking_mass_mailing/i18n/ca.po index c5be53665..146604bf6 100644 --- a/mail_tracking_mass_mailing/i18n/ca.po +++ b/mail_tracking_mass_mailing/i18n/ca.po @@ -25,7 +25,12 @@ msgid "Country" msgstr "País" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "Correu electrònic rebotat" @@ -110,7 +115,6 @@ msgstr "Correus sortints" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "Esdeveniments de seguiment" diff --git a/mail_tracking_mass_mailing/i18n/da.po b/mail_tracking_mass_mailing/i18n/da.po index 1418528a4..90500818f 100644 --- a/mail_tracking_mass_mailing/i18n/da.po +++ b/mail_tracking_mass_mailing/i18n/da.po @@ -24,7 +24,12 @@ msgid "Country" msgstr "Land." #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -107,7 +112,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/de.po b/mail_tracking_mass_mailing/i18n/de.po index 6afc934e8..8f738ea3f 100644 --- a/mail_tracking_mass_mailing/i18n/de.po +++ b/mail_tracking_mass_mailing/i18n/de.po @@ -25,7 +25,12 @@ msgid "Country" msgstr "Land" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "Email retourniert" @@ -110,7 +115,6 @@ msgstr "Ausgehende Nachrichten" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "Verfolge Vorkommnisse" diff --git a/mail_tracking_mass_mailing/i18n/el_GR.po b/mail_tracking_mass_mailing/i18n/el_GR.po index c6feaa076..96435fd88 100644 --- a/mail_tracking_mass_mailing/i18n/el_GR.po +++ b/mail_tracking_mass_mailing/i18n/el_GR.po @@ -25,7 +25,12 @@ msgid "Country" msgstr "Χώρα" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -108,7 +113,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/es.po b/mail_tracking_mass_mailing/i18n/es.po index b3e090252..c96e3c1bc 100644 --- a/mail_tracking_mass_mailing/i18n/es.po +++ b/mail_tracking_mass_mailing/i18n/es.po @@ -25,7 +25,12 @@ msgid "Country" msgstr "País" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "Email rebotado" @@ -110,7 +115,6 @@ msgstr "Correos salientes" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "Eventos de seguimiento" diff --git a/mail_tracking_mass_mailing/i18n/es_CO.po b/mail_tracking_mass_mailing/i18n/es_CO.po index d0451fe5b..a18e92f96 100644 --- a/mail_tracking_mass_mailing/i18n/es_CO.po +++ b/mail_tracking_mass_mailing/i18n/es_CO.po @@ -25,7 +25,12 @@ msgid "Country" msgstr "" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -108,7 +113,6 @@ msgstr "Correos Salientes" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/eu.po b/mail_tracking_mass_mailing/i18n/eu.po index 04659f78e..f1c3461b2 100644 --- a/mail_tracking_mass_mailing/i18n/eu.po +++ b/mail_tracking_mass_mailing/i18n/eu.po @@ -24,7 +24,12 @@ msgid "Country" msgstr "Herrialdea" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -107,7 +112,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/fi.po b/mail_tracking_mass_mailing/i18n/fi.po index 74bbf56d8..fcb81494d 100644 --- a/mail_tracking_mass_mailing/i18n/fi.po +++ b/mail_tracking_mass_mailing/i18n/fi.po @@ -25,7 +25,12 @@ msgid "Country" msgstr "Maa" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "Sähköposti palautunut" @@ -109,7 +114,6 @@ msgstr "Lähtevät postit" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "Seurattavat tapahtumat" diff --git a/mail_tracking_mass_mailing/i18n/fr.po b/mail_tracking_mass_mailing/i18n/fr.po index 210556500..bd6fa1fa4 100644 --- a/mail_tracking_mass_mailing/i18n/fr.po +++ b/mail_tracking_mass_mailing/i18n/fr.po @@ -25,7 +25,12 @@ msgid "Country" msgstr "Pays" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "Email retourné" @@ -110,7 +115,6 @@ msgstr "Courriels sortants" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "Suivi du courriel: évènements" diff --git a/mail_tracking_mass_mailing/i18n/gl.po b/mail_tracking_mass_mailing/i18n/gl.po index fd30a7eba..21614cc14 100644 --- a/mail_tracking_mass_mailing/i18n/gl.po +++ b/mail_tracking_mass_mailing/i18n/gl.po @@ -24,7 +24,12 @@ msgid "Country" msgstr "País" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -107,7 +112,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/hr.po b/mail_tracking_mass_mailing/i18n/hr.po index 11c1c6918..39514cd05 100644 --- a/mail_tracking_mass_mailing/i18n/hr.po +++ b/mail_tracking_mass_mailing/i18n/hr.po @@ -27,7 +27,12 @@ msgid "Country" msgstr "Država" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -112,7 +117,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/hr_HR.po b/mail_tracking_mass_mailing/i18n/hr_HR.po index 60619dbb3..1d6bfd46d 100644 --- a/mail_tracking_mass_mailing/i18n/hr_HR.po +++ b/mail_tracking_mass_mailing/i18n/hr_HR.po @@ -26,7 +26,12 @@ msgid "Country" msgstr "Država" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -109,7 +114,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/it.po b/mail_tracking_mass_mailing/i18n/it.po index b46b586bc..eeee4cb93 100644 --- a/mail_tracking_mass_mailing/i18n/it.po +++ b/mail_tracking_mass_mailing/i18n/it.po @@ -25,7 +25,12 @@ msgid "Country" msgstr "Nazione" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -109,7 +114,6 @@ msgstr "Mail in Uscita" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/mail_tracking_mass_mailing.pot b/mail_tracking_mass_mailing/i18n/mail_tracking_mass_mailing.pot index c93596c07..5525f3156 100644 --- a/mail_tracking_mass_mailing/i18n/mail_tracking_mass_mailing.pot +++ b/mail_tracking_mass_mailing/i18n/mail_tracking_mass_mailing.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -18,19 +18,6 @@ msgstr "" msgid "Country" msgstr "" -#. module: mail_tracking_mass_mailing -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mail_mail__display_name -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mail_tracking_event__display_name -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__display_name -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__display_name -msgid "Display Name" -msgstr "" - -#. module: mail_tracking_mass_mailing -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mail_tracking_email__display_name -msgid "Display name" -msgstr "" - #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced msgid "Email Bounced" @@ -56,24 +43,6 @@ msgstr "" msgid "Events" msgstr "" -#. module: mail_tracking_mass_mailing -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mail_mail__id -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mail_tracking_email__id -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mail_tracking_event__id -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__id -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__id -msgid "ID" -msgstr "" - -#. module: mail_tracking_mass_mailing -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mail_mail____last_update -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mail_tracking_email____last_update -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mail_tracking_event____last_update -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact____last_update -#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace____last_update -msgid "Last Modified on" -msgstr "" - #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mail_tracking_email__mail_id_int msgid "Mail ID" @@ -138,7 +107,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/nb_NO.po b/mail_tracking_mass_mailing/i18n/nb_NO.po index 91e96e227..cabf3ec86 100644 --- a/mail_tracking_mass_mailing/i18n/nb_NO.po +++ b/mail_tracking_mass_mailing/i18n/nb_NO.po @@ -25,7 +25,12 @@ msgid "Country" msgstr "Land" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -108,7 +113,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/nl.po b/mail_tracking_mass_mailing/i18n/nl.po index 6927d271b..cb5f279ba 100644 --- a/mail_tracking_mass_mailing/i18n/nl.po +++ b/mail_tracking_mass_mailing/i18n/nl.po @@ -24,7 +24,12 @@ msgid "Country" msgstr "Land" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -107,7 +112,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/nl_NL.po b/mail_tracking_mass_mailing/i18n/nl_NL.po index 47e80fb2b..31375513a 100644 --- a/mail_tracking_mass_mailing/i18n/nl_NL.po +++ b/mail_tracking_mass_mailing/i18n/nl_NL.po @@ -26,7 +26,12 @@ msgid "Country" msgstr "Land" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -109,7 +114,6 @@ msgstr "Uitgaande Mails" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/pl.po b/mail_tracking_mass_mailing/i18n/pl.po index cc790fe89..bf4f2ccbe 100644 --- a/mail_tracking_mass_mailing/i18n/pl.po +++ b/mail_tracking_mass_mailing/i18n/pl.po @@ -26,7 +26,12 @@ msgid "Country" msgstr "Kraj" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -109,7 +114,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/pt.po b/mail_tracking_mass_mailing/i18n/pt.po index dc4eabc3a..7e4470c34 100644 --- a/mail_tracking_mass_mailing/i18n/pt.po +++ b/mail_tracking_mass_mailing/i18n/pt.po @@ -26,7 +26,12 @@ msgid "Country" msgstr "País" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "Email devolvido" @@ -111,7 +116,6 @@ msgstr "Mensagens a Enviar" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "Eventos de rastreamento" diff --git a/mail_tracking_mass_mailing/i18n/pt_BR.po b/mail_tracking_mass_mailing/i18n/pt_BR.po index 6f1e8a3ae..1ba8e5b9c 100644 --- a/mail_tracking_mass_mailing/i18n/pt_BR.po +++ b/mail_tracking_mass_mailing/i18n/pt_BR.po @@ -25,7 +25,12 @@ msgid "Country" msgstr "País" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -108,7 +113,6 @@ msgstr "Mails de Saída" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/ro.po b/mail_tracking_mass_mailing/i18n/ro.po index f09bb2088..12a5c9e25 100644 --- a/mail_tracking_mass_mailing/i18n/ro.po +++ b/mail_tracking_mass_mailing/i18n/ro.po @@ -25,7 +25,12 @@ msgid "Country" msgstr "Țara" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -108,7 +113,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/ru.po b/mail_tracking_mass_mailing/i18n/ru.po index 6bfd71a30..fe4d8d541 100644 --- a/mail_tracking_mass_mailing/i18n/ru.po +++ b/mail_tracking_mass_mailing/i18n/ru.po @@ -26,7 +26,12 @@ msgid "Country" msgstr "Страна" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -109,7 +114,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/i18n/sl.po b/mail_tracking_mass_mailing/i18n/sl.po index 1c72418a1..f83f63801 100644 --- a/mail_tracking_mass_mailing/i18n/sl.po +++ b/mail_tracking_mass_mailing/i18n/sl.po @@ -26,7 +26,12 @@ msgid "Country" msgstr "Država" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "E-pošta odbita" @@ -111,7 +116,6 @@ msgstr "Izhodna pošta" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "Sledilni dogodki" diff --git a/mail_tracking_mass_mailing/i18n/tr.po b/mail_tracking_mass_mailing/i18n/tr.po index a39e17251..5741c4e8d 100644 --- a/mail_tracking_mass_mailing/i18n/tr.po +++ b/mail_tracking_mass_mailing/i18n/tr.po @@ -24,7 +24,12 @@ msgid "Country" msgstr "Ülke" #. module: mail_tracking_mass_mailing -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.view_mail_mass_mailing_contact_search +#: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_contact__email_bounced +msgid "Email Bounced" +msgstr "" + +#. module: mail_tracking_mass_mailing +#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_contact_view_search msgid "Email bounced" msgstr "" @@ -107,7 +112,6 @@ msgstr "" #. module: mail_tracking_mass_mailing #: model:ir.model.fields,field_description:mail_tracking_mass_mailing.field_mailing_trace__tracking_event_ids -#: model_terms:ir.ui.view,arch_db:mail_tracking_mass_mailing.mailing_trace_view_form msgid "Tracking events" msgstr "" diff --git a/mail_tracking_mass_mailing/models/mail_mail.py b/mail_tracking_mass_mailing/models/mail_mail.py index 03741f16b..a80125f01 100644 --- a/mail_tracking_mass_mailing/models/mail_mail.py +++ b/mail_tracking_mass_mailing/models/mail_mail.py @@ -2,7 +2,7 @@ # Copyright 2017 Tecnativa - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import api, fields, models +from odoo import api, models class MailMail(models.Model): @@ -45,13 +45,12 @@ class MailMail(models.Model): mail_tracking = mail.mailing_trace_ids.mail_tracking_id if mail.mailing_id and mail_tracking.state == "error": mail_failure_type = ( - "RECIPIENT" + "mail_email_invalid" if mail_tracking.error_type == "no_recipient" - else "SMTP" + else "mail_smtp" ) mail.mailing_trace_ids.write( { - "exception": fields.Datetime.now(), "failure_type": mail_failure_type, } ) diff --git a/mail_tracking_mass_mailing/models/mail_tracking_email.py b/mail_tracking_mass_mailing/models/mail_tracking_email.py index 7556cb1c8..1ee0a64a5 100644 --- a/mail_tracking_mass_mailing/models/mail_tracking_email.py +++ b/mail_tracking_mass_mailing/models/mail_tracking_email.py @@ -21,6 +21,14 @@ class MailTrackingEmail(models.Model): """Inherit this method to link other object to mailing.trace""" return {"mail_tracking_id": tracking.id} + @api.depends("mail_stats_id") + def _compute_message_id(self): + """For the mass mailings, the message id is stored in the mailing.trace record.""" + res = super()._compute_message_id() + for tracking in self.filtered("mail_stats_id"): + tracking.message_id = tracking.mail_stats_id.message_id + return res + @api.model def create(self, vals): tracking = super().create(vals) diff --git a/mail_tracking_mass_mailing/models/mail_tracking_event.py b/mail_tracking_mass_mailing/models/mail_tracking_event.py index 026d2e409..b50dbaccb 100644 --- a/mail_tracking_mass_mailing/models/mail_tracking_event.py +++ b/mail_tracking_mass_mailing/models/mail_tracking_event.py @@ -20,12 +20,14 @@ class MailTrackingEvent(models.Model): def process_open(self, 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]) + domain = [("mail_mail_id_int", "=", tracking_email.mail_id_int)] + mail_mail_stats.set_opened(domain=domain) return res def _tracking_set_bounce(self, tracking_email, metadata): mail_mail_stats = self.sudo().env["mailing.trace"] - mail_mail_stats.set_bounced(mail_mail_ids=[tracking_email.mail_id_int]) + domain = [("mail_mail_id_int", "=", tracking_email.mail_id_int)] + mail_mail_stats.set_bounced(domain=domain) @api.model def process_hard_bounce(self, tracking_email, metadata): diff --git a/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst b/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst index 231e175b3..6c8c3b374 100644 --- a/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst +++ b/mail_tracking_mass_mailing/readme/CONTRIBUTORS.rst @@ -6,3 +6,4 @@ * David Vidal * Ernesto Tejeda * Carlos Roca + * Sergio Teruel diff --git a/mail_tracking_mass_mailing/static/description/index.html b/mail_tracking_mass_mailing/static/description/index.html index 2719df10c..3f230f46a 100644 --- a/mail_tracking_mass_mailing/static/description/index.html +++ b/mail_tracking_mass_mailing/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

Links mail statistics objects with mail tracking objects.

Table of contents

@@ -404,7 +404,7 @@ emails again to all the recipients, you must duplicate mass mailing.

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.

@@ -425,6 +425,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • David Vidal
  • Ernesto Tejeda
  • Carlos Roca
    • +
  • Sergio Teruel
    • @@ -436,7 +437,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/mail_tracking_mass_mailing/tests/test_mass_mailing.py b/mail_tracking_mass_mailing/tests/test_mass_mailing.py index 569444bd5..6e29e1604 100644 --- a/mail_tracking_mass_mailing/tests/test_mass_mailing.py +++ b/mail_tracking_mass_mailing/tests/test_mass_mailing.py @@ -35,7 +35,7 @@ class TestMassMailing(TransactionCase): "mailing_domain": "[('list_ids', 'in', %d)]" % self.list.id, "contact_list_ids": [(6, False, [self.list.id])], "body_html": "

    Test email body

    ", - "reply_to_mode": "email", + "reply_to_mode": "new", } ) @@ -54,9 +54,8 @@ class TestMassMailing(TransactionCase): self.assertEqual("error", track.state) self.assertEqual("Warning", track.error_type) self.assertEqual("Mock test error", track.error_description) - self.assertTrue(stat.exception) - self.assertEqual(stat.state, "exception") - self.assertEqual(stat.failure_type, "SMTP") + self.assertEqual(stat.trace_status, "outgoing") + self.assertEqual(stat.failure_type, "mail_smtp") self.assertTrue(self.contact_a.email_bounced) def test_tracking_email_link(self): @@ -79,7 +78,7 @@ class TestMassMailing(TransactionCase): "ua_family": "odoo", } tracking_email.event_create("open", metadata) - self.assertTrue(stat.opened) + self.assertEqual(stat.trace_status, "open") def _tracking_email_bounce(self, event_type, state): self.mailing.action_send_mail() @@ -95,7 +94,7 @@ class TestMassMailing(TransactionCase): "bounce_description": "Unable to connect to MX servers", } tracking_email.event_create(event_type, metadata) - self.assertTrue(stat.bounced) + self.assertEqual(stat.trace_status, "bounce") def test_tracking_email_hard_bounce(self): self._tracking_email_bounce("hard_bounce", "bounced") diff --git a/mail_tracking_mass_mailing/views/mail_trace_view.xml b/mail_tracking_mass_mailing/views/mail_trace_view.xml index b210a6b5c..2b0f431d7 100644 --- a/mail_tracking_mass_mailing/views/mail_trace_view.xml +++ b/mail_tracking_mass_mailing/views/mail_trace_view.xml @@ -17,8 +17,10 @@