From 3b07f7ac910ca9071373f94e509dfa965f0939cb Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 14:19:15 +0530
Subject: [PATCH 1/2] [IMP] crm_fundraising: improved search views.

bzr revid: tpa@tinyerp.com-20120720084915-av9aye0qzur1lv68
---
 .../crm_fundraising/crm_fundraising_view.xml  | 56 ++++--------
 .../report/crm_fundraising_report_view.xml    | 88 +++++--------------
 2 files changed, 39 insertions(+), 105 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 9e67a4001a7..6d7d491bfa3 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -172,50 +172,24 @@
                 <field name="type">search</field>
                 <field name="arch" type="xml">
                     <search string="Search Funds">
-                        <group>
                             <field name="name" string="Fund Description"/>
-                            <separator orientation="vertical" />
-                            <filter icon="terp-check" string="New"
-                                domain="[('state','=','draft')]" name="current"
-                                help="New Funds" />
-                            <filter icon="terp-camera_test" string="Open"
-                                domain="[('state','=','open')]"
-                                help="Open Funds" />
-                            <filter icon="terp-gtk-media-pause"
-                                string="Pending"
-                                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="user_id" 
-                                widget="selection"/>
-                            <field name="section_id" widget="selection" string="Sales Team"/>
-                        </group>
-                        <newline/>
+                            <field name="user_id"/>
+                            <field name="section_id" string="Sales Team"/>
+                            <filter icon="terp-check" string="New" domain="[('state','=','draft')]" name="current" help="New Funds" />
+                            <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Funds" />
+                            <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Funds" />
+                            <separator/>
+                            <filter string="Unassigned" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned" />
+                            <separator/>
+                            <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" />
                         <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'}" />
-                            <filter string="Category" help="Fund Category"
-                                icon="terp-stock_symbol-selection" domain="[]"
-                                context="{'group_by':'categ_id'}" />
-                            <filter string="Payment Mode" help="Payment Mode"
-                                icon="terp-dolar" domain="[]"
-                                context="{'group_by':'type_id'}" />
-                            <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
-                                context="{'group_by':'state'}" />
+                            <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
+                            <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                            <filter string="Category" help="Fund Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+                            <filter string="Payment Mode" help="Payment Mode" icon="terp-dolar" domain="[]" context="{'group_by':'type_id'}" />
+                            <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
                         </group>
                     </search>
                 </field>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 5a3ed924567..3459495f671 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -77,74 +77,34 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group>
-                        <filter icon="terp-document-new"
-                            string="New"
-                            domain="[('state','=','draft')]"/>
-                        <filter icon="terp-camera_test"
-                            string="Open"
-                            domain="[('state','=','open')]"/>
-                        <filter icon="terp-gtk-media-pause"
-                            string="Pending"
-                            domain="[('state','=','pending')]"/>
-                        <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"/>
-                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        <separator orientation="vertical"/>
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="user_id" string="Salesperson"/>
-                    </group>
-                    <newline/>
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="user_id" string="Salesperson"/>
+                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
+                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
+                    <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"/>
+                    <separator/>
+                    <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                     <group  expand="0" string="Extended Filters...">
-                        <filter icon="terp-dialog-close"
-                            string="Done"
-                            domain="[('state','=','done')]"/>
-                        <filter icon="gtk-cancel"
-                            string="Cancel"
-                            domain="[('state','=','cancel')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                        <field name="categ_id" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
                         <field name="create_date"/>
+                        <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                        <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]"/>
                     </group>
-                    <newline/>
                     <group  expand="1" string="Group By...">
-                        <filter string="Salesperson" name="Salesperson" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
-                        <filter string="Payment Mode" help="Payment Mode"
-                            icon="terp-dolar" domain="[]"
-                            context="{'group_by':'type_id'}" />
-                        <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 fundraising"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}"
-                            help="Month of fundraising"/>
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
+                        <filter string="Salesperson" name="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="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+                        <filter string="Payment Mode" help="Payment Mode" icon="terp-dolar" domain="[]" context="{'group_by':'type_id'}" />
+                        <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 fundraising"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of fundraising"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" />
                     </group>
                 </search>
             </field>

From eeeca371e8d1ccd92aa790d12429828ac2beb0f1 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 20 Jul 2012 14:29:33 +0530
Subject: [PATCH 2/2] [IMP] improved view.

bzr revid: tpa@tinyerp.com-20120720085933-y92kzccb3vf3lpx2
---
 .../crm_fundraising/crm_fundraising_view.xml  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 6d7d491bfa3..3abfbe89eab 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -172,18 +172,18 @@
                 <field name="type">search</field>
                 <field name="arch" type="xml">
                     <search string="Search Funds">
-                            <field name="name" string="Fund Description"/>
-                            <field name="state"/>
-                            <field name="user_id"/>
-                            <field name="section_id" string="Sales Team"/>
-                            <filter icon="terp-check" string="New" domain="[('state','=','draft')]" name="current" help="New Funds" />
-                            <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Funds" />
-                            <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Funds" />
-                            <separator/>
-                            <filter string="Unassigned" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned" />
-                            <separator/>
-                            <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" />
+                        <field name="name" string="Fund Description"/>
+                        <field name="state"/>
+                        <field name="user_id"/>
+                        <field name="section_id" string="Sales Team"/>
+                        <filter icon="terp-check" string="New" domain="[('state','=','draft')]" name="current" help="New Funds" />
+                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Funds" />
+                        <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Funds" />
+                        <separator/>
+                        <filter string="Unassigned" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned" />
+                        <separator/>
+                        <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" />
                         <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'}" />