From 02ec80445b31affc53a96eaefb17540110214f47 Mon Sep 17 00:00:00 2001
From: amdi-odoo <amdi@odoo.com>
Date: Fri, 21 Apr 2023 07:42:14 +0000
Subject: [PATCH] [IMP] mail,mass_mailing_sms,*: improve UI

*: phone_validation

- Add sample data in the mass_mailing_sms blacklist phone
numbers tree view.
- Update the mass_mailing_sms demo data so that, instead of
the sms being stuck due to a lack of credits, they are
all sent.
- Swap the mass_mailing_sms list view with the kanban view
so that the list view is the main one like in Email Marketing.
- Rename the reset mail template confirm button from "Proceed"
to "Reset Template" to make the action more explicit.

Task-3280602

closes odoo/odoo#119321

Related: odoo/enterprise#40120
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/mail/wizard/mail_template_reset_views.xml |  2 +-
 addons/mass_mailing_sms/data/mailing_demo.xml    |  4 ++--
 .../views/mailing_mailing_views.xml              | 16 ++++++++--------
 .../views/phone_blacklist_views.xml              |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/mail/wizard/mail_template_reset_views.xml b/addons/mail/wizard/mail_template_reset_views.xml
index cff1b8bf650..5b67077f2b9 100644
--- a/addons/mail/wizard/mail_template_reset_views.xml
+++ b/addons/mail/wizard/mail_template_reset_views.xml
@@ -10,7 +10,7 @@
                     Are you sure you want to reset these email templates to their original configuration? Changes and translations will be lost.
                 </div>
                 <footer>
-                    <button string="Proceed" class="btn btn-primary" type="object" name="reset_template" data-hotkey="q"/>
+                    <button string="Reset Template" class="btn btn-primary" type="object" name="reset_template" data-hotkey="q"/>
                     <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
                 </footer>
             </form>
diff --git a/addons/mass_mailing_sms/data/mailing_demo.xml b/addons/mass_mailing_sms/data/mailing_demo.xml
index aaeaef0f5f3..66f01a4cdbf 100644
--- a/addons/mass_mailing_sms/data/mailing_demo.xml
+++ b/addons/mass_mailing_sms/data/mailing_demo.xml
@@ -167,11 +167,11 @@
     <record id="mailing_sms_1_trace_3" model="mailing.trace">
         <field name="mass_mailing_id" ref="mailing_sms_1"/>
         <field name="trace_type">sms</field>
-        <field name="sms_number">+32456001133</field>
+        <field name="sms_number"></field>
         <field name="model">mailing.contact</field>
         <field name="res_id" ref="mass_mailing_sms.mailing_contact_0_3"/>
         <field name="trace_status">error</field>
-        <field name="failure_type">sms_credit</field>
+        <field name="failure_type">sms_number_missing</field>
     </record>
     <record id="mailing_sms_1_trace_4" model="mailing.trace">
         <field name="mass_mailing_id" ref="mailing_sms_1"/>
diff --git a/addons/mass_mailing_sms/views/mailing_mailing_views.xml b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
index 94458436b8c..877f9970f4f 100644
--- a/addons/mass_mailing_sms/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
@@ -251,7 +251,7 @@
     <record id="mailing_mailing_action_sms" model="ir.actions.act_window">
         <field name="name">SMS Marketing</field>
         <field name="res_model">mailing.mailing</field>
-        <field name="view_mode">kanban,tree,form,calendar,graph</field>
+        <field name="view_mode">tree,kanban,form,calendar,graph</field>
         <field name="search_view_id" ref="mailing_mailing_view_search_sms"/>
         <field name="domain">[('mailing_type', '=', 'sms')]</field>
         <field name="context">{
@@ -268,17 +268,17 @@
           </p>
         </field>
     </record>
-    <record id="mailing_mailing_action_sms_view_kanban" model="ir.actions.act_window.view">
-        <field name="sequence">1</field>
-        <field name="view_mode">kanban</field>
-        <field name="view_id" ref="mailing_mailing_view_kanban_sms"/>
-        <field name="act_window_id" ref="mailing_mailing_action_sms"/>
-    </record>
     <record id="mailing_mailing_action_sms_view_tree" model="ir.actions.act_window.view">
-        <field name="sequence">2</field>
+        <field name="sequence">1</field>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="mailing_mailing_view_tree_sms"/>
         <field name="act_window_id" ref="mailing_mailing_action_sms"/>
     </record>
+    <record id="mailing_mailing_action_sms_view_kanban" model="ir.actions.act_window.view">
+        <field name="sequence">2</field>
+        <field name="view_mode">kanban</field>
+        <field name="view_id" ref="mailing_mailing_view_kanban_sms"/>
+        <field name="act_window_id" ref="mailing_mailing_action_sms"/>
+    </record>
 
 </data></odoo>
diff --git a/addons/phone_validation/views/phone_blacklist_views.xml b/addons/phone_validation/views/phone_blacklist_views.xml
index 4d9d8bb611a..13eadad6dd4 100644
--- a/addons/phone_validation/views/phone_blacklist_views.xml
+++ b/addons/phone_validation/views/phone_blacklist_views.xml
@@ -4,7 +4,7 @@
         <field name="name">phone.blacklist.view.tree</field>
         <field name="model">phone.blacklist</field>
         <field name="arch" type="xml">
-            <tree string="Phone Blacklist">
+            <tree string="Phone Blacklist" sample="1">
                 <field name="create_date" string="Blacklist Date"/>
                 <field name="number"/>
             </tree>