diff options
| author | Yannick Tivisse <yti@odoo.com> | 2017-09-13 15:18:12 +0200 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2017-09-15 15:56:23 +0200 |
| commit | 51b5ee7c3c1bbc08c5aa284300fd95f63cbf7ad1 (patch) | |
| tree | 20e8d4393155038da314b6071ec04bb43af60b74 /addons/mass_mailing/data | |
| parent | e9fca14452273be1807d3b47f6220f563c343481 (diff) | |
[IMP] mass_mailing: choose model among all chatter models
This commit removes the strange selection box based on a magic flag and
some strange methods returning a string. Instead just allow to send mass
mailing on all models inheriting from mail.thread using the is mail
thread flag.
Various addons are updated to remove the _mail_mass_mailing class
attribute used to determine mass mailing capability.
We consider people could send a mass mailing on every model inheriting
from mail.thread. It makes no sense to limit it to a given set of addons.
Diffstat (limited to 'addons/mass_mailing/data')
| -rw-r--r-- | addons/mass_mailing/data/mass_mailing_demo.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index 0afa9973dd0..347a04deaf1 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -64,7 +64,7 @@ <field name="state">done</field> <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/> <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/> - <field name="mailing_model">res.partner</field> + <field name="mailing_model_id" ref="base.model_res_partner"/> <field name="mailing_domain">[('customer', '=', True)]</field> <field name="reply_to_mode">email</field> <field name="reply_to"><![CDATA[Info <info@yourcompany.example.com>]]></field> @@ -77,7 +77,7 @@ <field name="name">Second Newsletter</field> <field name="state">draft</field> <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/> - <field name="mailing_model">res.partner</field> + <field name="mailing_model_id" ref="base.model_res_partner"/> <field name="mailing_domain">[('customer', '=', True)]</field> <field name="reply_to_mode">email</field> <field name="reply_to"><![CDATA[Info <info@yourcompany.example.com>]]></field> |