From b3f6a6e695ec2cc4cc48beaf482b8ee1d3959f30 Mon Sep 17 00:00:00 2001
From: Renaud Thiry <reth@odoo.com>
Date: Wed, 22 Mar 2023 10:43:09 +0000
Subject: [PATCH] [IMP] mail: make alias domain into its own setting

Currently, the alias domain can only be set by selecting:
'Custom Email Server' in the settings.

This does not make sense for users of pre-configured databases who
just want to use the default server with their own domain.

We move the domain to its own setting to prevent confusion.
As people are not always aware they can just set a domain without
configuring a server.

task-3224434

closes odoo/odoo#116174

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 .../base_setup/models/res_config_settings.py  |  2 +-
 .../event/views/res_config_settings_views.xml |  2 +-
 .../mail/views/res_config_settings_views.xml  | 30 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py
index b8b388343a7..3a42786af3c 100644
--- a/addons/base_setup/models/res_config_settings.py
+++ b/addons/base_setup/models/res_config_settings.py
@@ -15,7 +15,7 @@ class ResConfigSettings(models.TransientModel):
         "Default Access Rights",
         config_parameter='base_setup.default_user_rights')
     external_email_server_default = fields.Boolean(
-        "Custom Email Servers",
+        "Use Custom Email Servers",
         config_parameter='base_setup.default_external_email_server')
     module_base_import = fields.Boolean("Allow users to import data from CSV/XLS/XLSX/ODS files")
     module_google_calendar = fields.Boolean(
diff --git a/addons/event/views/res_config_settings_views.xml b/addons/event/views/res_config_settings_views.xml
index 1b102abecd5..ca7902eb9bb 100644
--- a/addons/event/views/res_config_settings_views.xml
+++ b/addons/event/views/res_config_settings_views.xml
@@ -53,7 +53,7 @@
                     </app>
                 </xpath>
 
-                <xpath expr="//setting[@id='email-outlook-setting']" position="after">
+                <xpath expr="//setting[@id='email-alias-setting']" position="after">
                     <setting string="Google Maps" help="Insert dynamic Google Maps in your email templates"
                              documentation="https://developers.google.com/maps/documentation/maps-static/get-api-key">
                         <field name="use_google_maps_static_api"/>
diff --git a/addons/mail/views/res_config_settings_views.xml b/addons/mail/views/res_config_settings_views.xml
index b805040ed73..2b2caaf3797 100644
--- a/addons/mail/views/res_config_settings_views.xml
+++ b/addons/mail/views/res_config_settings_views.xml
@@ -18,21 +18,18 @@
                         </setting>
                         <setting id="email_servers_setting" title="Using your own email server is required to send/receive emails in Community and Enterprise versions. Online users already benefit from a ready-to-use email server (@mycompany.odoo.com)." documentation="/applications/general/email_communication/email_servers.html" help="Configure your own email servers">
                             <field name="external_email_server_default"/>
-                            <div class="content-group mb-3"  attrs="{'invisible': [('external_email_server_default', '=', False)]}">
-                                <div class="mt16" id="mail_alias_domain">
-                                    <label for="alias_domain" class="o_light_label"/>
-                                    <span>@</span>
-                                    <field name="alias_domain" placeholder='e.g. "mycompany.com"'/>
-                                </div>
-                                <div class="mt8">
-                                    <button type="action"
-                                    name="%(action_email_server_tree)d"
-                                    string="Incoming Email Servers" icon="fa-arrow-right" class="btn-link"/>
-                                </div>
-                                <div class="mt8">
-                                    <button type="action"
-                                    name="%(base.action_ir_mail_server_list)d"
-                                    string="Outgoing Email Servers" icon="fa-arrow-right" class="btn-link"/>
+                            <div class="content-group mb-3" attrs="{'invisible': [('external_email_server_default', '=', False)]}">
+                                <div>
+                                    <div class="mt8">
+                                        <button type="action"
+                                        name="%(action_email_server_tree)d"
+                                        string="Incoming Email Servers" icon="fa-arrow-right" class="btn-link"/>
+                                    </div>
+                                    <div class="mt8">
+                                        <button type="action"
+                                        name="%(base.action_ir_mail_server_list)d"
+                                        string="Outgoing Email Servers" icon="fa-arrow-right" class="btn-link"/>
+                                    </div>
                                 </div>
                             </div>
                         </setting>
@@ -54,6 +51,9 @@
                                 </div>
                             </div>
                         </setting>
+                        <setting id="email-alias-setting" string="Alias Domain" help="Use a different domain for your mail aliases" documentation="/applications/general/email_communication/email_domain.html#be-spf-compliant">
+                            <span>@<field name="alias_domain" placeholder='e.g. "mycompany.com"'/></span>
+                        </setting>
                         <setting help="Add your twilio credentials for ICE servers">
                             <field name="use_twilio_rtc_servers"/>
                             <div class="content-group"  attrs="{'invisible': [('use_twilio_rtc_servers', '=', False)]}">