[REF] mail, sms: perform some guidelining (file move) and rename SMS composer model

Purpose is to prepare future improvements in mail and SMS module. In this
commit we apply some guidelines on XML Ids and file naming.

In mail cancel wizard code is separated from the resend one as they have
nothing in common.

More importantly ``sms.send_sms`` model is renamed to ``sms.composer`` to
avoid underscores (which is really really bad, take a look at
ir.config_parameter) and have a meaningful name.

Related to task 1922163
Linked to PR #34516

Co-Authored-By: Thibault Delavallee <tde@odoo.com>
Co-Authored-By: Pierre Rousseau <pro@odoo.com>

6 files changed, 15 insertions, 16 deletions

diff --git a/addons/sms/__manifest__.py b/addons/sms/__manifest__.py
index 574a13810d3..acc027d90d4 100644
--- a/addons/sms/__manifest__.py
+++ b/addons/sms/__manifest__.py
@@ -12,10 +12,10 @@ The service is provided by the In App Purchase Odoo platform.
 """,
     'depends': ['base', 'iap', 'mail'],
     'data': [
-        'wizard/send_sms_views.xml',
+        'wizard/sms_composer_views.xml',
         'views/res_config_settings_views.xml',
         'views/res_partner_views.xml',
-        'views/templates.xml',
+        'views/assets.xml',
     ],
     'qweb': [
         'static/src/xml/sms_widget.xml',
diff --git a/addons/sms/views/templates.xml b/addons/sms/views/assets.xml
index 15bf5fc1454..15bf5fc1454 100644
--- a/addons/sms/views/templates.xml
+++ b/addons/sms/views/assets.xml
diff --git a/addons/sms/views/res_partner_views.xml b/addons/sms/views/res_partner_views.xml
index 1773c31a30c..1a483568178 100644
--- a/addons/sms/views/res_partner_views.xml
+++ b/addons/sms/views/res_partner_views.xml
@@ -2,8 +2,8 @@
 <odoo>
 
     <!-- Add action entry in the Action Menu for Partners -->
-    <record id="partner_form_send_sms_form_view" model="ir.ui.view">
-        <field name="name">res.partner.form.send.sms</field>
+    <record id="res_partner_view_form" model="ir.ui.view">
+        <field name="name">res.partner.view.form.inherit.sms</field>
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="priority">10</field>
@@ -14,7 +14,7 @@
                     <field name="phone" widget="phone"/>
                     <button
                         type="action"
-                        name="%(sms.send_sms_form_action)d"
+                        name="%(sms.sms_composer_action_form)d"
                         class="btn-sm btn-link mb4 fa fa-envelope-o"
                         aria-label="Send SMS"
                         title="Send SMS"
@@ -29,7 +29,7 @@
                     <field name="mobile" widget="phone"/>
                     <button
                         type="action"
-                        name="%(sms.send_sms_form_action)d"
+                        name="%(sms.sms_composer_action_form)d"
                         class="btn-sm btn-link mb4 fa fa-envelope-o"
                         aria-label="Send SMS"
                         title="Send SMS"
diff --git a/addons/sms/wizard/__init__.py b/addons/sms/wizard/__init__.py
index 937147a0b43..3b5c1a8895f 100644
--- a/addons/sms/wizard/__init__.py
+++ b/addons/sms/wizard/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from . import send_sms
+from . import sms_composer
diff --git a/addons/sms/wizard/send_sms.py b/addons/sms/wizard/sms_composer.py
index e264eab59f8..2eefe1c42b4 100644
--- a/addons/sms/wizard/send_sms.py
+++ b/addons/sms/wizard/sms_composer.py
@@ -23,7 +23,7 @@ except ImportError:
 
 
 class SendSMS(models.TransientModel):
-    _name = 'sms.send_sms'
+    _name = 'sms.composer'
     _description = 'Send SMS'
 
     recipients = fields.Char('Recipients', required=True)
diff --git a/addons/sms/wizard/send_sms_views.xml b/addons/sms/wizard/sms_composer_views.xml
index c31088ee7ba..413cf62b386 100644
--- a/addons/sms/wizard/send_sms_views.xml
+++ b/addons/sms/wizard/sms_composer_views.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
-    <record id="send_sms_view_form" model="ir.ui.view">
-        <field name="name">sms_send_sms.form</field>
-        <field name="model">sms.send_sms</field>
+    <record id="sms_composer_view_form" model="ir.ui.view">
+        <field name="name">sms.composer.view.form</field>
+        <field name="model">sms.composer</field>
         <field name="arch" type="xml">
             <form string="Send an SMS">
                 <sheet>
@@ -23,18 +22,18 @@
             </form>
         </field>
     </record>
-    <record id="send_sms_form_action" model="ir.actions.act_window">
+    <record id="sms_composer_action_form" model="ir.actions.act_window">
         <field name="name">Send SMS</field>
-        <field name="res_model">sms.send_sms</field>
+        <field name="res_model">sms.composer</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
     </record>
 
     <!-- Add action entry in the Action Menu for Partners -->
-    <act_window id="send_sms_action"
+    <act_window id="sms_composer_act_window"
         name="Send SMS"
         binding_model="res.partner"
-        res_model="sms.send_sms"
+        res_model="sms.composer"
         view_mode="form"
         target="new"/>