diff options
| author | Thibault Delavallée <tde@odoo.com> | 2017-04-12 11:51:09 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2017-04-18 14:37:38 +0200 |
| commit | dce1a52b8b620b49acb784cefc798f225aae0885 (patch) | |
| tree | fce523c924826a2cf56638f1acc0c20bbdd350e0 /addons | |
| parent | 05a33052747da7767fb6c3db160126d37520381a (diff) | |
[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.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mass_mailing/models/mass_mailing.py | 4 |
1 files changed, 1 insertions, 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" #------------------------------------------------------ |