Merge branch 'master' of ssh://inspyration.org/~/OpenERP/cmmi

[OpenERP/cmmi.git] / evolution.py

diff --git a/evolution.py b/evolution.py
index c45b089..22759f0 100644 (file)
--- a/evolution.py
+++ b/evolution.py
@@ -8,6 +8,10 @@ from openerp.osv import osv, fields
 class Evolution(osv.Model):
     _name = "cmmi.evolution"
 
+    _domains = {
+        'human': [('is_company', '=', "False")],
+    }
+
     _priorites = [("incontournable", "Incontournable"),
                   ("necessaire", "Nécéssaire"),
                   ("utile", "Utile")]
@@ -25,19 +29,22 @@ class Evolution(osv.Model):
         "keywords": fields.text(string="Mots clés"),
         "priorite": fields.selection(_priorites, string="Priorité"),
         "statut": fields.selection(_statuts, string="Statut"),
-        "charges": fields.one2many("projet.charge",
+        "charges": fields.one2many("cmmi.evolution.charge",
                                    "evolution_id",
                                    string="Charges"),
-        "module_id": fields.many2one("projet.module",
+        "module_id": fields.many2one("cmmi.description.module",
                                      string="Modules"),
-        "chantier_id": fields.many2one("projet.chantier",
+        "chantier_id": fields.many2one("cmmi.axes.chantier",
                                        string="Chantier"),
-        "palier_id": fields.many2one("projet.palier",
+        "palier_id": fields.many2one("cmmi.axes.palier",
                                      string="Palier"),
-        "phase_id": fields.many2one("projet.phase",
+        "phase_id": fields.many2one("cmmi.phase",
                                     string="Phase"),
-        "projet_id": fields.many2one("projet.projet",
+        "projet_id": fields.many2one("cmmi.projet",
                                      string="Projet"),
+        "demandeur": fields.many2one("cmmi.partner.teammember",
+                                     string="Demandeur",
+                                     domain=_domains['human']),
     }
 
 
@@ -47,15 +54,15 @@ class Charge(osv.Model):
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),
         "description": fields.text(string="Description"),
-        "teammember_id": fields.many2one("projet.teammember",
+        "teammember_id": fields.many2one("cmmi.partner.teammember",
                                          string="Team Member",
                                          required=True),
-        "phase_id": fields.many2one("projet.phase",
+        "phase_id": fields.many2one("cmmi.phase",
                                     string="Phase",
                                     required=True),
-        "evolution_id": fields.many2one("projet.evolution",
+        "evolution_id": fields.many2one("cmmi.evolution",
                                         string="Evolution",
                                         required=True),
-        "mo_id": fields.many2one("projet.mo",
+        "mo_id": fields.many2one("cmmi.mo",
                                  string="Mo"),
     }