From cd9dfc9da49cf2bbced6fb30e6a2fce82020f68f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Mottet=20=28oms=29?= <oms@odoo.com>
Date: Wed, 25 Mar 2020 13:42:15 +0000
Subject: [PATCH] [IMP] base_setup: some changes in settings display

- Hide statistics section when empty
- Change order of two options in Integrations section
- Change label users to permissions to avoid duplicated label

Task ID: 2214425

closes odoo/odoo#48362

Related: odoo/enterprise#9491
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 .../views/res_config_settings_views.xml       |  8 +---
 .../views/res_config_settings_views.xml       | 41 +++++++++++--------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index 37ed808ce34..1ddab7646ff 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -131,12 +131,6 @@
                             </div>
                         </div>
 
-                        <div id="statistics">
-                            <h2>Statistics</h2>
-                            <div class='row mt16 o_settings_container' id='statistics_div'>
-                            </div>
-                        </div>
-
                         <div id="contacts_settings">
                             <h2>Contacts</h2>
                             <div class="row mt16 o_settings_container" name="contacts_setting_container">
@@ -166,7 +160,7 @@
                         </div>
                     </div>
                     <div id="emails"/>
-                    <h2>Users</h2>
+                    <h2>Permissions</h2>
                     <div class="row mt16 o_settings_container" id="user_default_rights">
                         <div class="col-12 col-lg-6 o_setting_box"  title="By default, new users get highest access rights for all installed apps." id="access_rights">
                             <div class="o_setting_left_pane">
diff --git a/addons/digest/views/res_config_settings_views.xml b/addons/digest/views/res_config_settings_views.xml
index 0f8909a4a5f..1d1ac1ed18a 100644
--- a/addons/digest/views/res_config_settings_views.xml
+++ b/addons/digest/views/res_config_settings_views.xml
@@ -5,25 +5,30 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[@id='statistics_div']" position="inside">
-                <div class="col-12 col-lg-6 o_setting_box"
-                    title="New users are automatically added as recipient of the following digest email."
-                    name="digest_email_setting_container">
-                    <div class="o_setting_left_pane">
-                        <field name="digest_emails"/>
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label string="Digest Email" for="digest_emails"/>
-                        <div class="text-muted" id="msg_module_digest">
-                            Add new users as recipient of a periodic email with key metrics
-                        </div>
-                        <div class="content-group" attrs="{'invisible': [('digest_emails','=',False)]}">
-                            <div class="mt16">
-                                <label for="digest_id" class="o_light_label"/>
-                                <field name="digest_id" class="oe_inline"/>
+            <xpath expr="//div[@id='contacts_settings']" position="before">
+                <div id="statistics" invisible="1">
+                    <h2>Statistics</h2>
+                    <div class='row mt16 o_settings_container' id='statistics_div'>
+                        <div class="col-12 col-lg-6 o_setting_box"
+                            title="New users are automatically added as recipient of the following digest email."
+                            name="digest_email_setting_container">
+                            <div class="o_setting_left_pane">
+                                <field name="digest_emails"/>
                             </div>
-                            <div class="mt8">
-                                <button type="action" name="%(digest.digest_digest_action)d" string="Configure Digest Emails" icon="fa-arrow-right" class="btn-link"/>
+                            <div class="o_setting_right_pane">
+                                <label string="Digest Email" for="digest_emails"/>
+                                <div class="text-muted" id="msg_module_digest">
+                                    Add new users as recipient of a periodic email with key metrics
+                                </div>
+                                <div class="content-group" attrs="{'invisible': [('digest_emails','=',False)]}">
+                                    <div class="mt16">
+                                        <label for="digest_id" class="o_light_label"/>
+                                        <field name="digest_id" class="oe_inline"/>
+                                    </div>
+                                    <div class="mt8">
+                                        <button type="action" name="%(digest.digest_digest_action)d" string="Configure Digest Emails" icon="fa-arrow-right" class="btn-link"/>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>