X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Fbikecoop.xml;h=85095b9f9af298a8f827af2e64c9ed2bbd5718c0;hb=ed4edcf88d99b21586818116c84c915cdc68c21c;hp=70a0f3d3b154fcbf08de647c02005435563d34cd;hpb=fe93f62760b83dc2d7f02368246f7d2842da7c40;p=burette%2Fbikecoop_l10n_fr.git

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index 70a0f3d..85095b9 100644
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -30,25 +30,36 @@
                         <field name="is_company"/> <label for="is_company"/>)
                     </div>
                     <h1>
-                        <field name="name"/>
+                        <field name="name" placeholder="Firstname LASTNAME"/>
                     </h1>
                 </div>
+                <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>
                     <group>
                         <label for="street" string="Postal address"/>
                         <div>
+                            <field name="street" placeholder="Street ..."/>
+                            <field name="street2" placeholder="Street (following) ..."/>
                             <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>
+                        <field name="email" widget="email" placeholder="email"/>
+                        <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
+                        <field name="mobile" placeholder="e.g. +32.81.81.37.00"/>
                     </group>
                     <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="gender_id" domain="[('domain','=', 'gender')]" attrs="{'required': [('is_company','=', False)]}" widget="selection"/>
                         <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>
@@ -72,57 +83,73 @@
             <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"/>
+                        </group>
+                    </page>
+                </xpath>
+                <xpath expr="//notebook" position="inside">
+                    <page string="Associate members">
+                        <group>
+                            <field name="associate_members" widget="many2many" domain="[('id','!=',id)]" context="{'form_view_ref' : 'bikecoop_l10n_fr.view_bikecoop_l10n_fr_associate_member_form'}" nolabel="1">
+                                <tree>
+                                    <field name="member_ident"/>
+                                    <field name="name"/>
+                                    <field name="membership_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[@name='Volunteer activities']" position="after">
-                    <button string="Join membership" type="action" name="%(membership.action_membership_invoice_view)d"/>
+                        </group>
+                        <group>
+                            <field name="associate_member" readonly="1" string="Main member"/>
+                        </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>
                 </xpath>
             </field>
         </record>
         
+        <record id="view_bikecoop_l10n_fr_members_kanban" model="ir.ui.view">
+            <field name="name">res.partner.kanban</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="bikecoop.view_bikecoop_members_kanban"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='has_image']" position="after">
+                    <field name="member_ident"/>
+                    <field name="membership_state"/>
+                </xpath>
+                <xpath expr="//ul/li[@t-if='record.email.raw_value']" position="after">
+                    <li><field name="membership_state"/> <field name="member_ident"/></li>
+                </xpath>
+
+            </field>
+        </record>
         <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>
@@ -130,10 +157,13 @@
             <field name="arch" type="xml">
                 <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'])]"/>
+                    <filter string="All bikecoop members" name="all_bikecoop_members" domain="[('membership_state','in', ['waiting','invoiced','paid','free'])]"/>
                 </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"