From: Alicia FLOREZ <alicflorez@gmail.com>
Date: Fri, 31 May 2013 13:37:14 +0000 (+0200)
Subject: Modification des vues
X-Git-Url: http://git.inspyration.org/?p=OpenERP%2Fcmmi.git;a=commitdiff_plain;h=85f4622fe806fe4f2ed725634f81341d56716eec

Modification des vues
---

diff --git a/__openerp__.py b/__openerp__.py
index f2ea2c8..425c202 100644
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -19,9 +19,9 @@
         'views/phase.xml',
 #        'views/team_member.xml',
         'views/projet.xml',
-#        'views/evolution.xml',
-#        'views/chantier.xml',
-#        'views/palier.xml',
+        'views/evolution.xml',
+        'views/chantier.xml',
+        'views/palier.xml',
         # Menus
         'views/menu.xml',
     ],
diff --git a/axes.py b/axes.py
index 7fa55c4..21fb17c 100644
--- a/axes.py
+++ b/axes.py
@@ -18,6 +18,9 @@ class Mesurable(osv.Model):
     def _nb_jours_init(self, cr, uid, ids, field, arg, context=None):
         result = {}
         for m in self.browse(cr, uid, ids, context=context):
+            if not m.date_init_deb or not m.date_init_fin:
+                result[m.id] = 0
+                continue
             result[m.id] = Mesurable._nb_jours_ouvre_entre_2_dates(
                         datetime.strptime(m.date_init_deb, "%Y-%m-%d").date(),
                         datetime.strptime(m.date_init_fin, "%Y-%m-%d").date())
@@ -30,12 +33,12 @@ class Mesurable(osv.Model):
         "statut": fields.selection(_statuts, string="Statut"),
         "version": fields.char(string="Version", size=16),
         "date_jalon": fields.date(string="Jalon"),
-        "date_init_deb": fields.date(string="Date initiale début"),
-        "date_init_fin": fields.date(string="Date initiale de fin"),
-        "date_plan_deb": fields.date(string="Date plannifiée début"),
-        "date_plan_fin": fields.date(string="Date plannifiée de fin"),
-        "date_reel_deb": fields.date(string="Data réelle début"),
-        "date_reel_fin": fields.date(string="Data réelle fin"),
+        "date_init_deb": fields.date(string="Init début"),
+        "date_init_fin": fields.date(string="Init fin"),
+        "date_plan_deb": fields.date(string="Plan début"),
+        "date_plan_fin": fields.date(string="Plan fin"),
+        "date_reel_deb": fields.date(string="Réel début"),
+        "date_reel_fin": fields.date(string="Réel fin"),
         "nb_jours_projets": fields.function(_nb_jours_init,
                                             type="integer",
                                             string="Nombre de jour"),
@@ -119,6 +122,8 @@ class Mesurable(osv.Model):
         >>> nb_jours_ouvre_entre_2_dates(date(2013, 7, 31), date(2013, 5, 1))
         62
         """
+        if not d1 or not d2:
+            return 0
         if d1>d2:
             d1, d2 = d2, d1 #Switch les 2 dates pour que d1 soit la plus petite
         tmp = d1
@@ -156,6 +161,29 @@ class Palier(osv.Model):
     }
 
 
+    def create(self, cr, uid, vals, context=None):
+        palier_id = osv.Model.create(self, cr, uid, vals, context=context)
+
+        # Récupération des ids de toutes les phases
+        phase_model = self.pool.get("cmmi.projet.phase")
+        phases_ids = phase_model.search(cr, uid, [('selectionne', '=', True)])
+
+        # Création des PalierPhase
+        palier_phase_model = self.pool.get("cmmi.axes.palier.phase")
+        for phase_id in phases_ids:
+            palier_phase_model.create(
+                cr,
+                uid,
+                {
+                    'phase_id': phase_id,
+                    'palier_id': palier_id,
+                }
+            )
+
+        return palier_id
+
+
+
 class PalierPhase(osv.Model):
     _name = "cmmi.axes.palier.phase"
 
diff --git a/views/projet.xml b/views/projet.xml
index babaaef..cfd9598 100644
--- a/views/projet.xml
+++ b/views/projet.xml
@@ -95,7 +95,6 @@
                                 <field name="paliers">
                                     <tree>
                                         <field name="name" />
-                                        <field name="description" />
                                         <field name="statut" />
                                         <field name="date_jalon" />
                                         <field name="type_palier" />