X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=view%2Fmembership.xml;h=a5078d0c5a56b91b35a0304b54098d4b0e12ca35;hb=HEAD;hp=54a25ede4665edd98e35372f86341fb5eb8dc021;hpb=ddabe28ee893a60a8f2cc692ac0f013b23ab3409;p=burette%2Flhc.git

diff --git a/view/membership.xml b/view/membership.xml
index 54a25ed..a5078d0 100644
--- a/view/membership.xml
+++ b/view/membership.xml
@@ -10,7 +10,9 @@
                     <attribute name="invisible">1</attribute>
                 </xpath>
                 <xpath expr="//page[@string='Membership']/group/group/div" position="after">
-                    <field name="kit_sent"/>
+                    <field name="kit_sent" attrs="{'invisible': [('membership_state','not in', ('old', 'waiting', 'invoiced', 'free', 'paid'))]}"/>
+                    <field name="bikecoop_activity_start" attrs="{'invisible': [('is_company','=', False)]}" />
+                    <field name="bikecoop_activity_stop" attrs="{'invisible': [('is_company','=', False)]}"/>
                 </xpath>
             </field>
         </record>
@@ -30,5 +32,23 @@
                 <field name="member_ident" position="replace"/>
             </field>
         </record>
+        <record id="view_res_partner_filter" model="ir.ui.view">
+            <field name="name">res.partner.select</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="membership.view_res_partner_member_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//filter[@name='all_members']" position="after">
+                   <filter icon="terp-personal" name="all_members_companies" domain="[('membership_state', 'in', ['invoiced','paid','free']),('is_company', '=', True)]" string="All Companies Members" help="Invoiced/Paid/Free and Companies"/>
+                   <filter icon="terp-personal" name="all_members_individual" domain="[('membership_state', 'in', ['invoiced','paid','free']),('is_company', '=', False)]" string="All Individual Members" help="Invoiced/Paid/Free and Individuals"/>
+                </xpath>
+                <xpath expr="//group[@string='Group By...']" position="inside">
+                    <filter string="County" context="{'group_by': 'county_code'}" groups="lhc.group_employee_lhc,base.group_no_one"/>
+                </xpath>
+                <xpath expr="//search" position="inside">
+                    <field name="county_code"/>
+                    <field name="city"/>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>