From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Sun, 8 Nov 2015 20:20:38 +0000 (+0100)
Subject: Merge commit '14d224c'
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/saisir.php?a=commitdiff_plain;h=cc60058cbe68d271a1ba290e25c827db046fe683;hp=43a770baa2545e5f76a0c35e655d5c5ee0f12f10;p=burette%2Fbikecoop.git

Merge commit '14d224c'
---

diff --git a/bikecoop.py b/bikecoop.py
index bc8516b..07f8614 100644
--- a/bikecoop.py
+++ b/bikecoop.py
@@ -29,12 +29,14 @@ from datetime import date
 class Theme(osv.osv):
     _name = 'bikecoop.partner.theme'
     _description = 'Themes that could be related to a partner'
+    _order = 'domain,sequence,name'
 
     _columns = {
         'code': fields.char('Code', size=8, help='Code of the occupation'),
         'name': fields.char('Name', size=128, help='Name of the job or studies', required=True, translate=True),
         'domain': fields.selection([('gender', 'Gender'), ('occupation', 'Occupation'), ('volunteer', 'Volunteer')], 'Domain', required=True, size=24),
         'active': fields.boolean('Active', help='If check, this object is always available'),
+        'sequence': fields.integer('Sequence', help='To order by sequence'),
     }
 
     _defaults = {
diff --git a/data/bikecoop.xml b/data/bikecoop.xml
index 3975e05..0ee23f3 100644
--- a/data/bikecoop.xml
+++ b/data/bikecoop.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <!--     Partner dafault themes -->
         <record id="bikecoop_partner_occupation_none" model="bikecoop.partner.theme">
             <field name="code">none</field>
             <field name="name">No job or studies at the moment</field>
             <field name="domain">occupation</field>
+            <field name="sequence">100</field>
         </record>
         <record id="bikecoop_partner_occupation_other" model="bikecoop.partner.theme">
             <field name="code">other</field>
             <field name="name">An other type of occupation that is not mentionned</field>
             <field name="domain">occupation</field>
+            <field name="sequence">100</field>
         </record>
     </data>
 </openerp>
diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index 592ea54..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>
@@ -54,7 +106,7 @@
                         <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>