diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 23f9cd19275..caabbb9090d 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -358,10 +358,11 @@ class Partner(osv.osv):
 
     def __get_membership_state(self, *args, **kwargs):
         return self._membership_state(*args, **kwargs)
-    
+
     _columns = {
         'associate_member': fields.many2one('res.partner', 'Associate member'),
         'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
+        'member': fields.boolean('Member'),
         'free_member': fields.boolean('Free member'),
         'membership_amount': fields.float(
                     'Membership amount', digits=(16, 2),
@@ -422,16 +423,16 @@ class Partner(osv.osv):
     _constraints = [
         (_check_recursion, 'Error ! You can not create recursive associated members.', ['associate_member'])
     ]
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
         if context is None:
-            context = {}    
+            context = {}
         default = default.copy()
         default['member_lines'] = []
         return super(Partner, self).copy(cr, uid, id, default, context)
-    
+
 Partner()
 
 class product_template(osv.osv):
@@ -646,7 +647,7 @@ ReportPartnerMemberYearNew()
 
 class account_invoice_line(osv.osv):
     _inherit='account.invoice.line'
-    
+
     def write(self, cr, uid, ids, vals, context=None):
         if not context:
             context={}
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 2ba81d2c1ee..c937ffabf78 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -103,13 +103,14 @@
             <field name="arch" type="xml">
                 <tree string="Members">
                     <field name="name"/>
+                    <field name="associate_member" attrs="{'invisible':[('membership_state', '!=', 'none')]}"/>
                     <field name="membership_start"/>
                     <field name="membership_stop"/>
                     <field name="membership_state"/>
-                    <field name="associate_member" attrs="{'invisible':[('membership_state', '!=', 'none')]}"/>
                 </tree>
             </field>
         </record>
+
         <record id="view_res_partner_member_filter" model="ir.ui.view">
             <field name="name">res.partner.select</field>
             <field name="model">res.partner</field>
@@ -125,6 +126,24 @@
             </field>
         </record>
 
+        <record id="view_res_partner_member_filter2" model="ir.ui.view">
+            <field name="name">res.partner.select2</field>
+            <field name="model">res.partner</field>
+            <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">
+	            <group expand="1" string="Group By" colspan="10" col="8">
+	                <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>
+        </record>
+
         <record model="ir.actions.act_window" id="action_membership_members">
             <field name="name">Members</field>
             <field name="res_model">res.partner</field>
@@ -157,6 +176,17 @@
             />
  -->
 
+        <record id="view_res_partner_member_form2" model="ir.ui.view">
+            <field name="name">res.partner.form2</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <field name="supplier" position="after">
+                        <field name="member"/>
+               </field>
+            </field>
+        </record>
 
         <record model="ir.ui.view" id="view_partner_tree">
             <field name="name">res.partner.tree.form.inherit</field>