From 75548727ec2d676d1a64e2ce6567b097a17cc0e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Dec 2013 14:38:30 +0100
Subject: [FIX] mass_mailing: fixed label for template choice when creating a
 new wave of mass mailing

bzr revid: tde@openerp.com-20131210133830-rhm6t1unz6urrxxj
---
 addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
index e307bdd8909..d320520cbd2 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
@@ -42,7 +42,7 @@
                             </p>
                         </div>
 
-                        <label for="model_id"/>
+                        <label for="template_id"/>
                         <div>
                             <field name="template_id"/>
                             <p class="oe_grey"
-- 
cgit v1.2.3


From 7f7e698febb7813bbd38bab6920fd0f12ced5ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Dec 2013 15:16:46 +0100
Subject: [FIX] mass_mailing: wave creation wizard: fixed closing button
 jumping after setting the wave name

bzr revid: tde@openerp.com-20131210141646-17y49b7xvckepogz
---
 addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
index d320520cbd2..ac313dea78b 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
@@ -55,8 +55,7 @@
                         <label for="name"/>
                         <div>
                             <field name="name"/>
-                            <p class="oe_grey"
-                                attrs="{'invisible': [('name', '!=', False)]}">
+                            <p class="oe_grey">
                                 Please choose the name of the mailing.
                             </p>
                         </div>
-- 
cgit v1.2.3


From 40994c2966cd9f77fa45d396f1004aaf5d4c90e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Dec 2013 10:57:29 +0100
Subject: [FIX] mass_mailing: when creating a new wave from the mass mailing
 campaign kanban view, add the campaign in default

bzr revid: tde@openerp.com-20131219095729-k5tsvmkqm2mdsnza
---
 addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
index ac313dea78b..b2b48fb8618 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
@@ -75,6 +75,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+            <field name="context">{'default_mass_mailing_campaign_id': active_id}</field>
         </record>
 
     </data>
-- 
cgit v1.2.3