From 842873c92cf58abcc37357decce8f56a68a44e85 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 21 Jun 2010 13:37:25 +0530
Subject: [PATCH] [IMP]: membership: Improvement in membership search view

bzr revid: atp@tinyerp.co.in-20100621080725-1zcpfjfqdkrw34gk
---
 addons/membership/membership_view.xml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index d64c7ae410c..b2e636ca13b 100755
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -118,17 +118,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <field name="category_id" position="after">
-                       <filter icon="terp-partner" domain="[('membership_state', '=', 'paid')]" string="Paid Members" />
-                       <filter icon="terp-partner" domain="[('membership_state', '=', 'invoiced')]" string="Invoiced Members" />
-                       <filter icon="terp-partner" domain="[('membership_state', '=', 'waiting')]" string="Future Members" />
+                       <filter icon="terp-personal" name="old" domain="[('membership_state', '=', 'old')]" string="Old Members" />
+                       <filter icon="terp-personal" name = "invoiced" domain="[('membership_state', '=', 'invoiced')]" string="Invoiced Members"/>
+                       <filter icon="terp-personal" domain="[('membership_state', '=', 'paid')]" string="Paid Members" />
+                       <filter icon="terp-personal" domain="[('membership_state', '=', 'waiting')]" string="Future Members" />
                        <separator orientation="vertical"/>
-                       <field name="membership_state">
+                       <field name="membership_state"/>
                        <field name="membership_start"/>
-                    </field>
-                    <newline/>
-                   <group expand="1" string="Group By..." position="after">
-                       <filter string="Associate Members" icon="terp-personal" domain="[]" context="{'group_by': 'associate_member'}"/>
-                   </group>     
+                       <newline/>
                </field>
             </field>
         </record>
@@ -139,13 +136,14 @@
             <field name="inherit_id" ref="view_res_partner_member_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <field name="membership_state" position="after">
+                <field name="membership_start" position="after">
+                <newline/>
 	            <group expand="1" string="Group By" colspan="10" col="8">
-	                <separator orientation="vertical"/>
+	                <filter string="Associate Member" name = "associate" icon="terp-personal" domain="[]" context="{'group_by':'associate_member'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
+                    <separator orientation="vertical"/>
 	                <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
 	                <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
-	                <filter string="Associate Member" icon="terp-personal" domain="[]" context="{'group_by':'associate_member'}"/>
-	                <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
                 </group>
                 </field>
             </field>
@@ -156,6 +154,7 @@
             <field name="res_model">res.partner</field>
             <field name="domain">[('membership_state','&lt;&gt;','none'),('membership_state','&lt;&gt;','canceled'),('membership_state','&lt;&gt;','old'),('membership_state','&lt;&gt;','waiting')]</field>
             <field name="search_view_id" ref="view_res_partner_member_filter"/>
+            <field name="context">{"search_default_old": 1}</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_members_view_tree">