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

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index 33df7bd..9778180 100644
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -15,28 +15,109 @@
             </field>
         </record>
         
-        <record id="view_bikecoop_l10n_fr_members_form" model="ir.ui.view">
+        <record id="view_bikecoop_l10n_fr_associate_member_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="type">form</field>
+            <field name="priority" eval="8"/>
             <field name="arch" type="xml">
-                <xpath expr="//group" position="before">
+            <form string="Associate member" version="7.0">
+            <sheet>
+                <field name="image" widget="image" class="oe_left oe_avatar" options='{"preview_image": "image_medium", "size": [90, 90]}'/>
+                <div class="oe_title">
+                    <div class="oe_edit_only">
+                        <label for="name"/> (
+                        <field name="is_company"/> <label for="is_company"/>)
+                    </div>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
+                </div>
+                <group>
                     <group>
-                        <group>
-                            <field name="member_ident" readonly="1"/>
-                            <field name="membership_state"/>
-                        </group>
-                        <group>
-                            <field name="membership_start"/>
-                            <field name="membership_stop"/>
-                        </group>
+                        <label for="street" string="Postal address"/>
+                        <div>
+                            <field name="zip" placeholder="Zip code"/>
+                            <field name="city" placeholder="CITY"/>
+                            <field name="country_id" placeholder="Country"/>
+                            <field name="street" placeholder="Street ..."/>
+                            <field name="street2" placeholder="..."/>
+                            <field name="email" widget="email" placeholder="email"/>
+                            <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
+                        </div>
                     </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 attrs="{'invisible': [('is_company','=',True)]}">
+                        <field name="year" placeholder="1900" attrs="{'required': [('is_company','=', False)]}"/>
+                        <field name="gender_id" domain="[('domain','=', 'gender')]" placeholder="Other, Female or Male" attrs="{'required': [('is_company','=', False)]}"/>
+                        <field name="nationality_id" placeholder="France" attrs="{'required': [('is_company','=', False)]}"/>
+                        <field name="occupation_id" placeholder="Student/Employee/Other" domain="[('domain','=', 'occupation')]" attrs="{'required': [('is_company','=', False)]}"/>
                     </group>
+                </group>
+                <notebook name="Volunteer activities">
+                    <page string="Volunteer activities" attrs="{'invisible': [('is_company','=',True)]}">
+                        <label string="Want to be volunteer in ..."/>
+                        <field name="volunteer_ids" domain="[('domain','=', 'volunteer')]" string="Want to be volunteer in ..."/>
+                        <label string="Other volunteer activities and comments"/>
+                        <field name="comment"/>
+                    </page>
+                </notebook>
+            </sheet>
+            </form>
+            </field>
+        </record>
+
+        <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">
+                    <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)]" 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>
+                            </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>