X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=view%2Fbikecoop.xml;h=45a7ce49aaf898f205a729a919eda1c1542b13a6;hb=ba47af8c5a1730fa559020ccc056c570c9757e0e;hp=c5d9fb4a4cd4b74e64a5d3412f72404f8dbdc6bd;hpb=c31aa579334e5fad0c4ce0b9d77201a327471606;p=burette%2Fbikecoop_l10n_fr.git

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index c5d9fb4..45a7ce4 100644
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -72,53 +72,49 @@
             <field name="inherit_id" ref="bikecoop.view_bikecoop_members_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group" position="before">
-                    <notebook>
-                        <page string="Membership main informations">
+                    <page string="Membership main informations">
+                        <group>
                             <group>
-                                <group>
-                                    <field name="member_ident" readonly="1"/>
-                                    <field name="membership_state"/>
-                                </group>
-                                <group>
-                                    <field name="membership_start"/>
-                                    <field name="membership_stop"/>
-                                </group>
+                                <field name="member_ident" readonly="1"/>
+                                <field name="membership_state"/>
                             </group>
                             <group>
-                                <label string="Associate members" for="associate_members"/>
-                                <field name="associate_members" widget="many2many" placeholder="Associate members" nolabel="1" domain="[('id','!=',id)]" context="{'form_view_ref' : 'bikecoop_l10n_fr.view_bikecoop_l10n_fr_associate_member_form'}">
-                                    <tree>
-                                        <field name="member_ident"/>
-                                        <field name="name"/>
-                                        <field name="membership_state"/>
-                                    </tree>
-                                </field>
+                                <field name="membership_start"/>
+                                <field name="membership_stop"/>
                             </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>
+                        </group>
+                    </page>
                 </xpath>
-                <xpath expr="//notebook[@name='Volunteer activities']" position="after">
-                    <button string="Join membership" type="action" name="%(membership.action_membership_invoice_view)d"/>
+                <xpath expr="//notebook" position="inside">
+                    <page string="Associate members">
+                        <field name="associate_members" widget="many2many" domain="[('id','!=',id)]" context="{'form_view_ref' : 'bikecoop_l10n_fr.view_bikecoop_l10n_fr_associate_member_form'}">
+                            <tree>
+                                <field name="member_ident"/>
+                                <field name="name"/>
+                                <field name="membership_state"/>
+                            </tree>
+                        </field>
+                    </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>
                 </xpath>
             </field>
         </record>
@@ -149,6 +145,9 @@
                 </xpath>
             </field>
         </record>
+        <record id="bikecoop.act_open_bikecoop_members_view" model="ir.actions.act_window">
+            <field name="context">{'search_default_all_bikecoop_members' : 1}</field>
+        </record>
 
         <menuitem name="Members"
             parent="membership.menu_membership"