X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=view%2Fbikecoop.xml;h=1c8508c59ef3e1880207465d6dcaaec97e251db6;hb=14d224c;hp=ec69ac3e371112fd1952fb05f72e0a1abc3d52f5;hpb=9e5744e5a527707c68bd407c42817b1d11f05bd6;p=burette%2Fbikecoop.git

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index ec69ac3..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>
@@ -25,35 +77,40 @@
                         <field name="is_company"/> <label for="is_company"/>)
                     </div>
                     <h1>
-                        <field name="name"/>
+                        <field name="name" placeholder="Firstname LASTNAME"/>
                     </h1>
                 </div>
-                <group>
-                    <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 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"/>
+                <notebook colspan="4">
+                    <page string="Main informations">
+                        <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"/>
+                                </div>
+                                <field name="email" widget="email" placeholder="email"/>
+                                <field name="phone" placeholder="e.g. +33 4 00 00 00 00"/>
+                                <field name="mobile" placeholder="e.g. +33 6 00 00 00 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')]" attrs="{'required': [('is_company','=', False)]}" widget="selection"/>
+                                <field name="nationality_id" placeholder="France" attrs="{'required': [('is_company','=', False)]}"/>
+                                <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 ..." context="{'tree_view_ref': 'view_themes_simple_tree'}"/>
+                                <label string="Other volunteer activities and comments"/>
+                                <field name="comment"/>
+                            </page>
+                        </notebook>
                     </page>
                 </notebook>
             </sheet>
@@ -145,79 +202,25 @@
             <field name="context">{}</field>
         </record>
         
-        <record model="ir.actions.act_window.view" id="act_open_bikecoop_members_view_form">
+        <record model="ir.actions.act_window.view" id="act_open_bikecoop_members_view_kanban">
             <field name="act_window_id" ref="act_open_bikecoop_members_view"/>
-            <field name="sequence" eval="20"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_bikecoop_members_form"/>
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="view_bikecoop_members_kanban"/>
         </record>
-        
+
         <record model="ir.actions.act_window.view" id="act_open_bikecoop_members_view_tree">
             <field name="act_window_id" ref="act_open_bikecoop_members_view"/>
-            <field name="sequence" eval="10"/>
+            <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_bikecoop_members_tree"/>
         </record>
-        
-        <record model="ir.actions.act_window.view" id="act_open_bikecoop_members_view_kanban">
-            <field name="act_window_id" ref="act_open_bikecoop_members_view"/>
-            <field name="sequence" eval="5"/>
-            <field name="view_mode">kanban</field>
-            <field name="view_id" ref="view_bikecoop_members_kanban"/>
-        </record>
-
-        <menuitem id="menu_bikecoop" 
-            sequence="20"
-            name="Bikecoop"
-            groups="base.group_user,point_of_sale.group_pos_user"
-            action="act_open_bikecoop_members_view"/>
-
-        <menuitem id="menu_bikecoop_members"
-            name="Bikecoop members"
-            parent="menu_bikecoop"
-            sequence="20"/>
-
-        <menuitem id="menu_bikecoop_members_tree"
-            parent="menu_bikecoop_members"
-            sequence="20"
-            action="act_open_bikecoop_members_view"/>
 
-        <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 model="ir.actions.act_window.view" id="act_open_bikecoop_members_view_form">
+            <field name="act_window_id" ref="act_open_bikecoop_members_view"/>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_bikecoop_members_form"/>
         </record>
         
         <record model="ir.actions.act_window" id="act_open_volunteer_ids_view">
@@ -242,19 +245,18 @@
             <field name="context">{'default_domain': 'occupation'}</field>
         </record>
 
-        <menuitem id="menu_configuration" 
-            groups="base.group_no_one"
-            parent="menu_bikecoop"
-            sequence="20"
-            name="Configuration"/>
-        
+        <menuitem id="menu_bikecoop" 
+            name="Bikecoop"
+            parent="base.menu_config"
+            sequence="20"/>
+
         <menuitem id="menu_volunteer_ids"
-            parent="menu_configuration"
-            sequence="20"
+            parent="menu_bikecoop"
+            sequence="10"
             action="act_open_volunteer_ids_view"/>
 
         <menuitem id="menu_occupation"
-            parent="menu_configuration"
+            parent="menu_bikecoop"
             sequence="20"
             action="act_open_occupation_view"/>
     </data>