Corretion aux bugs du dernier commit + modification vue form évolution

[OpenERP/cmmi.git] / axes.py

diff --git a/axes.py b/axes.py
index ce86c00..84cf5c9 100644 (file)
--- a/axes.py
+++ b/axes.py
@@ -67,10 +67,10 @@ class Mesurable(osv.Model):
     ]
 
 
-    def commencer(self, cr, uid, ids, context=None):
+    def action_commencer(self, cr, uid, ids, context=None):
         if type(ids) == list:
             if len(ids) != 1:
-                return # TODO: message d'avertissement
+                return
             ids = ids[0]
 
         palier = self.read(cr, uid, ids, ['date_plan_deb', 'date_plan_fin', 'state'], context)
@@ -90,13 +90,13 @@ class Mesurable(osv.Model):
         return self
 
 
-    def suspendre(self, cr, uid, ids, context=None):
+    def action_suspendre(self, cr, uid, ids, context=None):
         if type(ids) == list:
             if len(ids) != 1:
                 return # TODO: message d'avertissement
             ids = ids[0]
 
-        mesurable = self.read(cr, uid, ids, ['state'], context, context)
+        mesurable = self.read(cr, uid, ids, ['state'], context)
         if mesurable['state'] != 'encours':
             return
         self.write(
@@ -108,13 +108,13 @@ class Mesurable(osv.Model):
         )
         return self
 
-    def terminer(self, cr, uid, ids, context=None):
+    def action_terminer(self, cr, uid, ids, context=None):
         if type(ids) == list:
             if len(ids) != 1:
                 return # TODO: message d'avertissement
             ids = ids[0]
 
-        mesurable = self.read(cr, uid, ids, ['state'], context, context)
+        mesurable = self.read(cr, uid, ids, ['state'], context)
         if mesurable['state'] != 'encours':
             return
         self.write(
@@ -126,13 +126,13 @@ class Mesurable(osv.Model):
         )
         return self
 
-    def abandonner(self, cr, uid, ids, context=None):
+    def action_abandonner(self, cr, uid, ids, context=None):
         if type(ids) == list:
             if len(ids) != 1:
                 return # TODO: message d'avertissement
             ids = ids[0]
 
-        mesurable = self.read(cr, uid, ids, ['state'], context, context)
+        mesurable = self.read(cr, uid, ids, ['state'], context)
         if not ('encours', 'cree').__contains__(mesurable['state']):
             return
         self.write(
@@ -144,13 +144,13 @@ class Mesurable(osv.Model):
         )
         return self
 
-    def reprendre(self, cr, uid, ids, context=None):
+    def action_reprendre(self, cr, uid, ids, context=None):
         if type(ids) == list:
             if len(ids) != 1:
                 return # TODO: message d'avertissement
             ids = ids[0]
 
-        mesurable = self.read(cr, uid, ids, ['state'], context, context)
+        mesurable = self.read(cr, uid, ids, ['state'], context)
         if mesurable['state'] != 'suspendu':
             return
         self.write(
@@ -270,6 +270,9 @@ class Palier(osv.Model):
         phase_model = self.pool.get("cmmi.projet.phase")
         phases_ids = phase_model.search(cr, uid, [('selectionne', '=', True)])
 
+        palier_model = self.pool.get("cmmi.axes.palier")
+        palier = palier_model.read(cr, uid, palier_id, ['date_plan_deb', 'date_plan_fin'])
+
         # Création des PalierPhase
         palier_phase_model = self.pool.get("cmmi.axes.palier.phase")
         for phase_id in phases_ids:
@@ -279,6 +282,8 @@ class Palier(osv.Model):
                 {
                     'phase_id': phase_id,
                     'palier_id': palier_id,
+                    'date_plan_deb': palier['date_plan_deb'],
+                    'date_plan_fin': palier['date_plan_fin'],
                 }
             )
         return palier_id
@@ -329,7 +334,6 @@ class PalierPhase(osv.Model):
         return osv.Model.create(self, cr, uid, vals, context=context)
 
 
-
 # ================================ CHANTIER ================================= #
 class Chantier(osv.Model):
     _name = "cmmi.axes.chantier"