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: [PATCH 1/5] [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(-)

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"

From eb722dc25a21ea3f94ed5b586ef059628977bf51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Dec 2013 14:39:34 +0100
Subject: [PATCH 2/5] [FIX] mass_mailing: fixed model used for the mass mailing
 itself when creating a new wave. It was receiving active_model aka
 mass.mailing.create instead of the correct target model (ex res.partner when
 mailing partners). Also updated a field string to be clearer.

bzr revid: tde@openerp.com-20131210133934-xtydu43fkh7htxdg
---
 addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
index 9ea0d8aa1c5..4359d6c3e7b 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
@@ -36,7 +36,7 @@ class MailMassMailingCreate(osv.TransientModel):
             required=True,
         ),
         'model_id': fields.many2one(
-            'ir.model', 'Document',
+            'ir.model', 'Document Type',
             required=True,
             help='Document on which the mass mailing will run. This must be a '
                  'valid OpenERP model.',
@@ -116,6 +116,7 @@ class MailMassMailingCreate(osv.TransientModel):
             'default_template_id': wizard.template_id.id,
             'default_use_mass_mailing_campaign': True,
             'default_use_active_domain': True,
+            'default_model': wizard.model_id.model,
             'default_active_domain': wizard.domain,
             'default_mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id,
             'default_mass_mailing_id': wizard.mass_mailing_id.id,

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: [PATCH 3/5] [FIX] mass_mailing: wave creation wizard: fixed closing
 button jumping after setting the wave name

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

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>

From 989a0d78902885b8faa73f3ddbf72e43c8655f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Dec 2013 15:17:04 +0100
Subject: [PATCH 4/5] [IMP] mass_mailing: added a link to create a wave
 directly from the kanban view

bzr revid: tde@openerp.com-20131210141704-u9t6zlfypmi1wba3
---
 addons/mass_mailing/mass_mailing_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index f0c27f42a4a..c9594179a72 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -252,6 +252,9 @@
                                         <t t-if="widget.view.is_action_enabled('edit')">
                                             <li><a type="edit">Settings</a></li>
                                         </t>
+                                        <t t-if="widget.view.is_action_enabled('edit')">
+                                            <li><a name="%(action_mail_mass_mailing_create)d" type="action">New Wave</a></li>
+                                        </t>
                                         <t t-if="widget.view.is_action_enabled('delete')">
                                             <li><a type="delete">Delete</a></li>
                                         </t>

From 19eeff611edf6800263b12a659205409cadfdd2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Dec 2013 15:45:03 +0100
Subject: [PATCH 5/5] [FIX] mass_mailing: fixed previous fixes, because of
 order of loaded files

bzr revid: tde@openerp.com-20131210144503-ftg1y7xvs7smh269
---
 addons/mass_mailing/__openerp__.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index db7ac54263a..92f8b1fc3e8 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -21,7 +21,11 @@
 
 {
     'name': 'Mass Mailing Campaigns',
-    'description': """TODO""",
+    'description': """
+Easily send mass mailing to your leads, opportunities or customers. Track
+marketing campaigns performance to improve conversion rates. Design
+professional emails and reuse templates in a few clicks.
+    """,
     'version': '1.0',
     'author': 'OpenERP',
     'website': 'http://www.openerp.com',
@@ -34,9 +38,9 @@
     ],
     'data': [
         'mail_data.xml',
-        'mass_mailing_view.xml',
         'wizard/mail_compose_message_view.xml',
         'wizard/mail_mass_mailing_create_segment.xml',
+        'mass_mailing_view.xml',
         'security/ir.model.access.csv',
     ],
     'js': [