From dce1a52b8b620b49acb784cefc798f225aae0885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 12 Apr 2017 11:51:09 +0200 Subject: [PATCH] [FIX] mass_mailing: do not reset mailing_domain when changing model Indeed due to onchange being trigerred at creation it breaks trying to set default_mailing_domain when creating a new mailing through the web client. As setting domain and then changing model should not be the primary use case of mass mailing, people will have to update their domain manually instead of seeing it reset to a void domain. --- addons/mass_mailing/models/mass_mailing.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py index 86ded7246b9..df633272835 100644 --- a/addons/mass_mailing/models/mass_mailing.py +++ b/addons/mass_mailing/models/mass_mailing.py @@ -459,10 +459,8 @@ class MassMailing(models.Model): self.mailing_domain = "[('list_ids', 'in', [%s]), ('opt_out', '=', False)]" % (','.join(map(str,self.contact_list_ids.ids)),) else: self.mailing_domain = "[(0, '=', 1)]" - elif 'opt_out' in self.env[self.mailing_model]._fields: + elif 'opt_out' in self.env[self.mailing_model]._fields and not self.mailing_domain: self.mailing_domain = "[('opt_out', '=', False)]" - else: - self.mailing_domain = [] self.body_html = "on_change_model_and_list" #------------------------------------------------------