Ajout du nombre de jours plannifiés pour un mesurable

diff --git a/axes.py b/axes.py
index 84cf5c9..0dbbe80 100644 (file)
--- a/axes.py
+++ b/axes.py
@@ -15,6 +15,7 @@ class Mesurable(osv.Model):
                 ("termine", "Terminé"), ("abandonne", "Abandonné"),
                 ("suspendu", "Suspendu"), ("generique", "Générique")]
 
+
     def _nb_jours_init(self, cr, uid, ids, field, arg, context=None):
         result = {}
         for m in self.browse(cr, uid, ids, context=context):
@@ -26,6 +27,19 @@ class Mesurable(osv.Model):
                         datetime.strptime(m.date_init_fin, "%Y-%m-%d").date())
         return result
 
+
+    def _nb_jours_plan(self, cr, uid, ids, field, arg, context=None):
+        result = {}
+        for m in self.browse(cr, uid, ids, context=context):
+            if not m.date_plan_deb or not m.date_plan_fin:
+                result[m.id] = 0
+                continue
+            result[m.id] = Mesurable._nb_jours_ouvre_entre_2_dates(
+                        datetime.strptime(m.date_plan_deb, "%Y-%m-%d").date(),
+                        datetime.strptime(m.date_plan_fin, "%Y-%m-%d").date())
+        return result
+
+
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),
         "description": fields.text(string="Description"),
@@ -39,9 +53,12 @@ class Mesurable(osv.Model):
         "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_initial": fields.function(_nb_jours_init,
+        "nb_jours_init": fields.function(_nb_jours_init,
+                                            type="integer",
+                                            string="Nombre de jours initials"),
+        "nb_jours_plan": fields.function(_nb_jours_plan,
                                             type="integer",
-                                            string="Nombre de jour"),
+                                            string="Nombre de jours planifiés"),
     }
 
     _defaults = {

diff --git a/views/projet.xml b/views/projet.xml
index 1b85d25..6c3e80f 100644 (file)
--- a/views/projet.xml
+++ b/views/projet.xml
@@ -87,7 +87,7 @@
                                         <field name="date_plan_fin" />
                                         <field name="date_reel_deb" />
                                         <field name="date_reel_fin" />
-                                        <field name="nb_jours_initial" />
+                                        <field name="nb_jours_init" />
                                     </tree>
                                 </field>
                             </page>
@@ -104,7 +104,7 @@
                                         <field name="date_plan_fin" />
                                         <field name="date_reel_deb" />
                                         <field name="date_reel_fin" />
-                                        <field name="nb_jours_initial" />
+                                        <field name="nb_jours_init" />
                                     </tree>
                                 </field>
                             </page>