From 65d89ad132bf41387dcad5902026d84271ff1737 Mon Sep 17 00:00:00 2001
From: std-odoo <std@odoo.com>
Date: Mon, 15 Jun 2020 06:24:51 +0000
Subject: [PATCH] [IMP] crm: improve CRM views

Purpose
=======
Rename "Follow-up" tab into "Extra Information" in the lead form view
Remove the create option on the language field in the lead form view.
Align vertically the expected revenue with the PLS in the lead form view.

Add the "Planned revenue" label in the quick create form.

Improve the pipeline activities default filter.

Improve the sale team form view.

Task-2277242

closes odoo/odoo#52965

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/crm/report/crm_activity_report_views.xml | 4 ++--
 addons/crm/views/crm_lead_views.xml             | 7 ++++---
 addons/crm/views/crm_team_views.xml             | 6 ++++--
 addons/sale/views/sales_team_views.xml          | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/crm/report/crm_activity_report_views.xml b/addons/crm/report/crm_activity_report_views.xml
index caba844c3d3..037367391a7 100644
--- a/addons/crm/report/crm_activity_report_views.xml
+++ b/addons/crm/report/crm_activity_report_views.xml
@@ -53,9 +53,9 @@
                     <separator/>
                     <filter string="Won" name="won" domain="[('stage_id.is_won', '=', True)]"/>
                     <separator/>
-                    <filter string="Completed Last 365 Days" name="completion_date" domain="[
+                    <filter string="Trailing 12 months" name="completion_date" domain="[
                         ('date', '>=', (datetime.datetime.combine(context_today() + relativedelta(days=-365), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),
-                        ('date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))]"/>
+                        ('date', '>=', (datetime.datetime.combine(context_today(), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))]"/>
                     <separator/>
                     <filter name="filter_date" date="date"/>
                     <separator/>
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 073359131d1..ce4f0bbc754 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -45,7 +45,7 @@
                             <label for="name" class="oe_edit_only" string="Lead" attrs="{'invisible': [('type', '=', 'opportunity')]}"/>
                             <label for="name" class="oe_edit_only" attrs="{'invisible': [('type', '=', 'lead')]}"/>
                             <h1><field name="name" placeholder="e.g. Product Pricing"/></h1>
-                            <h2 class="o_row row no-gutters d-flex">
+                            <h2 class="o_row row no-gutters d-flex align-items-end">
                                 <div class="col" attrs="{'invisible': [('type', '=', 'lead')]}">
                                     <label for="planned_revenue" class="oe_edit_only" />
                                     <div class="o_row">
@@ -238,7 +238,7 @@
                                     </group>
                                 </group>
                             </page>
-                            <page name="lead" string="Follow-up" attrs="{'invisible': [('type', '=', 'lead')]}">
+                            <page name="lead" string="Extra Information" attrs="{'invisible': [('type', '=', 'lead')]}">
                                 <group>
                                     <group string="Contact Information">
                                         <field name="partner_name"/>
@@ -252,7 +252,7 @@
                                             <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
                                         </div>
                                         <field name="website" widget="url" placeholder="e.g. https://www.odoo.com"/>
-                                        <field name="lang_id"/>
+                                        <field name="lang_id" options="{'no_create': True}"/>
                                     </group>
                                     <group class="mt48">
                                         <label for="contact_name"/>
@@ -405,6 +405,7 @@
                         <field name="name" placeholder="e.g. Product Pricing" />
                         <field name="email_from" string="Email" />
                         <field name="phone" string="Phone" />
+                        <label for="planned_revenue"/>
                         <div class="o_row">
                             <field name="planned_revenue" class="oe_inline mr-5" widget="monetary" options="{'currency_field': 'company_currency'}"/>
                             <field name="priority" class="oe_inline" nolabel="1" widget="priority"/>
diff --git a/addons/crm/views/crm_team_views.xml b/addons/crm/views/crm_team_views.xml
index b1a547b78b5..3102f0028a6 100644
--- a/addons/crm/views/crm_team_views.xml
+++ b/addons/crm/views/crm_team_views.xml
@@ -126,8 +126,10 @@
                         <field name="alias_id" class="oe_read_only oe_inline"
                             string="Email Alias" required="0"/>
                         <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
-                            <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
-                            <button  icon="fa-arrow-right" type="action" name="%(base_setup.action_general_configuration)d" string="Configure a custom domain" class="btn-link" attrs="{'invisible': [('alias_domain', '!=', False)]}"/>
+                            <div attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                            </div>
+                            <button icon="fa-arrow-right" type="action" name="%(base_setup.action_general_configuration)d" string="Configure a custom domain" class="p-0 btn-link" attrs="{'invisible': [('alias_domain', '!=', False)]}"/>
                         </div>
                     </div>
                     <field name="alias_contact"
diff --git a/addons/sale/views/sales_team_views.xml b/addons/sale/views/sales_team_views.xml
index 2f010d4bcab..41b6df5d71e 100644
--- a/addons/sale/views/sales_team_views.xml
+++ b/addons/sale/views/sales_team_views.xml
@@ -11,7 +11,7 @@
                         <field name="use_quotations"/><label for="use_quotations"/>
                     </div>
                 </xpath>
-                <xpath expr="//field[@name='user_id']" position="after">
+                <xpath expr="//group[@name='right']" position="inside">
                     <field name="invoiced_target" widget="monetary"/>
                 </xpath>
             </field>