Ajout d'un champ charge_reel dans palier

[OpenERP/cmmi.git] / evolution.py

diff --git a/evolution.py b/evolution.py
index 485ef59..13917c3 100644 (file)
--- a/evolution.py
+++ b/evolution.py
@@ -26,17 +26,23 @@ 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, context=context):
+        for evo in self.browse(cr, uid, ids, context=context):
             result[evo.id] = sum([p.charge_plan for p in evo.phases])
         return result
 
+    def _get_charge_reel(self, cr, uid, ids, field, arg, context=None):
+        result = {}
+        for e in self.browse(cr, uid, ids, context=context):
+            result[e.id] = sum([p.quantite for p in e.charge_reel])
+        return result
+
 
     _columns = {
         "pid": fields.integer(string="PID"),
@@ -47,10 +53,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
@@ -72,6 +75,9 @@ class Evolution(osv.Model):
         "charge_plan": fields.function(_get_charge_plan,
                                        type="integer",
                                        string="Charge plannifiée"),
+        "charge_reel": fields.function(_get_charge_reel,
+                                       type="integer",
+                                       string="Charge réelle"),
     }
 
     _defaults = {
@@ -247,11 +253,15 @@ class Charge(osv.Model):
 
     _description = "Charge d'une evolution."
 
+    _selection_qte = [("0.25", "1/4"),
+                      ("0.5", "1/2"),
+                      ("0.75", "3/4")]
+
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),
         "description": fields.text(string="Description"),
-        "evolution_id": fields.many2one("cmmi.evolution",
-                                        string="Palier"),
+        "date": fields.date(string="Date"),
+        "quantite": fields.selection(_selection_qte, string="Quantité"),
         "phase_id": fields.many2one("cmmi.evolution.phase",
                                     string="Phase de l'évolution",
                                     required=True),