diff --git a/addons/mass_mailing/tests/test_mailing_list.py b/addons/mass_mailing/tests/test_mailing_list.py index 0630e8cb3ec..58c7f4f31c0 100644 --- a/addons/mass_mailing/tests/test_mailing_list.py +++ b/addons/mass_mailing/tests/test_mailing_list.py @@ -243,6 +243,7 @@ class TestMailingContactImport(MassMailCommon): # Test that the context key "default_list_ids" is ignored (because we manually set list_ids) contact_import.with_context(default_list_ids=(first_list | second_list).ids).action_import() + self.env['mailing.list'].invalidate_model(['contact_ids']) # Check the contact of the first mailing list contacts = [ (contact.name, contact.email) diff --git a/addons/mass_mailing/views/mailing_contact_views.xml b/addons/mass_mailing/views/mailing_contact_views.xml index addad64f748..95b2dbf2b14 100644 --- a/addons/mass_mailing/views/mailing_contact_views.xml +++ b/addons/mass_mailing/views/mailing_contact_views.xml @@ -150,6 +150,7 @@ + diff --git a/addons/mass_mailing/views/mailing_subscription_views.xml b/addons/mass_mailing/views/mailing_subscription_views.xml index 9c58dcf6b2f..a5dac064f5a 100644 --- a/addons/mass_mailing/views/mailing_subscription_views.xml +++ b/addons/mass_mailing/views/mailing_subscription_views.xml @@ -16,6 +16,7 @@ aria-label="Blacklisted" invisible="not is_blacklisted" groups="base.group_user"> + @@ -32,6 +33,7 @@ + diff --git a/addons/mass_mailing/wizard/mailing_contact_import.py b/addons/mass_mailing/wizard/mailing_contact_import.py index 33693f4fbda..182b7fa56a8 100644 --- a/addons/mass_mailing/wizard/mailing_contact_import.py +++ b/addons/mass_mailing/wizard/mailing_contact_import.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import fields, models, tools, _ +from odoo import fields, models, tools, Command, _ from odoo.tools.misc import clean_context @@ -63,7 +63,10 @@ class MailingContactImport(models.TransientModel): if email not in existing_contacts: unique_contacts[email] = { 'name': name, - 'list_ids': self.mailing_list_ids.ids, + 'subscription_ids': [ + Command.create({'list_id': mailing_list_id.id}) + for mailing_list_id in self.mailing_list_ids + ], } if not unique_contacts: