From 93273fe850d723e475aa1a0e8ad47b0d0836ffd5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 11 Jun 2012 18:22:53 +0200
Subject: [PATCH] [IMP] improved search views

bzr revid: qdp-launchpad@openerp.com-20120611162253-mfz8f7k7dll7q4i9
---
 addons/account/account_invoice_view.xml       |  6 +-
 addons/account/account_view.xml               |  3 +-
 .../account_analytic_entries_report_view.xml  |  5 +-
 .../account_analytic_analysis_menu.xml        | 13 ++---
 addons/caldav/caldav_view.xml                 |  6 +-
 addons/crm/crm_lead_view.xml                  | 44 ++++++++-------
 addons/crm/crm_meeting_view.xml               | 10 ++--
 addons/crm/crm_phonecall_menu.xml             |  2 +-
 addons/crm/crm_phonecall_view.xml             | 56 +++----------------
 addons/crm/report/crm_lead_report_view.xml    | 16 +++---
 .../crm/report/crm_phonecall_report_view.xml  | 15 +++--
 addons/crm_claim/crm_claim_view.xml           | 10 ++--
 .../crm_fundraising/crm_fundraising_view.xml  | 23 ++++----
 addons/crm_helpdesk/crm_helpdesk_view.xml     | 12 ++--
 14 files changed, 87 insertions(+), 134 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 96a0ab609f8..b0f6060698e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -411,13 +411,13 @@
                         <separator orientation="vertical"/>
                         <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
+                        <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal" />
+                        <separator orientation="vertical"/>
                         <field name="number"
                             string="Reference"
                             filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
-                        <field name="user_id" widget="selection" string="Salesperson">
-                            <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal" />
-                        </field>
+                        <field name="user_id" widget="selection" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f99d364951e..a572118b478 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1163,8 +1163,7 @@
                         <field name="move_id" string="Number (Move)"/>
                         <field name="date"/>
                         <field name="account_id"/>
-                        <field name="partner_id">
-                        </field>
+                        <field name="partner_id"/>
                     </group>
                     <newline/>
                     <group>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 18bda6cbbab..9759e31ad78 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -35,11 +35,10 @@
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
               <group>
+                    <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" />
-                    <field name="user_id">
-                    <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
-                    </field>
+                    <field name="user_id"/>
                     <field name="date"/>
                     <field name="day"/>
                 </group>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 5e8bc754d45..a019fd08793 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -26,17 +26,14 @@
                         <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]"
                             name="renew"
                             help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
-
+                        <separator orientation="vertical"/>
+                        <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                        <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
                         <separator orientation="vertical"/>
                         <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
-                        <field name="partner_id">
-                            <filter string="Partner on analytic account" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
-                        </field>
-                        <field name="user_id">
-                            <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
-                        </field>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
                         <field name="date"/>
-
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 60d74e69d1e..e4e0679a710 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -162,11 +162,11 @@
                     <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/>
                     <filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/>
                     <separator orientation="vertical"/>
+                    <filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
+                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="type"/>
-                    <field name="user_id" widget="selection">
-                        <filter  string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
-                    </field>
+                    <field name="user_id" widget="selection"/>
                     <field name="collection_id"/>
                 </search>
             </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4eebb83ce04..3426839eb5b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -296,28 +296,27 @@
                     domain="[('state','=','pending')]"/>
 
                 <separator orientation="vertical"/>
-                <field name="name" string="Lead / Customer"
-                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                <field name="user_id">
-                    <filter string="Unassigned Leads"
+                <filter string="Unassigned Leads"
                         icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
-                </field>
-                <field name="subjects"/>
-                <field name="section_id" widget="selection"
-                    context="{'invisible_section': False}">
-                    <filter string="My Sales Team(s)"
+                <filter string="Leads Assigned to Me or My Team(s)"
                         icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        help="My Sales Team(s)"/>
-                    <filter string="Show Sales Team"
+                        help="Leads that are assigned to one of the sale teams I manage, or to me"/>
+                <separator orientation="vertical"/>
+                <filter string="Show Sales Team"
                         icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[]"
                         help="Show Sales Team"/>
-                </field>
+                <field name="name" string="Lead / Customer"
+                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                <field name="user_id"/>
+                <field name="subjects"/>
+                <field name="section_id" widget="selection"
+                    context="{'invisible_section': False}"/>
                 <separator orientation="vertical"/>
                 <field name="country_id" context="{'invisible_country': False}">
                     <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
@@ -535,30 +534,33 @@
             <search string="Search Opportunities">
                 <filter icon="terp-check"
                     string="New"  help="New Opportunities"
+                    name="new"
                     domain="[('state','=','draft')]"/>
                 <filter icon="terp-camera_test"
                     string="Open"  help="Open Opportunities"
+                    name="open"
                     domain="[('state','=','open')]"/>
                 <filter icon="terp-gtk-media-pause"
                     string="Pending"  help="Pending Opportunities"
+                    name="pending"
                     domain="[('state','=','pending')]"/>
                 <separator orientation="vertical"/>
-                <field name="name" string="Opportunity / Customer"
-                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                <field name="user_id">
-                    <filter string="Unassigned Opportunities"
+                <filter string="Unassigned Opportunities"
                         icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Opportunities" />
-                </field>
+               <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                        context="{'invisible_section': False}"
+                        help="Opportunities that are assigned to either me or one of the sale teams I manage" />
+                <separator orientation="vertical"/>
+                <field name="name" string="Opportunity / Customer"
+                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                <field name="user_id"/>
                 <field name="country"/>
                 <field name="partner_id"/>
                 <field name="section_id"
                     context="{'invisible_section': False, 'default_section_id': self}">
-                    <filter string="My Sales Team(s)"  icon="terp-personal+"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        context="{'invisible_section': False}"
-                        help="My Sales Team(s)" />
                     <filter string="Show Sales Team"
                         icon="terp-personal+"
                         context="{'invisible_section': False}"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index f1461346bce..2e7ae6e1454 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -275,14 +275,14 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group>
-                           <field name="name" string="Meeting / Partner"
-                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
-                           <field name="user_id">
-                               <filter string="My Meetings"
+                           <filter string="My Meetings"
                                    icon="terp-personal"
                                    domain="[('user_id','=',uid)]"
                                    help="My Meetings" />
-                           </field>
+                           <separator orientation="vertical"/>
+                           <field name="name" string="Meeting / Partner"
+                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
+                           <field name="user_id"/>
                            <field name="partner_id"/>
                        </group>
                 </search>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index c6fc9b404a4..f62b8cfb33b 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -106,7 +106,7 @@
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain">[('state','!=','done')]</field>
         <field name="context" eval="'{\'default_state\':\'open\'}'"/>
-        <field name="search_view_id" ref="crm.view_crm_case_scheduled_phonecalls_filter"/>
+        <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help">Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 2347a8322f5..ba6de07ecbf 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -179,63 +179,23 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <field name="name"/>
-               <field name="partner_id"/>
-               <field name="user_id">
-                   <filter string="Unassigned Phonecalls"
+               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
+               <separator orientation="vertical"/>
+              <filter string="Unassigned Phonecalls"
                        icon="terp-personal-"
                        domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls" />
-               </field>
-               <field name="section_id"
-                   widget="selection" string="Sales Team">
-                   <filter string="My Sales Team(s)"
+                       help="Unassigned Phonecalls"/>
+               <filter string="Phone Calls Assigned to Me or My Team(s)"
                         icon="terp-personal+"
                         domain="['|', ('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...">
-                   <filter string="Partner" icon="terp-partner" domain="[]"
-                       context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-personal"
-                       domain="[]" context="{'group_by':'user_id'}" />
-                   <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-go-month" help="Creation Date"
-                       domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-go-month" domain="[]"
-                       context="{'group_by':'date'}" help="Date of Call" />
-               </group>
-           </search>
-        </field>
-    </record>
-    <!-- Scheduled a phonecall search view-->
-    <record id="view_crm_case_scheduled_phonecalls_filter" model="ir.ui.view">
-        <field name="name">CRM - Scheduled Calls Search</field>
-        <field name="model">crm.phonecall</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Scheduled Phonecalls">
-               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
-
+                       help="Phone Calls that are assigned to me or to my team(s)" />
                <separator orientation="vertical"/>
                <field name="name"/>
                <field name="partner_id"/>
-               <field name="user_id">
-                   <filter string="Unassigned Phonecalls"
-                       icon="terp-personal-"
-                       domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls" />
-               </field>
+               <field name="user_id"/>
                <field name="section_id"
-                   widget="selection" string="Sales Team">
-                   <filter string="My Sales Team(s)"
-                        icon="terp-personal+"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="My Sales Team(s)" />
+                   widget="selection" string="Sales Team"/>
                <field name="date"/>
-               </field>
                <newline/>
                <group expand="0" string="Group By...">
                    <filter string="Partner" icon="terp-partner" domain="[]"
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 569b3ba57de..dc23c256f2f 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -99,18 +99,16 @@
                             string="Closed"
                             domain="[('state','=','done')]"
                             help="Leads/Opportunities which are in done state"/>
-
                         <separator orientation="vertical" />
-                        <field name="section_id"
-                            context="{'invisible_section': False}">
-                            <filter string="My Sales Team(s)" icon="terp-personal+"
+                        <filter string="My Sales Team(s)" icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)" />
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                                help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
+                        <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
+                        <separator orientation="vertical" />
+                        <field name="section_id"
+                            context="{'invisible_section': False}"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 65ac10906b6..cd54f8e4e37 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -65,17 +65,16 @@
                             domain="[('state','=','pending')]"
                             help="Phone calls which are in pending state"/>
                         <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-                            <filter string="My Sales Team(s)"
+                        <filter string="My Sales Team(s)"
                                 icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)" />
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                                help="Phone calls that are assigned to one of the sale teams I manage"/>
+                        <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7bedc12dac7..224446672e7 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -210,14 +210,14 @@
                         help="All pending Claims"
                     />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
-                        <filter string="Unassigned Claims"
+                    <filter string="Unassigned Claims"
                             icon="terp-personal-"
                             domain="[('user_id','=', False)]"
                             help="Unassigned Claims" />
-                    </field>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" widget="selection"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 406fd828088..7d515650944 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -174,22 +174,21 @@
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
                             <separator orientation="vertical" />
+                            <filter string="Unassigned"
+                                    icon="terp-personal-"
+                                    domain="[('user_id','=', False)]"
+                                    help="Unassigned" />
+                            <filter string="Assigned to Me or to My Sales Team(s)" 
+                                    icon="terp-personal+"
+                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                                    help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
+                            <separator orientation="vertical" />
                             <field name="state"/>
                             <field name="name"
                                 string="Fund Description" />
                             <field name="user_id"
-                                widget="selection">
-                                <filter string="Unassigned"
-                                    icon="terp-personal-"
-                                    domain="[('user_id','=', False)]"
-                                    help="Unassigned" />
-                            </field>
-                            <field name="section_id" widget="selection" string="Sales Team">
-                                <filter string="My Sales Team(s)" 
-                                    icon="terp-personal+"
-                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                                    help="My Sales Team(s)" />
-                            </field>
+                                widget="selection"/>
+                            <field name="section_id" widget="selection" string="Sales Team"/>
                         </group>
                         <newline/>
                         <group expand="0" string="Group By...">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 7d9bb596a2a..811e5a1cc90 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -164,15 +164,15 @@
                         help="All pending Helpdesk Request"
                     />
                     <separator orientation="vertical"/>
+                    <filter string="Assigned to Me or My Sales Team(s)"
+                            icon="terp-personal+"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
+                    <separator orientation="vertical"/>
                     <field name="name" string="Query"/>
                     <field name="partner_id" />
                     <field name="user_id" widget="selection"/>
-                    <field name="section_id" widget="selection" string="Sales Team">
-                        <filter string="My Sales Team(s)"
-                            icon="terp-personal+"
-                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                            help="My Sales Team(s)" />
-                    </field>
+                    <field name="section_id" widget="selection" string="Sales Team"/>
                     <field name="date"/>
                     <newline/>
                     <group expand="0" string="Group By...">