From 7a6874ac9ea1c799cf52a50fb862e980f2ad4f55 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 1 Feb 2013 18:50:01 +0100
Subject: [PATCH] [FIX] crm opportunites search view

bzr revid: al@openerp.com-20130201175001-9znvmykt9udyxw62
---
 addons/crm/crm_lead_view.xml | 72 ++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 32 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dd391b8fec0..e1121e28d5f 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -337,18 +337,19 @@
                     <field name="section_id" context="{'invisible_section': False}"/>
                     <field name="country_id" context="{'invisible_country': False}"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                        <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
-                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
-                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                        <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Team" domain="[]" context="{'group_by':'section_id'}"/>
+                        <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Country" domain="[]" context="{'group_by':'country_id'}"/>
+                        <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Referrer" domain="[]" context="{'group_by':'referred'}"/>
+                        <filter string="Campaign" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Channel" domain="[]" context="{'group_by':'channel_id'}"/>
+                        <filter string="Creation" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     </group>
                     <group string="Display">
-                        <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
-                        <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
+                        <filter string="Show Countries" context="{'invisible_country': False}" help="Show Countries"/>
+                        <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
                     </group>
                </search>
             </field>
@@ -517,6 +518,7 @@
                     <field name="probability" avg="Avg. of Probability"/>
                     <field name="section_id" invisible="context.get('invisible_section', True)"/>
                     <field name="user_id"/>
+                    <field name="referred" invisible="1"/>
                     <field name="priority" invisible="1"/>
                     <field name="state" groups="base.group_no_one"/>
                     <field name="message_unread" invisible="1"/>
@@ -531,35 +533,41 @@
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
                 <search string="Search Opportunities">
-                    <field name="name" string="Opportunity"
-                        filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                    <field name="name" string="Opportunity" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/>
-                    <filter icon="terp-mail-message-new" string="Unread Messages" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
-                    <separator/>
-                    <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-camera_test" string="In Progress" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
-                    <separator/>
-                    <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities"/>
-                    <separator/>
-                    <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"/>
-                    <field name="user_id"/>
                     <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
+                    <field name="user_id"/>
                     <field name="partner_id"/>
+                    <separator/>
+                    <filter string="New" name="new" domain="[('state','=','draft')]" help="New Opportunities"/>
+                    <filter string="In Progress" name="open" domain="[('state','=','open')]" help="Open Opportunities"/>
+                    <filter string="Won" name="won" domain="[('state','=','done')]"/>
+                    <filter string="Lost" name="lost" domain="[('state','=','cancel')]"/>
+                    <filter string="Unassigned" domain="[('user_id','=', False)]" help="Unassigned Opportunities"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]" help="Unread messages"/>
+                    <filter string="Assigned to Me"
+                            domain="[('user_id','=',uid)]" context="{'invisible_section': False}"
+                            help="Opportunities that are assigned to me"/>
+                    <filter string="Assigned to My Team(s)"
+                            domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
+                            help="Opportunities that are assigned to any sale teams I am member of"/>
+                    <separator/>
                     <group expand="0" string="Group By..." colspan="16">
-                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                        <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
-                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
-                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}"/>
-                        <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
-                        <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}"/>
+                        <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Team" domain="[]" context="{'group_by':'section_id'}"/>
+                        <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Customer" help="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Country" domain="[]" context="{'group_by':'country_id'}"/>
+                        <filter string="Priority" domain="[]" context="{'group_by':'priority'}"/>
+                        <filter string="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}"/>
+                        <filter string="Referrer" domain="[]" context="{'group_by':'referred'}"/>
+                        <filter string="Campaign" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Channel" domain="[]" context="{'group_by':'channel_id'}"/>
+                        <filter string="Creation" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     </group>
                     <group string="Display">
                         <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
+                        <filter string="Show Countries" context="{'invisible_country': False}" help="Show Countries"/>
                     </group>
                 </search>
             </field>