From: Alicia FLOREZ <alicflorez@gmail.com>
Date: Thu, 30 May 2013 16:01:52 +0000 (+0200)
Subject: Première corrections suite à la restructuration
X-Git-Url: http://git.inspyration.org/?p=OpenERP%2Fcmmi.git;a=commitdiff_plain;h=10a4594cbea00cbd4944739d116a8ee68aab0752

Première corrections suite à la restructuration
---

diff --git a/axes.py b/axes.py
index aa6ccf1..9646baf 100644
--- a/axes.py
+++ b/axes.py
@@ -148,7 +148,7 @@ class Palier(osv.Model):
         "evolutions": fields.one2many("cmmi.evolution",
                                       "palier_id",
                                       string="Evolutions"),
-        "phases": fields.one2many("cmmi.projet.phase",
+        "phases": fields.one2many("cmmi.axes.palier.phase",
                                   "palier_id",
                                   string="Phases"),
     }
@@ -181,9 +181,9 @@ class Phase(osv.Model):
         "charges": fields.one2many("cmmi.evolution.charge",
                                    "phase_id",
                                    string="Charges"),
-        "evolutions": fields.one2many("cmmi.evolution",
-                                      "phase_id",
-                                      string="Evolutions"),
+#        "evolutions": fields.one2many("cmmi.evolution", #Supprimé !
+#                                      "phase_id",
+#                                      string="Evolutions"),
     }
 
     def create(self, cr, uid, vals, context=None):
diff --git a/evolution.py b/evolution.py
index b8337ff..8594dd5 100644
--- a/evolution.py
+++ b/evolution.py
@@ -29,9 +29,9 @@ class Evolution(osv.Model):
         "keywords": fields.text(string="Mots clés"),
         "priorite": fields.selection(_priorites, string="Priorité"),
         "statut": fields.selection(_statuts, string="Statut"),
-        "charges": fields.one2many("cmmi.evolution.charge",
-                                   "evolution_id",
-                                   string="Charges"),
+#        "charges": fields.one2many("cmmi.evolution.charge", # Supprimé !
+#                                   "evolution_id",
+#                                   string="Charges"),
         "module_id": fields.many2one("cmmi.description.module",
                                      string="Modules"),
         "chantier_id": fields.many2one("cmmi.axes.chantier",
@@ -86,7 +86,7 @@ class Charge(osv.Model):
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),
         "description": fields.text(string="Description"),
-        "teammember_id": fields.many2one("res.partner", # TODO: Vers l'association teammenmer MO plutôt que MO.
+        "teammember_id": fields.many2one("res.partner", # TODO: Vers l'association teammember MO plutôt que MO.
                                          string="Team Member",
                                          required=True),
         "phase_id": fields.many2one("cmmi.evolution.phase",
diff --git a/mo.py b/mo.py
index fa3599a..1726e40 100644
--- a/mo.py
+++ b/mo.py
@@ -49,9 +49,9 @@ class Mo(osv.Model):
         "description": fields.text(string="Description"),
         "rang": fields.selection(_rangs, string="Rang", required=True),
         "role_mo_id": fields.many2one("cmmi.mo.role", string="Role"),
-        "charges": fields.one2many("cmmi.evolution.charge",
-                                   "mo_id",
-                                   string="Charges"),
+#        "charges": fields.one2many("cmmi.evolution.charge", # TODO: Faire l'association teammember MO plutôt que MO.
+#                                   "mo_id",
+#                                   string="Charges"),
     }
 
     _defaults = {
diff --git a/projet.py b/projet.py
index 96e0502..80ba871 100644
--- a/projet.py
+++ b/projet.py
@@ -310,7 +310,7 @@ class ProjetMoa(osv.Model):
 class ProjetPhase(osv.Model):
     _name = "cmmi.projet.phase"
 
-    _description = "Linking of phases to projects / Rattachement des Phases aux projets"
+    _description = "Rattachement des Phases aux projets"
 
     def _get_name(self, cr, uid, ids, field_name=None, arg=None, context=None):
         if isinstance(ids, (int, long)):
diff --git a/views/evolution.xml b/views/evolution.xml
index 80802f3..e9c032e 100644
--- a/views/evolution.xml
+++ b/views/evolution.xml
@@ -25,12 +25,12 @@
                                     <field name="objectif" />
                                     <field name="commentaire" />
                                 </group>
-                            </page>
+                            </page><!--
                             <page string="Charges">
                                 <field name="charges">
                                     <field name="name" />
                                 </field>
-                            </page>
+                            </page>-->
                         </notebook>
                     </sheet>
                 </form>