Suppression de la relation entre charge et evolution

[OpenERP/cmmi.git] / evolution.py

diff --git a/evolution.py b/evolution.py
index 05426ed..1882c17 100644 (file)
--- a/evolution.py
+++ b/evolution.py
@@ -26,11 +26,18 @@ class Evolution(osv.Model):
 
     def _get_charge_init(self, cr, uid, ids, field, arg, context=None):
         result = {}
-        for evo in self.browse(cr, uid, context=context):
+        for evo in self.browse(cr, uid, ids, context=context):
             result[evo.id] = sum([p.charge_init for p in evo.phases])
         return result
 
 
+    def _get_charge_plan(self, cr, uid, ids, field, arg, context=None):
+        result = {}
+        for evo in self.browse(cr, uid, ids, context=context):
+            result[evo.id] = sum([p.charge_plan for p in evo.phases])
+        return result
+
+
     _columns = {
         "pid": fields.integer(string="PID"),
         "name": fields.char(string="Title", size=64, required=True),
@@ -40,10 +47,7 @@ class Evolution(osv.Model):
         "keywords": fields.text(string="Mots clés"),
         "priorite": fields.selection(_priorites, string="Priorité"),
         "state": fields.selection(_statuts, string="Statut"),
-#        "charges": fields.one2many("cmmi.evolution.charge", # Supprimé !
-#                                   "evolution_id",
-#                                   string="Charges"),
-        "phases": fields.one2many("cmmi.evolution.pahse",
+        "phases": fields.one2many("cmmi.evolution.phase",
                                   "evolution_id",
                                   string="Phases"),
         # Backrefs
@@ -243,8 +247,6 @@ 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),