[IMP] settings: Improve general UX (back2basics)

TaskID: 2043133

closes odoo/odoo#35382

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>

2 files changed, 70 insertions, 58 deletions

diff --git a/addons/base_setup/views/assets.xml b/addons/base_setup/views/assets.xml
index 340e4a52445..cd0cb0efc85 100644
--- a/addons/base_setup/views/assets.xml
+++ b/addons/base_setup/views/assets.xml
@@ -2,6 +2,7 @@
 <odoo>
     <template id="assets_backend" name="dev tool assets" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
+            <link rel="stylesheet" type="text/scss" href="/base_setup/static/src/scss/settings.scss"/>
             <script type="text/javascript" src="/base_setup/static/src/js/res_config_dev_tool.js"></script>
             <script type="text/javascript" src="/base_setup/static/src/js/res_config_edition.js"></script>
             <script type="text/javascript" src="/base_setup/static/src/js/res_config_invite_users.js"></script>
diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index 1e0a48cf8be..c38f92d59b9 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -8,45 +8,53 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="General Settings" string="General Settings" data-key="general_settings">
-                        <div id='about'>
-                            <h2>About</h2>
+
+                        <div id="invite_users">
+                            <h2>Users</h2>
                             <div class="row mt16 o_settings_container">
-                                <div class='col-12 col-lg-6 o_setting_box' id='appstore'>
-                                    <div class="d-flex">
-                                        <div class="o_setting_right_pane">
-                                            <!-- FIXME Those links are defined directly in the template which means that we will have to
-                                            update the template code is the link ever changes -->
-                                            <a class="d-block mx-auto" href="https://play.google.com/store/apps/details?id=com.odoo.mobile" target="blank">
-                                                <img alt="On Google Play" class="d-block mx-auto img img-fluid" src="/base_setup/static/src/img/google_play.png"/>
-                                            </a>
-                                        </div>
-                                        <div>
-                                            <a class='d-block mx-auto' href="https://itunes.apple.com/us/app/odoo/id1272543640" target="blank">
-                                                <img alt="On Apple Store" class="d-block mx-auto img img-fluid" src="/base_setup/static/src/img/app_store.png"/>
-                                            </a>
-                                        </div>
+                                <div class="col-12 col-lg-6 o_setting_box">
+                                    <div class="o_setting_right_pane">
+                                        <span class="fa fa-lg fa-users"/>
+                                        <field name='active_user_count' class="w-auto pl-3 font-weight-bold"/>
+                                        <span class='o_form_label' attrs="{'invisible':[('active_user_count', '&gt;', '1')]}">
+                                            Active User
+                                        </span>
+                                        <span class='o_form_label' attrs="{'invisible':[('active_user_count', '&lt;=', '1')]}">
+                                            Active Users
+                                        </span>
+
+                                        <br/>
+                                        <button name="%(base.action_res_users)d" icon="fa-arrow-right" type="action" string="Manage Users" class="btn-link o_web_settings_access_rights"/>
+
+                                    </div>
+                                </div>
+                                <div class="col-12 col-lg-6 o_setting_box">
+                                    <div class="o_setting_right_pane">
+                                        <widget name='res_config_invite_users'/>
                                     </div>
                                 </div>
-                                <widget name='res_config_edition'/>
                             </div>
                         </div>
-                        <div id='invite_users'>
-                            <h2>Users</h2>
-                            <widget name='res_config_invite_users'/>
-                        </div>
 
                         <div id="companies">
                             <h2>Companies</h2>
-                            <div class='row mt16 o_settings_container'>
-                                <div class='col-xs-12 col-md-6 o_setting_box'>
-                                    <div class='o_setting_right_pane'>
-                                        <!-- TODO This is not an ideal solution but it looks ok on the interface -->
-                                        <div class="w-50">
-                                            <field name='company_count' class="w-auto pl-1"/>
-                                            <span class='o_form_label'>
-                                                companies
-                                            </span>
-                                        </div>
+                            <div class="row mt16 o_settings_container">
+                                <div class="col-12 col-lg-6 o_setting_box">
+                                    <div class="o_setting_right_pane">
+                                        <field name="company_name" class="font-weight-bold"/>
+                                        <br/>
+                                        <field name="company_informations" class="text-muted" style="width: 90%;"/>
+                                        <br/>
+                                        <button name="open_company" icon="fa-arrow-right" type="object" string="Update Info" class="btn-link"/>
+                                    </div>
+                                </div>
+                                <div class="col-12 col-lg-6 o_setting_box">
+                                    <div class="o_setting_right_pane">
+                                        <field name='company_count' class="w-auto pl-1 font-weight-bold"/>
+                                        <span class="o_form_label">
+                                            Companies
+                                        </span>
+                                        <br/>
                                         <button name="%(base.action_res_company_form)d" icon="fa-arrow-right" type="action" string="Manage Companies" class="btn-link"/>
                                     </div>
                                 </div>
@@ -60,7 +68,7 @@
                                     <div class='o_setting_right_pane'>
                                         <!-- TODO This is not an ideal solution but it looks ok on the interface -->
                                         <div class="w-50">
-                                            <field name="language_count" class="w-auto pl-1"/>
+                                            <field name="language_count" class="w-auto pl-1 font-weight-bold"/>
                                             <span class="o_form_label">
                                                 Languages
                                             </span>
@@ -153,7 +161,7 @@
                                 <field name="user_default_rights"/>
                             </div>
                             <div class="o_setting_right_pane">
-                                <label string="Access Rights" for="user_default_rights"/>
+                                <label string="Default Access Rights" for="user_default_rights"/>
                                 <div class="text-muted">
                                     Set custom access rights for new users
                                 </div>
@@ -164,7 +172,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-12 col-lg-6 o_setting_box">
+                        <div class="col-12 col-lg-6 o_setting_box" groups="base.group_no_one" id="allow_import">
                             <div class="o_setting_left_pane">
                                 <field name="module_base_import" />
                             </div>
@@ -189,36 +197,17 @@
                         </div>
                         <div id="multi_company" groups="base.group_multi_company">
                             <field name="company_id" invisible="1"/>
-                            <h2>Multi-companies</h2>
+                            <h2>Multi-Company</h2>
                             <div class="row mt16 o_settings_container" name="multi">
-                                <div class="col-12 col-lg-6 o_setting_box">
-                                    <div class="o_setting_right_pane">
-                                        <label string="Multi-companies" for="multi_company"/>
-                                        <div class="text-muted">
-                                            Manage multiple legal entities with separate accounting
-                                        </div>
-                                        <div class="content-group">
-                                            <div class="mt16">
-                                                <button name="%(base.action_res_company_form)d" icon="fa-arrow-right" type="action" string="Companies" class="btn-link"/>
-                                            </div>
-                                            <div id="company_share_partner">
-                                                <field name="company_share_partner" class="oe_inline"/>
-                                                <label string="Common Contact Book" class="o_light_label" for="company_share_partner"/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
                                 <div class="col-12 col-lg-6 o_setting_box" title="Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company." id="inter_company">
                                     <div class="o_setting_left_pane">
                                         <field name="module_inter_company_rules" widget="upgrade_boolean"/>
                                     </div>
                                     <div class="o_setting_right_pane">
-                                        <label string="Inter Company Flows" for="module_inter_company_rules"/>
-                                        <div>
-                                            <i class="fa fa-lg fa-building-o"/>
-                                            <span class="text-muted">
-                                                the creation of documents between your companies
-                                            </span>
+                                        <label string="Inter-Company Transactions" for="module_inter_company_rules"/>
+                                        <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/>
+                                        <div class="text-muted">
+                                            Automatically generate counterpart documents for orders/invoices between companies
                                         </div>
                                         <div class="content-group" attrs="{'invisible': [('module_inter_company_rules','=',False)]}" id="inter_companies_rules">
                                             <div class="mt16 text-warning"><strong>Save</strong> this page and come back here to set up the feature.</div>
@@ -354,6 +343,28 @@
                             </div>
                         </div>
                         <widget name='res_config_dev_tool'/>
+                        <div id='about'>
+                            <h2>About</h2>
+                            <div class="row mt16 o_settings_container">
+                                <div class='col-12 col-lg-6 o_setting_box' id='appstore'>
+                                    <div class="d-flex">
+                                        <div class="o_setting_right_pane">
+                                            <!-- FIXME Those links are defined directly in the template which means that we will have to
+                                            update the template code is the link ever changes -->
+                                            <a class="d-block mx-auto" href="https://play.google.com/store/apps/details?id=com.odoo.mobile" target="blank">
+                                                <img alt="On Google Play" class="d-block mx-auto img img-fluid" src="/base_setup/static/src/img/google_play.png"/>
+                                            </a>
+                                        </div>
+                                        <div>
+                                            <a class='d-block mx-auto' href="https://itunes.apple.com/us/app/odoo/id1272543640" target="blank">
+                                                <img alt="On Apple Store" class="d-block mx-auto img img-fluid" src="/base_setup/static/src/img/app_store.png"/>
+                                            </a>
+                                        </div>
+                                    </div>
+                                </div>
+                                <widget name='res_config_edition'/>
+                            </div>
+                        </div>
                     </div>
                 </xpath>
             </field>