From 60b079cc6c7af8711435071172099d7e8f49c7db Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 18 Mar 2020 07:29:18 -0700 Subject: [PATCH] [FIX] mass_mailing_partner: Unsubscribe should not unlink the subscription. Before, on the backend if you check the `opt_out` checkbox and saving on a `mailing.contact`, the entire row (`mailing.contact.subscription`) would be unlinked. Combined with `mass_mailing_list_dynamic` this means the contact would just be re-subscribed over and over. After, check `opt_out` will fill `unsubscription_date` and the row will stay. Tests in `mass_mailing_list_dynamic` pass. --- mass_mailing_partner/README.rst | 2 ++ mass_mailing_partner/__manifest__.py | 2 +- mass_mailing_partner/i18n/ca.po | 1 - mass_mailing_partner/i18n/de.po | 1 - mass_mailing_partner/i18n/es.po | 1 - mass_mailing_partner/i18n/fr.po | 1 - mass_mailing_partner/i18n/hr.po | 1 - mass_mailing_partner/i18n/it.po | 1 - mass_mailing_partner/i18n/pt.po | 1 - mass_mailing_partner/i18n/sl.po | 1 - mass_mailing_partner/models/mailing_contact.py | 9 +++++---- mass_mailing_partner/readme/CONTRIBUTORS.rst | 2 ++ mass_mailing_partner/static/description/index.html | 2 ++ 13 files changed, 12 insertions(+), 13 deletions(-) diff --git a/mass_mailing_partner/README.rst b/mass_mailing_partner/README.rst index 0eb1d089a..80e325874 100644 --- a/mass_mailing_partner/README.rst +++ b/mass_mailing_partner/README.rst @@ -88,6 +88,8 @@ Contributors * Victor M.M. Torres * Manuel Calero +* `Hibou Corp. `_ + Maintainers ~~~~~~~~~~~ diff --git a/mass_mailing_partner/__manifest__.py b/mass_mailing_partner/__manifest__.py index dcbac1bfb..205fe6b57 100644 --- a/mass_mailing_partner/__manifest__.py +++ b/mass_mailing_partner/__manifest__.py @@ -6,7 +6,7 @@ { "name": "Link partners with mass-mailing", - "version": "13.0.1.0.0", + "version": "13.0.1.0.1", "author": "Tecnativa, " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/social", "license": "AGPL-3", diff --git a/mass_mailing_partner/i18n/ca.po b/mass_mailing_partner/i18n/ca.po index 97aa8e1f2..2f1fbb61f 100644 --- a/mass_mailing_partner/i18n/ca.po +++ b/mass_mailing_partner/i18n/ca.po @@ -102,7 +102,6 @@ msgstr "Llista d'enviament" #. module: mass_mailing_partner #: model:ir.model,name:mass_mailing_partner.model_mailing_trace #, fuzzy -#| msgid "Email Statistics" msgid "Mailing Statistics" msgstr "Estadístiques de correu electrònic" diff --git a/mass_mailing_partner/i18n/de.po b/mass_mailing_partner/i18n/de.po index 84e03ccc5..6dfbfeccf 100644 --- a/mass_mailing_partner/i18n/de.po +++ b/mass_mailing_partner/i18n/de.po @@ -102,7 +102,6 @@ msgstr "Mailingliste" #. module: mass_mailing_partner #: model:ir.model,name:mass_mailing_partner.model_mailing_trace #, fuzzy -#| msgid "Email Statistics" msgid "Mailing Statistics" msgstr "Email-Statistiken" diff --git a/mass_mailing_partner/i18n/es.po b/mass_mailing_partner/i18n/es.po index b54f0d787..7ac2d1425 100644 --- a/mass_mailing_partner/i18n/es.po +++ b/mass_mailing_partner/i18n/es.po @@ -103,7 +103,6 @@ msgstr "Lista de correo" #. module: mass_mailing_partner #: model:ir.model,name:mass_mailing_partner.model_mailing_trace #, fuzzy -#| msgid "Email Statistics" msgid "Mailing Statistics" msgstr "Estadísticas de email" diff --git a/mass_mailing_partner/i18n/fr.po b/mass_mailing_partner/i18n/fr.po index c33879008..aa9ed43ab 100644 --- a/mass_mailing_partner/i18n/fr.po +++ b/mass_mailing_partner/i18n/fr.po @@ -102,7 +102,6 @@ msgstr "Liste de diffusion" #. module: mass_mailing_partner #: model:ir.model,name:mass_mailing_partner.model_mailing_trace #, fuzzy -#| msgid "Email Statistics" msgid "Mailing Statistics" msgstr "Statistiques de courriel" diff --git a/mass_mailing_partner/i18n/hr.po b/mass_mailing_partner/i18n/hr.po index 4e317dbe1..6a2fd3a71 100644 --- a/mass_mailing_partner/i18n/hr.po +++ b/mass_mailing_partner/i18n/hr.po @@ -103,7 +103,6 @@ msgstr "Mailing lista" #. module: mass_mailing_partner #: model:ir.model,name:mass_mailing_partner.model_mailing_trace #, fuzzy -#| msgid "Email Statistics" msgid "Mailing Statistics" msgstr "Statistika e-maila" diff --git a/mass_mailing_partner/i18n/it.po b/mass_mailing_partner/i18n/it.po index a3bb9e90e..c8aa45774 100644 --- a/mass_mailing_partner/i18n/it.po +++ b/mass_mailing_partner/i18n/it.po @@ -102,7 +102,6 @@ msgstr "Mailing List" #. module: mass_mailing_partner #: model:ir.model,name:mass_mailing_partner.model_mailing_trace #, fuzzy -#| msgid "Mailing List" msgid "Mailing Statistics" msgstr "Mailing List" diff --git a/mass_mailing_partner/i18n/pt.po b/mass_mailing_partner/i18n/pt.po index 261e8ba4b..ebb662179 100644 --- a/mass_mailing_partner/i18n/pt.po +++ b/mass_mailing_partner/i18n/pt.po @@ -103,7 +103,6 @@ msgstr "" #. module: mass_mailing_partner #: model:ir.model,name:mass_mailing_partner.model_mailing_trace #, fuzzy -#| msgid "Email Statistics" msgid "Mailing Statistics" msgstr "Estatísticas de Email" diff --git a/mass_mailing_partner/i18n/sl.po b/mass_mailing_partner/i18n/sl.po index 28ba4cbea..9a213a0c5 100644 --- a/mass_mailing_partner/i18n/sl.po +++ b/mass_mailing_partner/i18n/sl.po @@ -103,7 +103,6 @@ msgstr "Poštni seznam" #. module: mass_mailing_partner #: model:ir.model,name:mass_mailing_partner.model_mailing_trace #, fuzzy -#| msgid "Email Statistics" msgid "Mailing Statistics" msgstr "Statistika e-pošte" diff --git a/mass_mailing_partner/models/mailing_contact.py b/mass_mailing_partner/models/mailing_contact.py index ce3af7ee2..f4431305d 100644 --- a/mass_mailing_partner/models/mailing_contact.py +++ b/mass_mailing_partner/models/mailing_contact.py @@ -3,6 +3,7 @@ # Copyright 2015 Javier Iniesta # Copyright 2017 David Vidal # Copyright 2020 Tecnativa - Manuel Calero +# Copyright 2020 Hibou Corp. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import _, api, fields, models @@ -51,8 +52,8 @@ class MailingContact(models.Model): record._onchange_partner_mass_mailing_partner() new_vals = record._convert_to_write(record._cache) new_vals.update( - subscription_list_ids=vals.get("subscription_list_ids", False), - list_ids=vals.get("list_ids", False), + subscription_list_ids=vals.get("subscription_list_ids", []), + list_ids=vals.get("list_ids", []), ) return super(MailingContact, self).create(new_vals) @@ -65,8 +66,8 @@ class MailingContact(models.Model): record._onchange_partner_mass_mailing_partner() new_vals = record._convert_to_write(record._cache) new_vals.update( - subscription_list_ids=vals.get("subscription_list_ids", False), - list_ids=vals.get("list_ids", False), + subscription_list_ids=vals.get("subscription_list_ids", []), + list_ids=vals.get("list_ids", []), ) super(MailingContact, contact).write(new_vals) return True diff --git a/mass_mailing_partner/readme/CONTRIBUTORS.rst b/mass_mailing_partner/readme/CONTRIBUTORS.rst index ab4be7126..afeba4fdf 100644 --- a/mass_mailing_partner/readme/CONTRIBUTORS.rst +++ b/mass_mailing_partner/readme/CONTRIBUTORS.rst @@ -9,3 +9,5 @@ * Ernesto Tejeda * Victor M.M. Torres * Manuel Calero + +* `Hibou Corp. `_ diff --git a/mass_mailing_partner/static/description/index.html b/mass_mailing_partner/static/description/index.html index 37d8fc419..fc6dd31be 100644 --- a/mass_mailing_partner/static/description/index.html +++ b/mass_mailing_partner/static/description/index.html @@ -435,6 +435,8 @@ If you spotted it first, help us smashing it by providing a detailed and welcome +

  • Hibou Corp.

    +