From 7c6a92fe527a29f18575c2c95613fc6b9bf18624 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 14:34:47 +0530
Subject: [PATCH] [IMP] crm_helpdesk: improved search views.

bzr revid: tpa@tinyerp.com-20120720090447-106h9k49evywj6fl
---
 addons/crm_helpdesk/crm_helpdesk_view.xml     | 60 ++++------------
 .../report/crm_helpdesk_report_view.xml       | 71 ++++++-------------
 2 files changed, 35 insertions(+), 96 deletions(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 4c2d81f94e3..f9f17781a61 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -152,54 +152,24 @@
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
                     <field name="name" string="Query"/>
-                    <separator orientation="vertical"/>
                     <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-check" string="New"
-                        name="current"
-                        domain="[('state','=','draft')]"
-                        help="New Helpdesk Request" />
-                    <filter icon="terp-camera_test"
-                        string="Open"
-                        domain="[('state','=','open')]"
-                        help="Open Helpdesk Request"
-                    />
-                    <filter icon="terp-gtk-media-pause"
-                        string="Pending"
-                        domain="[('state','=','pending')]"
-                        help="All pending Helpdesk Request"
-                    />
-                    <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="partner_id" />
-                    <field name="user_id" widget="selection"/>
-                    <field name="section_id" widget="selection" string="Sales Team"/>
-                    <newline/>
+                    <field name="user_id"/>
+                    <field name="section_id" string="Sales Team"/>
+                    <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Helpdesk Request" />
+                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Helpdesk Request" />
+                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="All pending Helpdesk Request" />
+                    <separator/>
+                    <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" />
                     <group expand="0" string="Group By...">
-                        <filter string="Partner" icon="terp-partner"
-                            domain="[]" help="Partner"
-                            context="{'group_by':'partner_id'}" />
-                        <filter string="Responsible" icon="terp-personal"
-                            domain="[]" help="Responsible User"
-                            context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]" help="Sales Team"
-                            context="{'group_by':'section_id'}" />
-                        <separator orientation="vertical"/>
-                        <filter string="Priority" icon="terp-rating-rated"
-                            domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
-                            context="{'group_by':'state'}" />
-                        <separator orientation="vertical"/>
-                        <filter string="Date" icon="terp-go-month"
-                            domain="[]" help="Request Date"
-                            context="{'group_by':'date'}" />
-                        <filter string="Deadline" icon="terp-go-month"
-                            domain="[]"
-                            context="{'group_by':'date_deadline'}" />
+                        <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}" />
+                        <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" help="Sales Team" context="{'group_by':'section_id'}" />
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Date" icon="terp-go-month" domain="[]" help="Request Date" context="{'group_by':'date'}" />
+                        <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}" />
                     </group>
                 </search>
             </field>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 6060c6c1f90..2c7a9f06654 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -53,65 +53,34 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <group>
-                        <filter string="New" icon="terp-check"
-                        domain="[('state','=','draft')]" />
-                        <filter string="Open" icon="terp-camera_test"
-                        domain="[('state','=','open')]" />
-                        <filter string="Closed" icon="terp-dialog-close"
-                        domain="[('state','=','cancel')]" />
-                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        <filter string="My Sales Team(s)"
-                            icon="terp-personal+"
-                            context="{'invisible_section': False}"
-                            domain="[('section_id.user_id','=',uid)]"
-                            help="My Sales Team(s)" />
-                        <filter string="My Company"
-                            icon="terp-go-home"
-                            context="{'invisible_section': False}"
-                            domain="[('section_id.user_id.company_id','=',uid)]"
-                            help="My company"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id" string="Salesperson"/>
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}"/>   
-                        <field name="company_id" groups="base.group_multi_company"/>
-                    </group>
-                    <newline/>
+                    <field name="user_id" string="Salesperson"/>
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>   
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <filter string="New" icon="terp-check" domain="[('state','=','draft')]" />
+                    <filter string="Open" icon="terp-camera_test" domain="[('state','=','open')]" />
+                    <filter string="Closed" icon="terp-dialog-close" domain="[('state','=','cancel')]" />
+                    <separator/>
+                    <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                    <separator/>
+                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
+                    <separator/>
+                    <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
                     <group expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
-                        <newline/>
                         <field name="create_date"/>
                         <field name="date_closed" string="Close Date"/>
                     </group>
-                    <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="Salesperson" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-                        <filter string="Partner" icon="terp-partner"
-                            domain="[]"
-                            context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical" />
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                         <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            groups="base.group_multi_company"
-                            context="{'group_by':'company_id'}" />
-                        <separator orientation="vertical" groups="base.group_multi_company"/>
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}" />
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" />
                     </group>
                 </search>
             </field>