From 69b3b4bcd64fe67940748afb1cb9d8572c97878d Mon Sep 17 00:00:00 2001
From: laa <laa@odoo.com>
Date: Tue, 17 Sep 2019 12:01:11 +0000
Subject: [PATCH] [FIX] mass_mailing:  edit text content and transform the form
 tag view

- correct some errors in the text field
- transform the utm.tag.view.form view to utm.tag.view.tree view to allow direct tag editing

closes odoo/odoo#37008

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 .../mass_mailing/views/mailing_mailing_views.xml   |  2 +-
 addons/mass_mailing_crm/data/mass_mailing_demo.xml |  2 +-
 addons/utm/views/utm_campaign_views.xml            | 14 +++++---------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/mass_mailing/views/mailing_mailing_views.xml b/addons/mass_mailing/views/mailing_mailing_views.xml
index 6f5ac26adde..e82e4e85c44 100644
--- a/addons/mass_mailing/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing/views/mailing_mailing_views.xml
@@ -88,7 +88,7 @@
                     </div>
                     <div class="alert alert-info text-center" attrs="{'invisible': [('state', '!=', 'in_queue')]}" role="alert">
                         <strong>
-                            <span name="next_departure_text">This mailing is scheduled for</span>
+                            <span name="next_departure_text">This mailing is scheduled for </span>
                             <field name="next_departure" class="oe_inline"/>.
                         </strong>
                     </div>
diff --git a/addons/mass_mailing_crm/data/mass_mailing_demo.xml b/addons/mass_mailing_crm/data/mass_mailing_demo.xml
index 8e7eac4f6d0..1aaa7521084 100644
--- a/addons/mass_mailing_crm/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing_crm/data/mass_mailing_demo.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
     <record id="mass_mail_lead_0" model="mailing.mailing">
         <field name="name">Lead Recall</field>
-        <field name="subject">We want to hear form you !</field>
+        <field name="subject">We want to hear from you !</field>
         <field name="state">in_queue</field>
         <field name="user_id" ref="base.user_admin"/>
         <field name="schedule_date" eval="(DateTime.today() + relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
diff --git a/addons/utm/views/utm_campaign_views.xml b/addons/utm/views/utm_campaign_views.xml
index 4be411b3ef3..0d91a978c21 100644
--- a/addons/utm/views/utm_campaign_views.xml
+++ b/addons/utm/views/utm_campaign_views.xml
@@ -100,17 +100,13 @@
     </record>
 
     <!--  CAMPAIGN TAGS !-->
-    <record id="utm_tag_view_form" model="ir.ui.view">
-        <field name="name">utm.tag.view.form</field>
+    <record id="utm_tag_view_tree" model="ir.ui.view">
+        <field name="name">utm.tag.view.tree</field>
         <field name="model">utm.tag</field>
         <field name="arch" type="xml">
-            <form string="Campaign Tags">
-                <sheet>
-                    <group>
-                        <field name="name"/>
-                    </group>
-                </sheet>
-            </form>
+            <tree string="Campaign Tags" editable="top">
+                <field name="name"/>
+            </tree>
         </field>
     </record>