[Module]

-Studies
+Occupation
+Nationality

diff --git a/bikecoop.py b/bikecoop.py
index 51c4417..bc8b677 100644 (file)
--- a/bikecoop.py
+++ b/bikecoop.py
@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 from osv import fields, osv
 
-
-class Studies(osv.osv):
-    _name = 'bikecoop.studies'
-    _description = 'If partner is student, what is his school.'
+class Occupation(osv.osv):
+    _name = 'bikecoop.partner.occupation'
+    _description = 'If partner is a person, what is his job or studies'
 
     _columns = {
-        'code': fields.char('Code', size=8, help='Code of the school'),
-        'name': fields.char('Name', size=128, help='Name of the school.', required=True),
+        '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),
         'active': fields.boolean('Active', help='If check, this object is always available'),
     }
 
@@ -16,18 +15,16 @@ class Studies(osv.osv):
         'active': lambda *a: 1,
     }
 
-Studies()
+Occupation()
 
 
 class Partner(osv.osv):
     _inherit = 'res.partner'
 
     _columns = {
-        'studies_id': fields.many2one('bikecoop.studies', 'School', help='If partner is student, school where he is studing.'),
-    }
-
-    _defaults = {
-        'studies_id': lambda *a: 1,
+        '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'),
     }
 
 Partner()

diff --git a/data/bikecoop.xml b/data/bikecoop.xml
index 44b3b7b..ba29ea4 100644 (file)
--- a/data/bikecoop.xml
+++ b/data/bikecoop.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <record id="bikecoop_studies_no" model="bikecoop.studies">
-            <field name="code">no</field>
-            <field name="name">No studies at the moment</field>
+        <record id="bikecoop_partner_occupation_none" model="bikecoop.partner.occupation">
+            <field name="code">none</field>
+            <field name="name">No job or studies at the moment</field>
         </record>
-        <record id="bikecoop_studies_other" model="bikecoop.studies">
+        <record id="bikecoop_partner_occupation_other" model="bikecoop.partner.occupation">
             <field name="code">other</field>
-            <field name="name">An other school that is not yet mentionned</field>
+            <field name="name">An other type of occupation that is not mentionned</field>
         </record>
     </data>
 </openerp>

diff --git a/demo/bikecoop.xml b/demo/bikecoop.xml
index 5ce0f06..b331325 100644 (file)
--- a/demo/bikecoop.xml
+++ b/demo/bikecoop.xml
@@ -1,21 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <record id="bikecoop_studies_upmf" model="bikecoop.studies">
+        <record id="bikecoop_partner_occupation_upmf" model="bikecoop.partner.occupation">
             <field name="code">upmf</field>
-            <field name="name">Université Pierre Mendès France</field>
+            <field name="name">Studies: Université Pierre Mendès France</field>
         </record>
-        <record id="bikecoop_studies_stendhal" model="bikecoop.studies">
+        <record id="bikecoop_partner_occupation_stendhal" model="bikecoop.partner.occupation">
             <field name="code">us</field>
-            <field name="name">Université Stendhal</field>
+            <field name="name">Studies: Université Stendhal</field>
         </record>
-        <record id="bikecoop_studies_ujf" model="bikecoop.studies">
+        <record id="bikecoop_partner_occupation_ujf" model="bikecoop.partner.occupation">
             <field name="code">ujf</field>
-            <field name="name">Université Joseph Fourrier</field>
+            <field name="name">Studies: Université Joseph Fourrier</field>
         </record>
-        <record id="bikecoop_studies_inpg" model="bikecoop.studies">
+        <record id="bikecoop_partner_occupation_inpg" model="bikecoop.partner.occupation">
             <field name="code">inpg</field>
-            <field name="name">INPG</field>
+            <field name="name">Studies: INPG</field>
+        </record>
+        <record id="bikecoop_partner_occupation_other_studies" model="bikecoop.partner.occupation">
+            <field name="code">OTH_STUD</field>
+            <field name="name">Studies: Other studies, university that is not mentionned</field>
+        </record>
+        <record id="bikecoop_partner_occupation_farmer" model="bikecoop.partner.occupation">
+            <field name="code">FARM</field>
+            <field name="name">Farmer</field>
+        </record>
+        <record id="bikecoop_partner_occupation_employee" model="bikecoop.partner.occupation">
+            <field name="code">EMP</field>
+            <field name="name">Employee</field>
+        </record>
+        <record id="bikecoop_partner_occupation_other_job" model="bikecoop.partner.occupation">
+            <field name="code">OTH_JOB</field>
+            <field name="name">An other job that is not mentionned</field>
         </record>
     </data>
 </openerp>

diff --git a/view/bikecoop_membership.xml b/view/bikecoop_membership.xml
index f611c64..1344b19 100644 (file)
--- a/view/bikecoop_membership.xml
+++ b/view/bikecoop_membership.xml
@@ -29,6 +29,7 @@
                     <field name="membership_state"/>
                     <field name="membership_start"/>
                     <field name="membership_stop"/>
+                    <field name="associate_members" colspan="6"/>
                 </group>
                 <group colspan="2" col="2">
                     <separator string="Postal address" colspan="4" col="4"/>
@@ -46,7 +47,8 @@
                     <separator string="Other informations" colspan="4" col="4"/>
                     <field name="date" string="Birthdate"/>
                     <field name="title" domain="[('domain', '=', 'contact')]" string="Sex" required="1"/>
-                    <field name="studies_id" required="1"/>
+                    <field name="nationality_id" required="1" />
+                    <field name="occupation_id" required="1" />
                 </group>
             </form>
             </field>