From 55af66dcda83641c9de84db7befecbadb71c2eee Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 17 Oct 2017 10:23:57 +0200 Subject: [PATCH] [FIX] mass_mailing: redefine the usable models in mass mailing Displaying all the model is not readable for a common user. We should only display models that are fit to be used in a mass mailing campaign. --- addons/mass_mailing/models/mass_mailing.py | 12 +++++++++++- addons/mass_mailing/views/mass_mailing_views.xml | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py index ca2e739c35c..2f3666efc77 100644 --- a/addons/mass_mailing/models/mass_mailing.py +++ b/addons/mass_mailing/models/mass_mailing.py @@ -15,6 +15,16 @@ from odoo.tools.translate import html_translate _logger = logging.getLogger(__name__) +MASS_MAILING_BUSINESS_MODELS = [ + 'crm.lead', + 'event.registration', + 'hr.applicant', + 'res.partner', + 'event.track', + 'sale.order', + 'mail.mass_mailing.list', +] + class MassMailingTag(models.Model): """Model of categories of mass mailing, i.e. marketing, newsletter, ... """ _name = 'mail.mass_mailing.tag' @@ -320,7 +330,7 @@ class MassMailing(models.Model): default=lambda self: self.env['mail.message']._get_default_from()) # recipients mailing_model_real = fields.Char(compute='_compute_model', string='Recipients Real Model', default='mail.mass_mailing.contact', required=True) - mailing_model_id = fields.Many2one('ir.model', string='Recipients Model', domain="[('is_mail_thread', '=', True)]", + mailing_model_id = fields.Many2one('ir.model', string='Recipients Model', domain=[('model', 'in', MASS_MAILING_BUSINESS_MODELS)], default=lambda self: self.env.ref('mass_mailing.model_mail_mass_mailing_list').id) mailing_model_name = fields.Char(related='mailing_model_id.model', string='Recipients Model Name') mailing_domain = fields.Char(string='Domain', oldname='domain', default=[]) diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml index 076a6da0921..9cc4b63c97a 100644 --- a/addons/mass_mailing/views/mass_mailing_views.xml +++ b/addons/mass_mailing/views/mass_mailing_views.xml @@ -415,7 +415,7 @@