<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
- <record id="view_partner_form" model="ir.ui.view">
+ <record id="view_membership_partner_form" model="ir.ui.view">
<field name="name">res.partner.form</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="membership.view_partner_form"/>
<xpath expr="//button[@name='%(membership.action_membership_invoice_view)d']" position="attributes">
<attribute name="invisible">1</attribute>
</xpath>
+ <xpath expr="//page[@string='Membership']/group/group/div" position="after">
+ <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>
- <record id="view_partner_form" model="ir.ui.view">
+ <record id="view_remembership_partner_form" model="ir.ui.view">
<field name="name">res.partner.form</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="remembership.view_remembership_partner_form"/>
<field name="member_ident" position="replace"/>
</field>
</record>
- <record id="view_members_simple_tree" model="ir.ui.view">
+ <record id="view_members_tree" model="ir.ui.view">
<field name="name">res.partner.tree</field>
<field name="model">res.partner</field>
- <field name="inherit_id" ref="remembership.view_remembership_members_simple_tree"/>
+ <field name="inherit_id" ref="remembership.view_remembership_members_tree"/>
<field name="arch" type="xml">
<field name="member_ident" position="replace"/>
</field>
</record>
- <record id="view_members_tree" model="ir.ui.view">
- <field name="name">res.partner.tree</field>
+ <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="remembership.view_remembership_members_tree"/>
+ <field name="inherit_id" ref="membership.view_res_partner_member_filter"/>
<field name="arch" type="xml">
- <field name="member_ident" position="replace"/>
+ <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>