From 67d5ab5ae0e2c8a1513f2da00e7179b9b03c32dd Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 22 May 2012 11:40:02 +0530
Subject: [PATCH] [IMP] crm : Removed all filters related to a date field and
 added the related date field in the search view.

bzr revid: mdi@tinyerp.com-20120522061002-ux5oppi3a52srv1e
---
 addons/crm/crm_lead_view.xml                  |  9 +---
 addons/crm/crm_phonecall_view.xml             | 27 +-----------
 addons/crm/crm_report_view.xml                | 43 +++++--------------
 addons/crm/report/crm_lead_report_view.xml    | 11 -----
 .../crm/report/crm_phonecall_report_view.xml  | 11 -----
 5 files changed, 14 insertions(+), 87 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9f86b4b16dd..e7dad4679b6 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -337,14 +337,6 @@
                     name="pending"
                     domain="[('state','=','pending')]"/>
 
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-today" string="Today"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                    help="Todays' Leads" />
-                <filter icon="terp-go-week" string="7 Days"
-                    help="Leads creating during last 7 days"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
-                />
                 <separator orientation="vertical"/>
                 <field name="name" string="Lead / Customer"
                     filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
@@ -372,6 +364,7 @@
                 <field name="country_id" context="{'invisible_country': False}">
                     <filter string="Show countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
                 </field>
+                </field name="create_date"/>
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index ec03b9d11ea..611ab3ce1f3 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -188,19 +188,6 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
-                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                   name="today"
-                   help="Todays's Phonecalls"
-               />
-               <filter icon="terp-go-week"
-                   string="7 Days"
-                   help="Phonecalls during last 7 days"
-                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-               />
-
-               <separator orientation="vertical"/>
                <field name="name"/>
                <field name="partner_id"/>
                <field name="user_id">
@@ -215,6 +202,7 @@
                        icon="terp-personal+"
                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
+               <field name="date"/>
                </field>
                <newline/>
                <group expand="0" string="Group By...">
@@ -239,18 +227,6 @@
         <field name="arch" type="xml">
             <search string="Scheduled Phonecalls">
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
-                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                   name="today"
-                   help="Todays's Phonecalls"
-               />
-               <filter icon="terp-go-week"
-                   string="7 Days"
-                   help="Phonecalls during last 7 days"
-                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-               />
 
                <separator orientation="vertical"/>
                <field name="name"/>
@@ -267,6 +243,7 @@
                        icon="terp-personal+"
                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sales Team(s)" />
+               <field name="date"/>
                </field>
                <newline/>
                <group expand="0" string="Group By...">
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 74443b135aa..aaad73af29a 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -69,17 +69,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Team and Type for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Team and Type for this month" />
-                           <separator orientation="vertical"/>
-                           <field name="section_id"
-                               widget="selection" />
-                           <field name="category2_id"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="section_id" widget="selection" />
+                        <field name="category2_id"/>
                         <field name="nbr"/>
                         <field name="state"/>
                    </group>
@@ -163,13 +157,8 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                    <group>
-                        <filter string="This Year" icon="terp-go-year"
-                            domain="[('name','=',time.localtime()[0])]"
-                            help="Cases by Team and Stage for this year" />
-                        <filter string="This Month" icon="terp-go-month"
-                            domain="[('month','=',time.localtime()[1])]"
-                            help="Cases by Team and Stage for this month" />
-                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
@@ -239,13 +228,8 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
                     <group>
-                        <filter string="This Year" icon="terp-go-year"
-                            domain="[('name','=',time.localtime()[0])]"
-                            help="Cases by Section, Category and Stage for this year" />
-                        <filter string="This Month" icon="terp-go-month"
-                            domain="[('month','=',time.localtime()[1])]"
-                            help="Cases by Section, Category and Stage for this month" />
-                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
@@ -332,13 +316,8 @@
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
                     <group>
-                        <filter string="This Year" icon="terp-go-year"
-                            domain="[('name','=',time.localtime()[0])]"
-                            help="Cases by User for this year" />
-                        <filter string="This Month" icon="terp-go-month"
-                            domain="[('month','=',time.localtime()[1])]"
-                            help="Cases by User for this month" />
-                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 3d91e65e540..47784dbf76b 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -72,17 +72,6 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Leads/Opportunities created in current year"/>
-                        <separator orientation="vertical" />
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-personal"
                             name="lead"
                             string="Lead"
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index bd4453d6a02..f3d39c08efe 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -52,17 +52,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                               help="Phone calls made in current year"/>
-                        <separator orientation="vertical" />
-                        <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Phone calls made in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Phone calls made in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-gtk-go-back-rtl"
                             string="Todo"
                             domain="[('state','in',('draft','open'))]"