X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=view%2Fbikecoop.xml;h=33df7bdeb6921aaf81d1bdcc87242fc410a3ebe2;hb=88680983679fb21c8329a843167031bfdda75f2a;hp=aaba23ed81dcd058e00d61a5baa4a86b149a626f;hpb=ca51ac88c36bcea64458c76c9bb71abb741b7dd8;p=burette%2Fbikecoop_l10n_fr.git

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index aaba23e..33df7bd 100644
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -1,13 +1,13 @@
 <?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="type">tree</field>
             <field name="inherit_id" ref="bikecoop.view_bikecoop_members_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="after">
+                    <field name="member_ident"/>
                     <field name="membership_state"/>
                     <field name="membership_start"/>
                     <field name="membership_stop"/>
@@ -15,35 +15,42 @@
             </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="type">form</field>
             <field name="inherit_id" ref="bikecoop.view_bikecoop_members_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='name']" position="after">
-                    <newline/>
-                    <field name="member_ident" colspan="2"/>
-                    <field name="membership_state" colspan="2"/>
-                    <newline/>
-                    <field name="membership_start" colspan="2"/>
-                    <field name="membership_stop" colspan="2"/>
-                    <separator string="Associate members" colspan="4"/>
-                    <field name="associate_members" nolabel="1" colspan="4"/>
+                <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" domain="['!',('id','=',id)]" />
+                    </group>
+                </xpath>
+                <xpath expr="//notebook" 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="type">search</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>