From 329518efbeb72e487179b148161662377ed2ce3e Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Jul 2012 12:15:37 +0530
Subject: [PATCH] [IMP] project_issue: improved search view.

bzr revid: tpa@tinyerp.com-20120723064537-yfxt2pjhrwx4ma6h
---
 addons/project_issue/project_issue_view.xml   | 78 +++++++------------
 .../report/project_issue_report_view.xml      | 67 +++++-----------
 2 files changed, 44 insertions(+), 101 deletions(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e730805fb46..e96d416e51f 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -48,7 +48,6 @@
             <field name="arch" type="xml">
                 <search string="Issue Version">
                     <field name="name" string="Issue Version"/>
-                    <separator orientation="vertical"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -206,46 +205,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
-                    <group>
-                        <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-mail-message-new"
-                            string="Inbox" help="Unread messages"
-                            name="needaction_pending"
-                            domain="[('needaction_pending','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
-                        <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
-                        <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
-                        <separator orientation="vertical"/>
-                        <field name="user_id"/>
-                        <field name="project_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                    <field name="user_id"/>
+                    <field name="project_id"/>
+                    <field name="id"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <separator/>
+                    <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
+                    <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
+                    <separator/>
+                    <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
                     <group expand="0" string="Group By..." >
-                        <filter string="Responsible" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" icon="terp-partner" domain="[]"
-                            context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Project"  icon="terp-folder-violet" domain="[]"
-                            context="{'group_by':'project_id'}"/>
-                        <filter string="Version" icon="terp-gtk-jump-to-rtl"
-                            domain="[]" context="{'group_by':'version_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"
-                            context="{'group_by':'categ_id'}"/>
-                        <filter string="Priority" icon="terp-rating-rated" domain="[]"
-                            context="{'group_by':'priority'}"/>
-                        <filter string="Stage" icon="terp-stage" domain="[]"
-                            context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
-                            context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Project"  icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Version" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'version_id'}"/>
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
                     </group>
                 </search>
             </field>
@@ -363,18 +342,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
-                    <group>
-                        <field name="name" string="Feature description"/>
-                        <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
-                        <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id"/>
-                        <field name="project_id" string="Project"/>
-                        <field name="state" groups="base.group_no_one"/>
-                    </group>
+                    <field name="name" string="Feature description"/>
+                    <field name="date"/>
+                    <field name="user_id"/>
+                    <field name="project_id" string="Project"/>
+                    <field name="state" groups="base.group_no_one"/>
+                    <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
+                    <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
                 </search>
             </field>
         </record>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 862f52b1931..634e40a7d56 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -52,61 +52,30 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                   <group>
-                        <field name="creation_date"/>
-                        <separator orientation="vertical" />
-                        <filter  icon="terp-camera_test"
-                            string="New"
-                            domain="[('state','=','draft')]"/>
-                        <filter  icon="terp-check"
-                            string="To Do"
-                            domain="[('state','=','open')]"/>
-                        <filter icon="terp-gtk-media-pause"
-                            string="Pending"
-                            domain="[('state','=','pending')]"/>
-                        <filter icon="terp-dialog-close"
-                            string="Done"
-                            domain="[('state','=','done')]"/>
-                          <separator orientation="vertical" />
-                          <field name="project_id"/>
-                          <field name="user_id" widget="selection"/>
-                          <field name="partner_id"/>
-                          <field name="version_id" widget="selection" />
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="Assigned to" name="Responsible" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
+                    <field name="creation_date"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                    <field name="version_id"/>
+                    <filter  icon="terp-camera_test" string="New" domain="[('state','=','draft')]"/>
+                    <filter  icon="terp-check" string="To Do" domain="[('state','=','open')]"/>
+                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
+                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                    <group  expand="1" string="Group By...">
+                        <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Sale Team" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-                        <separator orientation="vertical" />
+                        <filter string="Sale Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
                         <filter string="Project"  name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}" />
                         <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
                         <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/>
-                        <separator orientation="vertical" />
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <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="[]"
-                            context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
-
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
-
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
                    </group>
                </search>
             </field>