From 2be62670d519494aad2e45f78a2bbdac4fa9b337 Mon Sep 17 00:00:00 2001
From: Alicia FLOREZ <alicflorez@gmail.com>
Date: Thu, 13 Jun 2013 12:12:04 +0200
Subject: [PATCH] =?utf8?q?Corretion=20aux=20bugs=20du=20dernier=20commit=20+?=
 =?utf8?q?=20modification=20vue=20form=20=C3=A9volution?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 evolution.py        |    6 +++---
 views/evolution.xml |   24 +++++++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/evolution.py b/evolution.py
index 485ef59..e3a5cc3 100644
--- a/evolution.py
+++ b/evolution.py
@@ -26,14 +26,14 @@ 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
 
@@ -50,7 +50,7 @@ class Evolution(osv.Model):
 #        "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
diff --git a/views/evolution.xml b/views/evolution.xml
index f557e92..95d0e25 100644
--- a/views/evolution.xml
+++ b/views/evolution.xml
@@ -17,26 +17,28 @@
                     </header>
 
                     <sheet>
-                        <group colspan="4" col="3">
-                            <field name="name" colspan="3"/>
-                            <field name="pid" colspan="3"/>
-                            <field name="priorite" colspan="3"/>
-                            <field name="state" colspan="3"/>
+                        <group colspan="4" col="4">
+                            <field name="name" colspan="4"/>
+                            <field name="pid" colspan="2"/>
+                            <field name="priorite" colspan="2"/>
+                            <field name="state" colspan="4"/>
+                            <field name="charge_init" colspan="2"/>
+                            <field name="charge_plan" colspan="2"/>
                         </group>
-                        <notebook colspan="4">
+                        <notebook>
                             <page string="Détails">
-                                <group colspan="4">
+                                <group col="3">
                                     <field name="demandeur" />
                                     <field name="description" />
                                     <field name="objectif" />
                                     <field name="commentaire" />
                                 </group>
-                            </page><!--
-                            <page string="Charges">
-                                <field name="charges">
+                            </page>
+                            <page string="Phases">
+                                <field name="phases">
                                     <field name="name" />
                                 </field>
-                            </page>-->
+                            </page>
                         </notebook>
                     </sheet>
                 </form>
-- 
1.7.10.4