X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=view%2Fbikecoop.xml;h=1c8508c59ef3e1880207465d6dcaaec97e251db6;hb=cc60058cbe68d271a1ba290e25c827db046fe683;hp=7d9128bf78753c00da5e6b8b3c7d4043dedf0a18;hpb=3942bdcdc45f7c71f2f1114a18363a131ed9c0f3;p=burette%2Fbikecoop.git

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index 7d9128b..1c8508c 100644
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -1,5 +1,57 @@
 <openerp>
     <data>
+        <record id="view_themes_tree" model="ir.ui.view">
+            <field name="name">bikecoop.partner.theme.tree</field>
+            <field name="model">bikecoop.partner.theme</field>
+            <field name="priority" eval="4"/>
+            <field name="arch" type="xml">
+            <tree string="Themes">
+                <field name="sequence"/>
+                <field name="name"/>
+            </tree>
+            </field>
+        </record>
+
+        <record id="view_themes_simple_tree" model="ir.ui.view">
+            <field name="name">bikecoop.partner.theme.tree</field>
+            <field name="model">bikecoop.partner.theme</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+            <tree string="Themes">
+                <field name="name"/>
+            </tree>
+            </field>
+        </record>
+        
+        <record id="view_themes_form" model="ir.ui.view">
+            <field name="name">bikecoop.partner.theme.form</field>
+            <field name="model">bikecoop.partner.theme</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+            <form string="Theme">
+                <field name="active"/>
+                <newline/>
+                <field name="sequence"/>
+                <newline/>
+                <field name="code" select="1"/>
+                <newline/>
+                <field name="name" select="1"/>
+            </form>
+            </field>
+        </record>
+        
+        <record id="view_themes_search" model="ir.ui.view">
+            <field name="name">bikecoop.partner.theme.search</field>
+            <field name="model">bikecoop.partner.theme</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+            <search string="Themes">
+                <field name="name" select="1"/>
+                <field name="code"/>
+            </search>
+            </field>
+        </record>
+        
         <record id="view_bikecoop_members_tree" model="ir.ui.view">
             <field name="name">res.partner.tree</field>
             <field name="model">res.partner</field>
@@ -34,11 +86,11 @@
                             <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="..."/>
                                 </div>
                                 <field name="email" widget="email" placeholder="email"/>
                                 <field name="phone" placeholder="e.g. +33 4 00 00 00 00"/>
@@ -46,15 +98,15 @@
                             </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)]}" widget="selection"/>
+                                <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)]}" widget="selection"/>
+                                <field name="occupation_id" domain="[('domain','=', 'occupation')]" attrs="{'required': [('is_company','=', False)]}" widget="selection"/>
                             </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 ..."/>
+                                <field name="volunteer_ids" domain="[('domain','=', 'volunteer')]" string="Want to be volunteer in ..." context="{'tree_view_ref': 'view_themes_simple_tree'}"/>
                                 <label string="Other volunteer activities and comments"/>
                                 <field name="comment"/>
                             </page>
@@ -171,44 +223,6 @@
             <field name="view_id" ref="view_bikecoop_members_form"/>
         </record>
         
-        <record id="view_themes_tree" model="ir.ui.view">
-            <field name="name">bikecoop.partner.theme.tree</field>
-            <field name="model">bikecoop.partner.theme</field>
-            <field name="priority" eval="8"/>
-            <field name="arch" type="xml">
-            <tree string="Themes">
-                <field name="name"/>
-            </tree>
-            </field>
-        </record>
-        
-        <record id="view_themes_form" model="ir.ui.view">
-            <field name="name">bikecoop.partner.theme.form</field>
-            <field name="model">bikecoop.partner.theme</field>
-            <field name="priority" eval="8"/>
-            <field name="arch" type="xml">
-            <form string="Theme">
-                <field name="active"/>
-                <newline/>
-                <field name="code" select="1"/>
-                <newline/>
-                <field name="name" select="1"/>
-            </form>
-            </field>
-        </record>
-        
-        <record id="view_themes_search" model="ir.ui.view">
-            <field name="name">bikecoop.partner.theme.search</field>
-            <field name="model">bikecoop.partner.theme</field>
-            <field name="priority" eval="8"/>
-            <field name="arch" type="xml">
-            <search string="Themes">
-                <field name="name" select="1"/>
-                <field name="code"/>
-            </search>
-            </field>
-        </record>
-        
         <record model="ir.actions.act_window" id="act_open_volunteer_ids_view">
             <field name="name">Volunteer activities</field>
             <field name="type">ir.actions.act_window</field>