From cd5c913576d8a06ef66f7e9ad5c8f8bb58e14eed Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 21 May 2012 15:28:47 +0530
Subject: [PATCH] [IMP] crm : added missing filter string and improve
 indentation in search view.

bzr revid: mdi@tinyerp.com-20120521095847-y7hcgl7v2byi7vpi
---
 addons/crm/crm_lead_view.xml                  | 20 +++++---
 addons/crm/crm_meeting_view.xml               |  6 ++-
 addons/crm/crm_phonecall_view.xml             | 12 +++--
 addons/crm/crm_report_view.xml                | 51 +++++++++----------
 addons/crm/report/crm_lead_report_view.xml    |  2 +-
 .../crm/report/crm_phonecall_report_view.xml  |  3 +-
 6 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9c3bd07562c..9f86b4b16dd 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -349,25 +349,28 @@
                 <field name="name" string="Lead / Customer"
                     filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                 <field name="user_id">
-                    <filter icon="terp-personal-"
+                    <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 icon="terp-personal+"
+                    <filter string="My Sales Team(s)"
+                        icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         help="My Sales Team(s)"/>
-                    <filter icon="terp-personal+"
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[]"
                         help="Show Sales Team"/>
                 </field>
                 <separator orientation="vertical"/>
                 <field name="country_id" context="{'invisible_country': False}">
-                    <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                    <filter string="Show countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
                 </field>
                 <newline/>
                 <group expand="0" string="Group By...">
@@ -597,18 +600,21 @@
                 <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 icon="terp-personal-"
+                    <filter string="Unassigned Opportunities"
+                        icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Opportunities" />
                 </field>
                 <field name="section_id"
                     context="{'invisible_section': False}"
                     widget="selection">
-                    <filter icon="terp-personal+"
+                    <filter string="My Sales Team(s)"
+                        icon="terp-personal+"
                         domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         context="{'invisible_section': False}"
                         help="My Sales Team(s)" />
-                    <filter icon="terp-personal+"
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[]"
                         help="Show Sales Team"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 24799e97421..7ada27c40db 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -278,12 +278,14 @@
                            <field name="name" string="Meeting / Partner"
                                filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
                            <field name="user_id">
-                               <filter icon="terp-personal"
+                               <filter string="My Meetings"
+                                   icon="terp-personal"
                                    domain="[('user_id','=',uid)]"
                                    help="My Meetings" />
                            </field>
                            <field name="section_id" widget="selection">
-                               <filter icon="terp-personal+"
+                               <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>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index af49956eda8..ec03b9d11ea 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -204,13 +204,15 @@
                <field name="name"/>
                <field name="partner_id"/>
                <field name="user_id">
-                   <filter icon="terp-personal-"
+                   <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 icon="terp-personal+"
+                   <filter string="My Sales Team(s)"
+                       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>
@@ -254,13 +256,15 @@
                <field name="name"/>
                <field name="partner_id"/>
                <field name="user_id">
-                   <filter icon="terp-personal-"
+                   <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 icon="terp-personal+"
+                   <filter string="My Sales Team(s)"
+                       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>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index e89e0c1a8d8..74443b135aa 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -163,13 +163,13 @@
             <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"/>
+                        <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="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
@@ -238,19 +238,18 @@
             <field name="type">search</field>
             <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"/>
+                    <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="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
-
-                   </group>
+                    </group>
                </search>
             </field>
         </record>
@@ -332,18 +331,18 @@
             <field name="type">search</field>
             <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"/>
+                    <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="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
-                   </group>
+                    </group>
                </search>
             </field>
     </record>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index e012d4745e4..3d91e65e540 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -114,7 +114,7 @@
                         <separator orientation="vertical" />
                         <field name="section_id"
                             context="{'invisible_section': False}">
-                            <filter 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)" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index ea210ddc85a..bd4453d6a02 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -78,7 +78,8 @@
                         <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
                             context="{'invisible_section': False}">
-                            <filter 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)" />