X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=view%2Fbikecoop.xml;h=953232ba1a83d314874ad50edcaf01b95d2ba278;hb=2030112f57508564768ece1c93d0372dab2bc73b;hp=c91a6ef9edd891dc0711b3aaee575e2f88addb4c;hpb=65849a99b18f81ea937ef242def27f8aca4002ca;p=burette%2Fbikecoop.git

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index c91a6ef..953232b 100644
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -42,17 +42,17 @@
                         </div>
                     </group>
                     <group attrs="{'invisible': [('is_company','=',True)]}">
-                        <field name="date" string="Birthdate"/>
+                        <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" domain="[('is_company','=', False)]" attrs="{'required': [('is_company','=', False)]}"/>
-                        <field name="occupation_id" domain="[('domain','=', 'occupation')]" 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>
+                <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"/>
+                        <label string="Other volunteer activities and comments"/>
                         <field name="comment"/>
                     </page>
                 </notebook>
@@ -101,13 +101,93 @@
         <menuitem id="menu_bikecoop" 
             sequence="20"
             name="Bikecoop"
-            web_icon="images/bikecoop.png"
-            web_icon_hover="images/bikecoop-hover.png"
+            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>
+        
+        <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>
+            <field name="res_model">bikecoop.partner.theme</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_themes_search"/>
+            <field name="domain">[('domain','=', 'volunteer')]</field>
+            <field name="context">{'default_domain': 'volunteer'}</field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="act_open_occupation_view">
+            <field name="name">Occupations</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">bikecoop.partner.theme</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_themes_search"/>
+            <field name="domain">[('domain','=', 'occupation')]</field>
+            <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_volunteer_ids"
+            parent="menu_configuration"
+            sequence="20"
+            action="act_open_volunteer_ids_view"/>
+
+        <menuitem id="menu_occupation"
+            parent="menu_configuration"
+            sequence="20"
+            action="act_open_occupation_view"/>
     </data>
 </openerp>