3 files changed, 17 insertions, 12 deletions
diff --git a/addons/website_mass_mailing/models/__init__.py b/addons/website_mass_mailing/models/__init__.py
index ecf18af5dd6..e8ef8b35d78 100644
--- a/addons/website_mass_mailing/models/__init__.py
+++ b/addons/website_mass_mailing/models/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import mass_mailing_list
+from . import mailing_list
+from . import website_mass_mailing
diff --git a/addons/website_mass_mailing/models/mailing_list.py b/addons/website_mass_mailing/models/mailing_list.py
new file mode 100644
index 00000000000..0857563a814
--- /dev/null
+++ b/addons/website_mass_mailing/models/mailing_list.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class MailingList(models.Model):
+    _inherit = 'mailing.list'
+
+    def _default_toast_content(self):
+        return '<p>Thanks for subscribing!</p>'
+
+    website_popup_ids = fields.One2many('website.mass_mailing.popup', 'mailing_list_id', string="Website Popups")
+    toast_content = fields.Html(default=_default_toast_content, translate=True)
diff --git a/addons/website_mass_mailing/models/mass_mailing_list.py b/addons/website_mass_mailing/models/website_mass_mailing.py
index a10344ecddb..fdad7c16bc2 100644
--- a/addons/website_mass_mailing/models/mass_mailing_list.py
+++ b/addons/website_mass_mailing/models/website_mass_mailing.py
@@ -4,16 +4,6 @@
 from odoo import fields, models
 
 
-class MassMailingList(models.Model):
-    _inherit = 'mail.mass_mailing.list'
-
-    def _default_toast_content(self):
-        return '<p>Thanks for subscribing!</p>'
-
-    website_popup_ids = fields.One2many('website.mass_mailing.popup', 'mailing_list_id', string="Website Popups")
-    toast_content = fields.Html(default=_default_toast_content, translate=True)
-
-
 class MassMailingPopup(models.Model):
     _name = 'website.mass_mailing.popup'
     _description = "Mailing list popup"
@@ -21,6 +11,6 @@ class MassMailingPopup(models.Model):
     def _default_popup_content(self):
         return self.env['ir.ui.view'].render_template('website_mass_mailing.s_newsletter_block')
 
-    mailing_list_id = fields.Many2one('mail.mass_mailing.list')
+    mailing_list_id = fields.Many2one('mailing.list')
     website_id = fields.Many2one('website')
     popup_content = fields.Html(string="Website Popup Content", default=_default_popup_content, translate=True, sanitize=False)