From 6d757f5a693c1c0d4fbbeea8b0fc5d50d377f1c4 Mon Sep 17 00:00:00 2001
From: Dharmraj Jhala <dja@odoo.com>
Date: Thu, 22 Oct 2020 05:34:22 +0000
Subject: [PATCH] [IMP] crm : re-organize crm settings

PURPOSE

Improve ui in CRM settings to ease user understanding and using settings.

SPECIFICATIONS

This commit re-organizes some crm related settings groups for better
usability by interchanging their positions and by putting related
groups together.

Crm PLS warning improvement: https://tinyurl.com/y67ug3fr
  * Reword PLS explanation and button (followup of 9a57a7edfbe453c621e91b13eb51ccbb5ade3897)

Settings cleanup: https://tinyurl.com/y5lwqwe6
  * Move "Leads" option on the right, next to Recurring revenues;
  * Move "Incoming Emails" below "Leads";
  * Switch "Visits to Leads" and "Outlook CRM Extension";

LINKS

TaskID - 2351582

closes odoo/odoo#60264

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 .../crm/views/res_config_settings_views.xml   | 112 +++++++++---------
 1 file changed, 55 insertions(+), 57 deletions(-)

diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml
index befea7eaa15..6baf4a03abd 100644
--- a/addons/crm/views/res_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -10,8 +10,23 @@
             <xpath expr="//div[hasclass('settings')]" position="inside">
                 <div class="app_settings_block" data-string="CRM" string="CRM" data-key="crm" groups="sales_team.group_sale_manager">
                     <h2>CRM</h2>
-                    <div class="row mt16 o_settings_container" name="qualification_setting_container">
-                        <div class="col-12 col-lg-6 o_setting_box" id="crm_lead"
+                    <div class="row mt16 o_settings_container">
+                        <div class="col-lg-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="group_use_recurring_revenues"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="group_use_recurring_revenues"/>
+                                <div class="text-muted">
+                                    Define recurring plans and revenues on Opportunities
+                                </div>
+                                <div attrs="{'invisible': [('group_use_recurring_revenues', '=', False)]}">
+                                    <button type="action" name="crm.crm_recurring_plan_action"
+                                            string="Manage Recurring Plans" icon="fa-arrow-right" class="oe_link"/>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-lg-6 o_setting_box" id="crm_lead"
                             title="Use leads if you need a qualification step before creating an opportunity or a customer. It can be a business card you received, a contact form filled in your website, or a file of unqualified prospects you import, etc. Once qualified, the lead can be converted into a business opportunity and/or a new customer in your address book.">
                             <div class="o_setting_left_pane">
                                 <field name="group_use_lead"/>
@@ -23,7 +38,35 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-12 col-lg-6 o_setting_box" id="crm_lead"
+                    </div>
+                    <div class="row mt16 o_settings_container">
+                        <div class="col-lg-6 o_setting_box"
+                            title="This can be used to compute statistical probability to close a lead"
+                            name="predictive_lead_setting_container">
+                            <div class="o_setting_left_pane"></div>
+                            <div class="o_setting_right_pane">
+                                <b>Predictive Lead Scoring</b>
+                                <div class="text-muted">
+                                    The success rate is computed based on the stage, but you can add more fields in the statistical analysis.
+                                </div>
+                                <div class="mt16">
+                                    <field name="predictive_lead_scoring_fields" class="oe_inline" widget="many2many_tags" placeholder="Extra fields..."/>
+                                    <field name="predictive_lead_scoring_fields_str" invisible="1"/>
+                                </div>
+                                <div class="mt16">
+                                    Consider leads created as of the
+                                    <field name="predictive_lead_scoring_start_date_str" invisible="1"/>
+                                    <field name="predictive_lead_scoring_start_date" class="oe_inline" required="1"/>
+                                </div>
+                                <div class="mt16" groups="base.group_erp_manager">
+                                    <div class="text-muted">
+                                        Use this button to update the probabilities of all leads. This can take up to several minutes depending on how many there are.
+                                    </div>
+                                    <button name="action_reset_lead_probabilities" type="object" string="Update Probabilities" class="btn-primary"/>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-lg-6 o_setting_box" id="crm_lead"
                                 attrs="{'invisible': [('group_use_lead','=',False)]}"
                                 title="Emails received to that address generate new leads not assigned to any Sales Team yet. This can be made when converting them into opportunities. Incoming emails can be automatically assigned to specific Sales Teams. To do so, set an email alias on the Sales Team.">
                             <div class="o_setting_left_pane">
@@ -50,62 +93,18 @@
                             </div>
                         </div>
                     </div>
-                    <div class="row mt16 o_settings_container">
-                        <div class="col-12 col-lg-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="group_use_recurring_revenues"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="group_use_recurring_revenues"/>
-                                <div class="text-muted">
-                                    Define recurring plans and revenues on Opportunities
-                                </div>
-                                <div attrs="{'invisible': [('group_use_recurring_revenues', '=', False)]}">
-                                    <button type="action" name="crm.crm_recurring_plan_action"
-                                            string="Manage Recurring Plans" icon="fa-arrow-right" class="oe_link"/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mt16 o_settings_container">
-                        <div class="col-12 col-lg-6 o_setting_box"
-                            title="This can be used to compute statistical probability to close a lead"
-                            name="predictive_lead_setting_container">
-                            <div class="o_setting_left_pane"></div>
-                            <div class="o_setting_right_pane">
-                                <b>Predictive Lead Scoring</b>
-                                <div class="text-muted">
-                                    The success rate is computed based on the stage, but you can add more fields in the statistical analysis.
-                                </div>
-                                <div class="mt16">
-                                    <field name="predictive_lead_scoring_fields" class="oe_inline" widget="many2many_tags" placeholder="Extra fields..."/>
-                                    <field name="predictive_lead_scoring_fields_str" invisible="1"/>
-                                </div>
-                                <div class="mt16">
-                                    Consider leads created as of the
-                                    <field name="predictive_lead_scoring_start_date_str" invisible="1"/>
-                                    <field name="predictive_lead_scoring_start_date" class="oe_inline" required="1"/>
-                                </div>
-                                <div class="mt16" groups="base.group_erp_manager">
-                                    <div class="text-muted">
-                                        Use this button to update the probabilities of all leads. This can take up to several minutes depending on how many there are.
-                                    </div>
-                                    <button name="action_reset_lead_probabilities" type="object" string="Update Probabilities" class="btn-primary"/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
                     <h2>Lead Generation</h2>
                     <div class="row mt16 o_settings_container" name="convert_visitor_setting_container">
                         <div class="col-lg-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="module_crm_iap_lead_website"/>
+                                <field name="module_mail_client_extension"/>
                             </div>
 
-                            <div class="o_setting_right_pane" id="crm_iap_lead_website_settings">
-                                <label string="Visits to Leads" for="module_crm_iap_lead_website"/>
+                            <div class="o_setting_right_pane" id="mail_client_extension">
+                                <label string="Outlook CRM Extension" for="module_mail_client_extension"/>
+                                <a href="https://www.odoo.com/documentation/user/crm/optimize/outlook_extension.html" title="Documentation" class="o_doc_link" target="_blank"></a>
                                 <div class="text-muted">
-                                    Convert visitors of your website into leads and perform data enrichment based on their IP address
+                                    Turn emails received in your Outlook mailbox into leads and log their content as internal notes.
                                 </div>
                             </div>
                         </div>
@@ -143,14 +142,13 @@
                         </div>
                         <div class="col-lg-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="module_mail_client_extension"/>
+                                <field name="module_crm_iap_lead_website"/>
                             </div>
 
-                            <div class="o_setting_right_pane" id="mail_client_extension">
-                                <label string="Outlook CRM Extension" for="module_mail_client_extension"/>
-                                <a href="https://www.odoo.com/documentation/user/crm/optimize/outlook_extension.html" title="Documentation" class="o_doc_link" target="_blank"></a>
+                            <div class="o_setting_right_pane" id="crm_iap_lead_website_settings">
+                                <label string="Visits to Leads" for="module_crm_iap_lead_website"/>
                                 <div class="text-muted">
-                                    Turn emails received in your Outlook mailbox into leads and log their content as internal notes.
+                                    Convert visitors of your website into leads and perform data enrichment based on their IP address
                                 </div>
                             </div>
                         </div>