[member] +benevolat

diff --git a/bikecoop.py b/bikecoop.py
index bc8b677..9bbda04 100644 (file)
--- a/bikecoop.py
+++ b/bikecoop.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 from osv import fields, osv
 
-class Occupation(osv.osv):
-    _name = 'bikecoop.partner.occupation'
-    _description = 'If partner is a person, what is his job or studies'
+class Theme(osv.osv):
+    _name = 'bikecoop.partner.theme'
+    _description = 'Themes that could be related to a partner'
 
     _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),
+        'domain': fields.char('Domain', size=64, help='Domain for filtering results'),
         'active': fields.boolean('Active', help='If check, this object is always available'),
     }
 
@@ -15,7 +16,7 @@ class Occupation(osv.osv):
         'active': lambda *a: 1,
     }
 
-Occupation()
+Theme()
 
 
 class Partner(osv.osv):
@@ -24,7 +25,8 @@ class Partner(osv.osv):
     _columns = {
         'associate_members': fields.one2many('res.partner', 'associate_member', 'Associate members', help='Members who are associated to this partner.'),
         'nationality_id': fields.many2one('res.country', 'Nationality', help='Partner\'s nationality if he is a person'),
-        'occupation_id': fields.many2one('bikecoop.partner.occupation', 'Job or studies', help='Partner`s job or studies if he is a person'),
+        'occupation_id': fields.many2one('bikecoop.partner.theme', 'Occupation', help='Main occupation of this partner'),
+        'volunteer_ids': fields.many2many('bikecoop.partner.theme', 'res_partner_bikecoop_theme_rel', 'partner_id', 'theme_id', 'What kind of volunteer activities you want to do with us?'),
     }
 
 Partner()

diff --git a/data/bikecoop.xml b/data/bikecoop.xml
index ba29ea4..6b981bb 100644 (file)
--- a/data/bikecoop.xml
+++ b/data/bikecoop.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <record id="bikecoop_partner_occupation_none" model="bikecoop.partner.occupation">
+        <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>
         </record>
-        <record id="bikecoop_partner_occupation_other" model="bikecoop.partner.occupation">
+        <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>
         </record>
     </data>
 </openerp>

diff --git a/data/res_partner.xml b/data/res_partner.xml
index 75b7223..fe649b3 100644 (file)
--- a/data/res_partner.xml
+++ b/data/res_partner.xml
@@ -16,5 +16,8 @@
         <record id="res_partner_category_info" model="res.partner.category">
             <field name="name">Liste d'information</field>
         </record>
+        <record id="res_partner_category_studies" model="res.partner.category">
+            <field name="name">Studies</field>
+        </record>
     </data>
 </openerp>

diff --git a/demo/bikecoop.xml b/demo/bikecoop.xml
index b331325..465ac43 100644 (file)
--- a/demo/bikecoop.xml
+++ b/demo/bikecoop.xml
@@ -1,37 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <record id="bikecoop_partner_occupation_upmf" model="bikecoop.partner.occupation">
+        <record id="bikecoop_partner_theme_upmf" model="bikecoop.partner.theme">
             <field name="code">upmf</field>
             <field name="name">Studies: Université Pierre Mendès France</field>
+            <field name="domain">occupation</field>
         </record>
-        <record id="bikecoop_partner_occupation_stendhal" model="bikecoop.partner.occupation">
+        <record id="bikecoop_partner_theme_stendhal" model="bikecoop.partner.theme">
             <field name="code">us</field>
             <field name="name">Studies: Université Stendhal</field>
+            <field name="domain">occupation</field>
         </record>
-        <record id="bikecoop_partner_occupation_ujf" model="bikecoop.partner.occupation">
+        <record id="bikecoop_partner_theme_ujf" model="bikecoop.partner.theme">
             <field name="code">ujf</field>
             <field name="name">Studies: Université Joseph Fourrier</field>
+            <field name="domain">occupation</field>
         </record>
-        <record id="bikecoop_partner_occupation_inpg" model="bikecoop.partner.occupation">
+        <record id="bikecoop_partner_theme_inpg" model="bikecoop.partner.theme">
             <field name="code">inpg</field>
             <field name="name">Studies: INPG</field>
+            <field name="domain">occupation</field>
         </record>
-        <record id="bikecoop_partner_occupation_other_studies" model="bikecoop.partner.occupation">
+        <record id="bikecoop_partner_theme_other_studies" model="bikecoop.partner.theme">
             <field name="code">OTH_STUD</field>
             <field name="name">Studies: Other studies, university that is not mentionned</field>
+            <field name="domain">occupation</field>
         </record>
-        <record id="bikecoop_partner_occupation_farmer" model="bikecoop.partner.occupation">
+        <record id="bikecoop_partner_theme_farmer" model="bikecoop.partner.theme">
             <field name="code">FARM</field>
             <field name="name">Farmer</field>
+            <field name="domain">occupation</field>
         </record>
-        <record id="bikecoop_partner_occupation_employee" model="bikecoop.partner.occupation">
+        <record id="bikecoop_partner_theme_employee" model="bikecoop.partner.theme">
             <field name="code">EMP</field>
             <field name="name">Employee</field>
+            <field name="domain">occupation</field>
         </record>
-        <record id="bikecoop_partner_occupation_other_job" model="bikecoop.partner.occupation">
+        <record id="bikecoop_partner_theme_other_job" model="bikecoop.partner.theme">
             <field name="code">OTH_JOB</field>
             <field name="name">An other job that is not mentionned</field>
+            <field name="domain">occupation</field>
+        </record>
+
+        <record id="bikecoop_partner_theme_com_com" model="bikecoop.partner.theme">
+            <field name="code">COM_COM</field>
+            <field name="name">Communication committee</field>
+            <field name="domain">volunteer</field>
+        </record>
+        <record id="bikecoop_partner_theme_wks_com" model="bikecoop.partner.theme">
+            <field name="code">WKS_COM</field>
+            <field name="name">Worshop committee</field>
+            <field name="domain">volunteer</field>
+        </record>
+        <record id="bikecoop_partner_theme_anim_com" model="bikecoop.partner.theme">
+            <field name="code">ANIM_COM</field>
+            <field name="name">Animation committee</field>
+            <field name="domain">volunteer</field>
+        </record>
+        <record id="bikecoop_partner_theme_admin_com" model="bikecoop.partner.theme">
+            <field name="code">ADMIN_COM</field>
+            <field name="name">Administration committee</field>
+            <field name="domain">volunteer</field>
         </record>
     </data>
 </openerp>

diff --git a/view/bikecoop_membership.xml b/view/bikecoop_membership.xml
index de6ff76..73597e2 100644 (file)
--- a/view/bikecoop_membership.xml
+++ b/view/bikecoop_membership.xml
@@ -49,7 +49,8 @@
                     <field name="date" string="Birthdate"/>
                     <field name="title" domain="[('domain', '=', 'contact')]" string="Sex" required="1"/>
                     <field name="nationality_id" required="1" />
-                    <field name="occupation_id" required="1" />
+                    <field name="occupation_id" required="1" domain="[('domain','=', 'occupation')]"/>
+                    <field name="volunteer_ids" domain="[('domain','=', 'volunteer')]" />
                 </group>
             </form>
             </field>