From 73a7dc58d1783e79c109905e1e5209b33c2853fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 17 Mar 2014 17:56:49 +0100
Subject: [IMP] mass_mailing: improved campaign management in mass mailing
 wizard - campaign appear only when having the group activated - now choosing
 the mailing name, that create the mailing list + campaign - currently limited
 to the valid models

bzr revid: tde@openerp.com-20140317165649-321f0wxatvj4pz5w
---
 addons/mass_mailing/wizard/mail_compose_message_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/mass_mailing/wizard/mail_compose_message_view.xml')

diff --git a/addons/mass_mailing/wizard/mail_compose_message_view.xml b/addons/mass_mailing/wizard/mail_compose_message_view.xml
index f5dbf57a808..c609d433b30 100644
--- a/addons/mass_mailing/wizard/mail_compose_message_view.xml
+++ b/addons/mass_mailing/wizard/mail_compose_message_view.xml
@@ -9,8 +9,9 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='notify']" position="after">
-                    <field name="mass_mailing_campaign_id"
+                    <field name="mass_mailing_campaign_id" groups="mass_mailing.group_mass_mailing_campaign"
                         attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')]}"/>
+                    <field name="mass_mailing_name"/>
                 </xpath>
             </field>
         </record>
-- 
cgit v1.2.3


From 3752e2248137b98ac9f84c0fa19539169e1cff56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 24 Mar 2014 15:00:51 +0100
Subject: [FIX] mail.compose.message: display mass mailing data only in mass
 mailing mode

bzr revid: tde@openerp.com-20140324140051-ijza7tn0w2ljgs4j
---
 addons/mass_mailing/wizard/mail_compose_message_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/mass_mailing/wizard/mail_compose_message_view.xml')

diff --git a/addons/mass_mailing/wizard/mail_compose_message_view.xml b/addons/mass_mailing/wizard/mail_compose_message_view.xml
index c609d433b30..61cfe823006 100644
--- a/addons/mass_mailing/wizard/mail_compose_message_view.xml
+++ b/addons/mass_mailing/wizard/mail_compose_message_view.xml
@@ -11,7 +11,8 @@
                 <xpath expr="//field[@name='notify']" position="after">
                     <field name="mass_mailing_campaign_id" groups="mass_mailing.group_mass_mailing_campaign"
                         attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')]}"/>
-                    <field name="mass_mailing_name"/>
+                    <field name="mass_mailing_name"
+                        attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')]}"/>
                 </xpath>
             </field>
         </record>
-- 
cgit v1.2.3