From 8453b7fb90b375c255c5fd6294a9b50fdb823256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Debauche=20St=C3=A9phane?= <std@odoo.com>
Date: Wed, 13 Nov 2019 13:43:47 +0000
Subject: [PATCH] [IMP]: mass_mailing: improve some views

- In the campaign form view, when you click on "SMS", the filter has changed
  ``My Mailing`` -> ``My SMS Marketing``
- In the campaign form view,  display the Mail/SMS subject instead of the SMS name
- In UTM, move the campaign from the data to the demo data

Task #2082296

closes odoo/odoo#40205

Related: odoo/enterprise#6685
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 .../mass_mailing/views/utm_campaign_views.xml |  2 +-
 addons/mass_mailing_sms/models/utm.py         |  2 +-
 .../views/utm_campaign_views.xml              |  2 +-
 addons/utm/__manifest__.py                    |  4 ++-
 addons/utm/data/utm_data.xml                  | 22 ----------------
 addons/utm/data/utm_demo.xml                  | 26 +++++++++++++++++++
 6 files changed, 32 insertions(+), 26 deletions(-)
 create mode 100644 addons/utm/data/utm_demo.xml

diff --git a/addons/mass_mailing/views/utm_campaign_views.xml b/addons/mass_mailing/views/utm_campaign_views.xml
index 940120e14bd..7459a0822ad 100644
--- a/addons/mass_mailing/views/utm_campaign_views.xml
+++ b/addons/mass_mailing/views/utm_campaign_views.xml
@@ -19,7 +19,7 @@
                 <page string="Mailings" attrs="{'invisible': [('mailing_mail_count', '=', 0)]}">
                     <field name="mailing_mail_ids" readonly="1" nolabel="1">
                         <tree>
-                            <field name="name"/>
+                            <field name="subject"/>
                             <field name="sent_date"/>
                             <field name="state"/>
                             <field name="delivered"/>
diff --git a/addons/mass_mailing_sms/models/utm.py b/addons/mass_mailing_sms/models/utm.py
index e75335ea1ea..2117a21c5f6 100644
--- a/addons/mass_mailing_sms/models/utm.py
+++ b/addons/mass_mailing_sms/models/utm.py
@@ -30,7 +30,7 @@ class UtmCampaign(models.Model):
         return action
 
     def action_redirect_to_mailing_sms(self):
-        action = self.env.ref('mass_mailing.action_view_mass_mailings_from_campaign').read()[0]
+        action = self.env.ref('mass_mailing_sms.mailing_mailing_action_sms').read()[0]
         action['context'] = {
             'default_campaign_id': self.id,
             'default_mailing_type': 'sms',
diff --git a/addons/mass_mailing_sms/views/utm_campaign_views.xml b/addons/mass_mailing_sms/views/utm_campaign_views.xml
index 4a9f1eb5768..8b9668f5f3b 100644
--- a/addons/mass_mailing_sms/views/utm_campaign_views.xml
+++ b/addons/mass_mailing_sms/views/utm_campaign_views.xml
@@ -22,7 +22,7 @@
                     <group>
                         <field name="mailing_sms_ids" readonly="1" nolabel="1">
                             <tree>
-                                <field name="name"/>
+                                <field name="subject"/>
                                 <field name="sent_date"/>
                                 <field name="state"/>
                                 <field name="bounced"/>
diff --git a/addons/utm/__manifest__.py b/addons/utm/__manifest__.py
index ca7e9f9707e..e4174107018 100644
--- a/addons/utm/__manifest__.py
+++ b/addons/utm/__manifest__.py
@@ -16,6 +16,8 @@ Enable management of UTM trackers: campaign, medium, source.
         'views/utm_views.xml',
         'security/ir.model.access.csv',
     ],
-    'demo': [],
+    'demo': [
+        'data/utm_demo.xml',
+    ],
     'auto_install': False,
 }
diff --git a/addons/utm/data/utm_data.xml b/addons/utm/data/utm_data.xml
index 1f63451a71c..0b9a5fb62d7 100644
--- a/addons/utm/data/utm_data.xml
+++ b/addons/utm/data/utm_data.xml
@@ -18,28 +18,6 @@
             <field name="sequence">30</field>
         </record>
 
-        <!-- UTM Campain -->
-        <record model="utm.campaign" id="utm_campaign_fall_drive">
-            <field name="name">Sale</field>
-            <field name="stage_id" ref="utm.default_utm_stage"/>
-            <field name="is_website" eval="True"/>
-        </record>
-        <record model="utm.campaign" id="utm_campaign_christmas_special">
-            <field name="name">Christmas Special</field>
-            <field name="stage_id" ref="utm.default_utm_stage"/>
-            <field name="is_website" eval="True"/>
-        </record>
-        <record model="utm.campaign" id="utm_campaign_email_campaign_services">
-            <field name="name">Email Campaign - Services</field>
-            <field name="stage_id" ref="utm.default_utm_stage"/>
-            <field name="is_website" eval="True"/>
-        </record>
-        <record model="utm.campaign" id="utm_campaign_email_campaign_products">
-            <field name="name">Email Campaign - Products</field>
-            <field name="stage_id" ref="utm.default_utm_stage"/>
-            <field name="is_website" eval="True"/>
-        </record>
-
         <!-- UTM Source -->
         <record model="utm.source" id="utm_source_search_engine">
             <field name="name">Search engine</field>
diff --git a/addons/utm/data/utm_demo.xml b/addons/utm/data/utm_demo.xml
new file mode 100644
index 00000000000..e4e44578fe0
--- /dev/null
+++ b/addons/utm/data/utm_demo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<odoo>
+<data>
+    <!-- UTM Campaigns -->
+    <record model="utm.campaign" id="utm_campaign_fall_drive">
+        <field name="name">Sale</field>
+        <field name="stage_id" ref="utm.default_utm_stage"/>
+        <field name="is_website" eval="True"/>
+    </record>
+    <record model="utm.campaign" id="utm_campaign_christmas_special">
+        <field name="name">Christmas Special</field>
+        <field name="stage_id" ref="utm.default_utm_stage"/>
+        <field name="is_website" eval="True"/>
+    </record>
+    <record model="utm.campaign" id="utm_campaign_email_campaign_services">
+        <field name="name">Email Campaign - Services</field>
+        <field name="stage_id" ref="utm.default_utm_stage"/>
+        <field name="is_website" eval="True"/>
+    </record>
+    <record model="utm.campaign" id="utm_campaign_email_campaign_products">
+        <field name="name">Email Campaign - Products</field>
+        <field name="stage_id" ref="utm.default_utm_stage"/>
+        <field name="is_website" eval="True"/>
+    </record>
+</data>
+</odoo>