From aabc1445abc2325a87917cfb7ffc4eaba537227f Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Thu, 19 Oct 2017 15:33:51 +0200
Subject: [PATCH] [IMP] crm: add and remove some filters in crm

- Removed 'Leads By Salesperson', 'Team Activities' filters in Pipeline Analysis.
- Renamed 'Opportunities Won Per Team' to 'Won by Channel'.
- Added Opport to Closed Today, This Week, This Month filters in Pipeline.
- Renamed 'Expected Revenue by Team' to 'Expected Revenue by Channel'.
- Renamed 'Won By Country' to 'Won by Country'
---
 .../report/crm_opportunity_report_views.xml    | 18 +++---------------
 addons/crm/views/crm_lead_views.xml            | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/addons/crm/report/crm_opportunity_report_views.xml b/addons/crm/report/crm_opportunity_report_views.xml
index 36312e6cec7..6728604b8d8 100644
--- a/addons/crm/report/crm_opportunity_report_views.xml
+++ b/addons/crm/report/crm_opportunity_report_views.xml
@@ -58,37 +58,25 @@
             <field name="context">{'group_by': ['date_closed:month'],'col_group_by': ['create_date:month'], 'measures': ['__count']}</field>
         </record>
         <record id="filter_opportunity_opportunities_won_per_team" model="ir.filters">
-            <field name="name">Opportunities Won Per Team</field>
+            <field name="name">Won by Channel</field>
             <field name="model_id">crm.opportunity.report</field>
             <field name="domain">[('probability', '=', 100)]</field>
             <field name="user_id" eval="False"/>
             <field name="context">{'group_by': ['team_id'], 'col_group_by': ['date_last_stage_update:month'], 'measures': ['expected revenue']}</field>
         </record>
-        <record id="filter_opportunity_salesperson" model="ir.filters">
-            <field name="name">Leads By Salespersons</field>
-            <field name="model_id">crm.opportunity.report</field>
-            <field name="user_id" eval="False"/>
-            <field name="context">{'col_group_by': ['create_date:month'], 'group_by': ['user_id'], 'measures': ['__count']}</field>
-        </record>
         <record id="filter_opportunity_country" model="ir.filters">
-            <field name="name">Won By Country</field>
+            <field name="name">Won by Country</field>
             <field name="model_id">crm.opportunity.report</field>
             <field name="user_id" eval="False"/>
             <field name="domain">[('probability', '=', 100)]</field>
             <field name="context">{'col_group_by': ['create_date:month'], 'group_by': ['country_id']}</field>
         </record>
         <record id="filter_opportunity_expected_revenue" model="ir.filters">
-            <field name="name">Expected Revenue by Team</field>
+            <field name="name">Expected Revenue by Channel</field>
             <field name="model_id">crm.opportunity.report</field>
             <field name="user_id" eval="False"/>
             <field name="context">{'group_by': ['create_date:month', 'team_id'], 'measures': ['expected_revenue', '__count']}</field>
         </record>
-        <record id="ir_filters_crm_opportunity_report_next_action" model="ir.filters">
-            <field name="name">Team Activities</field>
-            <field name="model_id">crm.opportunity.report</field>
-            <field name="user_id" eval="False"/>
-            <field name="context">{'group_by': ['team_id'], 'measures': ['nbr_activities']}</field>
-        </record>
 
         <!-- Opportunities by user and team Search View -->
         <record id="crm_opportunity_report_view_search" model="ir.ui.view">
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 9df981d08d9..60e7c350c70 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -642,6 +642,21 @@
                     <filter string="Overdue Opportunities" name="overdue_opp"
                             domain="[('date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                             help="Show all opportunities with a deadline for which the next action date is before today"/>
+
+                    <filter string="To Close Today" name="close_today"
+                            domain="[('date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+                    <filter string="To Close This Week" name="close_this_week"
+                            domain="[
+                                '&amp;',
+                                ('date_deadline', '&gt;=', (context_today() + relativedelta(weeks=-1,days=1,weekday=0)).strftime('%Y-%m-%d')),
+                                ('date_deadline', '&lt;=', (context_today() + relativedelta(weekday=6)).strftime('%Y-%m-%d')),
+                            ]"/>
+                    <filter string="To Close This Month" name="close_this_month"
+                            domain="[
+                                '&amp;',
+                                ('date_deadline', '&gt;=', (context_today() + relativedelta(day=1)).strftime('%Y-%m-%d')),
+                                ('date_deadline', '&lt;=', (context_today() + relativedelta(months=1, day=1, days=-1)).strftime('%Y-%m-%d')),
+                            ]"/>
                     <separator/>
                     <filter string="Lost" name="lost" domain="[('active', '=', False)]"/>
                     <filter string="Won" name="won"