X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=view%2Fbikecoop.xml;h=bf27b370b068a5e93d56f99e0fcb6b5f2a6dc804;hb=f8ac71c9e5793c79408f100d640e20fdf4564cb4;hp=8e9e70f13c24628665e13a0b7e7ac2030471956c;hpb=f21cd6c55649deed363af2aabfeca4de34f7df36;p=burette%2Fbikecoop_l10n_fr.git

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index 8e9e70f..bf27b37 100644
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <record id="view_bikecoop_members_tree" model="ir.ui.view">
+        <record id="view_bikecoop_l10n_fr_members_tree" model="ir.ui.view">
             <field name="name">res.partner.tree</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="bikecoop.view_bikecoop_members_tree"/>
@@ -15,42 +15,66 @@
             </field>
         </record>
         
-        <record id="view_bikecoop_members_form" model="ir.ui.view">
+        <record id="view_bikecoop_l10n_fr_members_form" model="ir.ui.view">
             <field name="name">res.partner.form</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="bikecoop.view_bikecoop_members_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group" position="before">
-                    <group>
-                        <group>
-                            <field name="member_ident" readonly="1"/>
-                            <field name="membership_state"/>
-                        </group>
-                        <group>
-                            <field name="membership_start"/>
-                            <field name="membership_stop"/>
-                        </group>
-                    </group>
-                    <group>
-                        <label string="Associate members" for="associate_members"/>
-                        <field name="associate_members" widget="many2many_tags" placeholder="Associate members" nolabel="1"/>
-                    </group>
+                    <notebook>
+                        <page string="Membership main informations">
+                            <group>
+                                <group>
+                                    <field name="member_ident" readonly="1"/>
+                                    <field name="membership_state"/>
+                                </group>
+                                <group>
+                                    <field name="membership_start"/>
+                                    <field name="membership_stop"/>
+                                </group>
+                            </group>
+                            <group>
+                                <label string="Associate members" for="associate_members"/>
+                                <field name="associate_members" widget="many2many" placeholder="Associate members" nolabel="1" domain="[('id','!=',id)]" />
+                            </group>
+                        </page>
+                        <page string="Memberships">
+                            <field name="member_lines" readonly="1">
+                                <tree string="Memberships">
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="membership_id"/>
+                                    <field name="member_price"/>
+                                    <field name="account_invoice_id"/>
+                                    <field name="state"/>
+                                </tree>
+                                <form string="Memberships">
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="member_price"/>
+                                    <field name="membership_id"/>
+                                    <field name="account_invoice_id"/>
+                                    <field name="state"/>
+                                </form>
+                            </field>
+                        </page>
+                    </notebook>
                 </xpath>
-                <xpath expr="//notebook" position="after">
+                <xpath expr="//notebook[@name='Volunteer activities']" position="after">
                     <button string="Join membership" type="action" name="%(membership.action_membership_invoice_view)d"/>
                 </xpath>
             </field>
         </record>
         
-        <record id="view_bikecoop_members_search" model="ir.ui.view">
+        <record id="view_bikecoop_l10n_fr_members_search" model="ir.ui.view">
             <field name="name">res.partner.search</field>
             <field name="model">res.partner</field>
-            <field name="priority" eval="8"/>
+            <field name="inherit_id" ref="bikecoop.view_bikecoop_members_search"/>
             <field name="arch" type="xml">
-            <search string="Bikecoop members">
-                <field name="name" select="True"/>
-                <filter string="All bikecoop members" name="all_bikecoop_members" domain="[('membership_state','in', ['invoiced','paid','free'])]"/>
-            </search>
+                <xpath expr="//field[@name='name']" position="after">
+                    <field name="member_ident"/>
+                    <filter string="All bikecoop members" name="all_bikecoop_members" domain="[('membership_state','in', ['invoiced','paid','free'])]"/>
+                </xpath>
             </field>
         </record>
     </data>