Fin de la refonte selon le nouveau schema

[OpenERP/cmmi.git] / evolution.py

diff --git a/evolution.py b/evolution.py
index 8594dd5..a844546 100644 (file)
--- a/evolution.py
+++ b/evolution.py
@@ -66,7 +66,7 @@ class Phase(osv.Model):
         "phase_id": fields.many2one("cmmi.axes.palier.phase",
                                     string="Phase"),
         "evolution_id": fields.many2one("cmmi.evolution",
-                                        string="Palier"),
+                                        string="Evolution"),
     }
 
     def create(self, cr, uid, vals, context=None):
@@ -86,11 +86,13 @@ class Charge(osv.Model):
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),
         "description": fields.text(string="Description"),
+        "evolution_id": fields.many2one("cmmi.evolution",
+                                        string="Palier"),
+        "phase_id": fields.many2one("cmmi.evolution.phase",
+                                    string="Phase de l'évolution",
+                                    required=True),
         "teammember_id": fields.many2one("res.partner", # TODO: Vers l'association teammember MO plutôt que MO.
                                          string="Team Member",
                                          required=True),
-        "phase_id": fields.many2one("cmmi.evolution.phase",
-                                        string="Phase de l'évolution",
-                                        required=True),
     }