[MERGE] forward port branch saas-12.5 up to 197474e5b9a

4 files changed, 83 insertions, 60 deletions

diff --git a/addons/mass_mailing_sms/views/mailing_contact_views.xml b/addons/mass_mailing_sms/views/mailing_contact_views.xml
index 374191ec91f..eb2d7e57384 100644
--- a/addons/mass_mailing_sms/views/mailing_contact_views.xml
+++ b/addons/mass_mailing_sms/views/mailing_contact_views.xml
@@ -6,7 +6,8 @@
         <field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_contact_search"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='name']" position="after">
-                <field name="phone_sanitized"/>
+                <field name="mobile"/>
+                <field name="phone_sanitized" invisible="1"/>
             </xpath>
             <xpath expr="//filter[@name='filter_not_optout']" position="after">
                 <separator/>
@@ -31,7 +32,8 @@
                 <field name="create_date"/>
                 <field name="name"/>
                 <field name="company_name"/>
-                <field name="phone_sanitized"/>
+                <field name="mobile"/>
+                <field name="phone_sanitized" invisible="1"/>
                 <field name="phone_blacklisted"/>
                 <field name="opt_out" invisible="'default_list_ids' not in context"/>
             </tree>
@@ -43,18 +45,13 @@
         <field name="model">mailing.contact</field>
         <field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_contact_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//label[@for='email']" position="attributes">
-                <attribute name="invisible">context.get('mailing_sms') == True</attribute>
-            </xpath>
-            <xpath expr="//div[@name='email_details']" position="attributes">
-                <attribute name="invisible">context.get('mailing_sms') == True</attribute>
-            </xpath>
             <xpath expr="//div[@name='email_details']" position="after">
-                <label for="phone_sanitized" class="oe_inline"/>
+                <label for="mobile" class="oe_inline"/>
                 <div class="o_row o_row_readonly" name="phone_details">
-                    <i class="fa fa-ban" style="color: red;" role="img" title="This number is blacklisted for mass SMS"
+                    <i class="fa fa-ban" style="color: red;" role="img" title="This number is blacklisted for SMS Marketing"
                         aria-label="Phone Blacklisted" attrs="{'invisible': [('phone_blacklisted', '=', False)]}" groups="base.group_user"></i>
-                    <field name="phone_sanitized" widget="phone"/>
+                    <field name="mobile" widget="phone"/>
+                    <field name="phone_sanitized" invisible="1"/>
                     <field name="phone_blacklisted" invisible="1"/>
                 </div>
             </xpath>
@@ -67,10 +64,11 @@
         <field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_contact_kanban"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='email']" position="after">
-                <field name="phone_sanitized"/>
+                <field name="mobile"/>
+                <field name="phone_sanitized" invisible="1"/>
             </xpath>
             <xpath expr="//t[@t-esc='record.email.value']" position="after">
-                <t t-esc="record.phone_sanitized.value"/>
+                <t t-esc="record.mobile.value"/>
             </xpath>
         </field>
     </record>
@@ -88,7 +86,7 @@
         </field>
     </record>
 
-    <!-- Mass SMS / Contacts Lists / Contacts Lists -->
+    <!-- SMS Marketing / Contacts Lists / Contacts Lists -->
     <record id="mass_mailing_sms.mailing_contact_menu_sms" model="ir.ui.menu">
         <field name="action" ref="mailing_contact_action_sms"/>
     </record>
diff --git a/addons/mass_mailing_sms/views/mailing_list_views.xml b/addons/mass_mailing_sms/views/mailing_list_views.xml
index d1b88669078..de57e354b01 100644
--- a/addons/mass_mailing_sms/views/mailing_list_views.xml
+++ b/addons/mass_mailing_sms/views/mailing_list_views.xml
@@ -15,7 +15,7 @@
         </field>
     </record>
 
-    <!-- Mass SMS / Contacts Lists / Contacts Lists -->
+    <!-- SMS Marketing / Contacts Lists / Contacts Lists -->
     <record id="mass_mailing_sms.mailing_list_menu_sms" model="ir.ui.menu">
         <field name="action" ref="mailing_list_action_sms"/>
     </record>
diff --git a/addons/mass_mailing_sms/views/mailing_mailing_views.xml b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
index d4517cf0b1f..a95361f397f 100644
--- a/addons/mass_mailing_sms/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo><data>
-    <record id="mailing_mailing_view_form" model="ir.ui.view">
+
+    <record model="ir.ui.view" id="mailing_mailing_view_search_sms">
+        <field name="name">mailing.mailing.search</field>
+        <field name="model">mailing.mailing</field>
+        <field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_search"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='assigned_to_me']" position="attributes">
+                <attribute name="string">My SMS Marketing</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="mailing_mailing_view_form_sms" model="ir.ui.view">
         <field name="name">mailing.mailing.view.form.inherit.sms</field>
         <field name="model">mailing.mailing</field>
         <field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_form"/>
@@ -19,15 +32,13 @@
             <xpath expr="//header" position="after">
                 <field name="sms_has_insufficient_credit" invisible="1"/>
                 <div class="alert alert-warning text-center" attrs="{'invisible': [('sms_has_insufficient_credit', '=', False)]}" role="alert">
-                    <p>
-                        <button class="btn-link"
-                                name="action_buy_sms_credits"
-                                type="object">
-                            <strong>
-                                It appears you don't have enough IAP credits. Click here to buy credits.
-                            </strong>
-                        </button>
-                    </p>
+                    <button class="btn-link py-0"
+                            name="action_buy_sms_credits"
+                            type="object">
+                        <strong>
+                            It appears you don't have enough IAP credits. Click here to buy credits.
+                        </strong>
+                    </button>
                 </div>
             </xpath>
             <xpath expr="//span[@name='ignored_text']" position="attributes">
@@ -48,6 +59,12 @@
             <xpath expr="//span[@name='failed_text']" position="after">
                 <span name="failed_text_sms" attrs="{'invisible': [('mailing_type', '!=', 'sms')]}">SMS Text Message could not be sent.</span>
             </xpath>
+            <xpath expr="//span[@name='next_departure_text']" position='attributes'>
+                <attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
+            </xpath>
+            <xpath expr="//span[@name='next_departure_text']" position='after'>
+                <span name="next_departure_text" attrs="{'invisible': [('mailing_type', '!=', 'sms')]}">This SMS marketing is scheduled for</span>
+            </xpath>
             <!-- Stat Buttons -->
             <xpath expr="//button[@id='button_view_sent']" position="attributes">
                 <attribute name="attrs">{'invisible': ['|', '&amp;', ('sent', '=', 0), ('state', 'in', ('draft', 'test')), ('mailing_type', '!=', 'mail')]}</attribute>
@@ -69,7 +86,10 @@
             </xpath>
             <!-- Form -->
             <xpath expr="//field[@name='subject']" position="attributes">
-                <attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
+                <attribute name="attrs">{
+                    'invisible': [('mailing_type', '!=', 'mail')],
+                    'readonly': [('state', 'in', ('sending', 'done'))]}
+                </attribute>
             </xpath>
             <xpath expr="//page[@name='mail_body']" position="attributes">
                 <attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
@@ -78,14 +98,16 @@
                 <page string="SMS Content" name="sms_body" attrs="{'invisible': [('mailing_type', '!=', 'sms')]}">
                     <field name="body_plaintext" widget="sms_widget"/>
                     <group>
-                        <field name="sms_template_id" domain="[('model', '=', mailing_model_real)]"/>
                         <field name="sms_allow_unsubscribe"/>
                     </group>
                 </page>
             </xpath>
             <!-- Option page tweaks -->
             <xpath expr="//field[@name='email_from']" position="attributes">
-                <attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
+                <attribute name="attrs">{
+                    'invisible': [('mailing_type', '!=', 'mail')],
+                    'readonly': [('state', 'in', ('sending', 'done'))]}
+                </attribute>
             </xpath>
             <xpath expr="//label[@for='reply_to']" position="attributes">
                 <attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
@@ -100,12 +122,15 @@
                 <attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
             </xpath>
             <xpath expr="//field[@name='mail_server_id']" position="attributes">
-                <attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
+                <attribute name="attrs">{
+                    'invisible': [('mailing_type', '!=', 'mail')],
+                    'readonly': [('state', 'in', ('sending', 'done'))]}
+                </attribute>
             </xpath>
         </field>
     </record>
 
-    <record id="mailing_mailing_view_kanban" model="ir.ui.view">
+    <record id="mailing_mailing_view_kanban_sms" model="ir.ui.view">
         <field name="name">mailing.mailing.view.kanban.inherit.sms</field>
         <field name="model">mailing.mailing</field>
         <field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_kanban"/>
@@ -113,18 +138,17 @@
             <xpath expr="//field[@name='active']" position="after">
                 <field name="sms_has_insufficient_credit"/>
             </xpath>
-            <xpath expr="//h3" position="after">
-                <div class="alert alert-warning" role="alert" attrs="{'invisible': [('sms_has_insufficient_credit', '=', False)]}">
-                    <a name="action_buy_sms_credits"
-                       type="object">Insufficient credits</a>
-                </div>
-            </xpath>
             <xpath expr="//div[@name='stat_opened']" position="attributes">
                 <attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
             </xpath>
             <xpath expr="//div[@name='stat_replied']" position="attributes">
                 <attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
-            </xpath>            
+            </xpath>
+            <xpath expr="//div[@name='div_total_model']" position="after">
+                <div class="alert alert-warning" role="alert" attrs="{'invisible': ['&amp;',('sms_has_insufficient_credit', '=', False), ('mailing_type', '!=', 'mail')]}">
+                    <a name="action_buy_sms_credits" type="object">Insufficient credits</a>
+                </div>
+            </xpath>
         </field>
     </record>
 
@@ -133,7 +157,7 @@
         <field name="model">mailing.mailing</field>
         <field name="priority">20</field>
         <field name="arch" type="xml">
-            <tree string="Mass SMS">
+            <tree string="SMS Marketing">
                 <field name="name"/>
                 <field name="mailing_type" invisible="1"/>
                 <field name="sent"/>
@@ -145,9 +169,10 @@
     </record>
 
     <record id="mailing_mailing_action_sms" model="ir.actions.act_window">
-        <field name="name">Mass SMS</field>
+        <field name="name">SMS Marketing</field>
         <field name="res_model">mailing.mailing</field>
         <field name="view_mode">kanban,tree,form,graph</field>
+        <field name="search_view_id" ref="mailing_mailing_view_search_sms"/>
         <field name="domain">[('mailing_type', '=', 'sms')]</field>
         <field name="context">{
                 'search_default_assigned_to_me': 1,
@@ -156,7 +181,7 @@
         }</field>
         <field name="help" type="html">
           <p class="o_view_nocontent_smiling_face">
-            Create a new mass SMS
+            Create a new SMS Marketing
           </p><p>
             You can easily send SMS to any contact saved in other Odoo apps.
           </p>
@@ -165,7 +190,7 @@
     <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="mass_mailing.view_mail_mass_mailing_kanban"/>
+        <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">
@@ -175,7 +200,7 @@
         <field name="act_window_id" ref="mailing_mailing_action_sms"/>
     </record>
 
-    <!-- Mass SMS / Mass SMS -->
+    <!-- SMS Marketing / SMS Marketing -->
     <record id="mass_mailing_sms_menu_mass_sms" model="ir.ui.menu">
         <field name="action" ref="mailing_mailing_action_sms"/>
     </record>
diff --git a/addons/mass_mailing_sms/views/mailing_sms_menus.xml b/addons/mass_mailing_sms/views/mailing_sms_menus.xml
index f7cc0f05edb..8773241b880 100644
--- a/addons/mass_mailing_sms/views/mailing_sms_menus.xml
+++ b/addons/mass_mailing_sms/views/mailing_sms_menus.xml
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- Mass SMS -->
+    <!-- SMS Marketing -->
     <menuitem id="mass_mailing_sms_menu_root"
-    	name="Mass SMS"
-    	sequence="60"
-    	web_icon="mass_mailing_sms,static/description/icon.png"
-    	groups="mass_mailing.group_mass_mailing_user"/>
+        name="SMS Marketing"
+        sequence="60"
+        web_icon="mass_mailing_sms,static/description/icon.png"
+        groups="mass_mailing.group_mass_mailing_user"/>
 
-    <!-- Mass SMS / Mass SMS -->
+    <!-- SMS Marketing / SMS Marketing -->
     <menuitem id="mass_mailing_sms_menu_mass_sms"
-        name="Mass SMS"
+        name="SMS Marketing"
         parent="mass_mailing_sms_menu_root"
         sequence="1"
         groups="mass_mailing.group_mass_mailing_user"/>
 
-    <!-- Mass SMS / Contacts Lists -->
+    <!-- SMS Marketing / Contacts Lists -->
     <menuitem id="mass_mailing_sms_menu_contacts"
         name="Contacts Lists"
         parent="mass_mailing_sms_menu_root"
         sequence="2"
         groups="mass_mailing.group_mass_mailing_user"/>
-    <!-- Mass SMS / Contacts Lists / Contacts Lists -->
+    <!-- SMS Marketing / Contacts Lists / Contacts Lists -->
     <menuitem id="mailing_list_menu_sms"
         name="Contacts Lists"
         parent="mass_mailing_sms_menu_contacts"
         sequence="1"
         groups="mass_mailing.group_mass_mailing_user"/>
-        <!-- Mass SMS / Contacts Lists / Contacts -->
+        <!-- SMS Marketing / Contacts Lists / Contacts -->
     <menuitem id="mailing_contact_menu_sms"
         name="Contacts"
         parent="mass_mailing_sms_menu_contacts"
         sequence="2"
         groups="mass_mailing.group_mass_mailing_user"/>
 
-    <!-- Mass SMS / Reporting -->
+    <!-- SMS Marketing / Reporting -->
     <menuitem id="mass_mailing_sms_menu_reporting"
         name="Reporting"
         parent="mass_mailing_sms_menu_root"
         sequence="80"
         groups="mass_mailing.group_mass_mailing_user"/>
 
-    <!-- Mass SMS / Configuration -->
+    <!-- SMS Marketing / Configuration -->
     <menuitem id="mass_mailing_sms_menu_configuration"
         name="Configuration"
         parent="mass_mailing_sms_menu_root"
         sequence="100"
         groups="mass_mailing.group_mass_mailing_user"/>
-    <!-- Mass SMS / Configuration / Blacklist -->
+    <!-- SMS Marketing / Configuration / Blacklist -->
     <menuitem id="phone_blacklist_menu"
-    	name="Phone Blacklist"
-    	parent="mass_mailing_sms_menu_configuration"
-    	sequence="1"
+        name="Phone Blacklist"
+        parent="mass_mailing_sms_menu_configuration"
+        sequence="1"
         action="phone_validation.phone_blacklist_action"
         groups="mass_mailing.group_mass_mailing_user"/>
-    <!-- Mass SMS / Configuration / Link Tracker -->
+    <!-- SMS Marketing / Configuration / Link Tracker -->
     <menuitem id="link_tracker_menu"
         name="Link Tracker Blacklist"
         parent="mass_mailing_sms_menu_configuration"
         sequence="2"
         action="link_tracker.link_tracker_action"
         groups="mass_mailing.group_mass_mailing_user"/>
-</odoo>
\ No newline at end of file
+</odoo>