Deuxième passe de corrections

[OpenERP/cmmi.git] / projet.py

diff --git a/projet.py b/projet.py
index d9c4182..80ba871 100644 (file)
--- a/projet.py
+++ b/projet.py
@@ -310,6 +310,8 @@ class ProjetMoa(osv.Model):
 class ProjetPhase(osv.Model):
     _name = "cmmi.projet.phase"
 
+    _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)):
             ids = [ids]
@@ -321,30 +323,40 @@ class ProjetPhase(osv.Model):
                                 type='char',
                                 store=True,
                                 string="Nom de la phase"),
-        "selectionne": fields.boolean(string="Phase sélectionnée ?"),
+        "phase_id": fields.many2one("cmmi.phase",
+                                    string="Phase",
+                                    required=True),
         "projet_id": fields.many2one("cmmi.projet",
                                      string="Projet",
                                      required=True),
-        "phase_id": fields.many2one("cmmi.phase.type",
-                                    string="Phase",
-                                    required=True),
+        "selectionne": fields.boolean(string="Phase sélectionnée ?"),
     }
 
 
 class ProjetTeammember(osv.Model):
     _name = "cmmi.projet.teammember"
 
-    def _get_name(self, cr, uid, ids, field_name=None, arg=None, context=None):
+    def _get_partner_name(self, cr, uid, ids, field_name=None, arg=None, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
         return dict([(i, r.partner_id.name) for i, r in
                 zip(ids, self.browse(cr, uid, ids, context=context))])
 
+    def _get_project_name(self, cr, uid, ids, field_name=None, arg=None, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        return dict([(i, r.projet_id.name) for i, r in
+                zip(ids, self.browse(cr, uid, ids, context=context))])
+
     _columns = {
-        "name": fields.function(_get_name,
+        "name": fields.function(_get_partner_name,
                                 type='char',
                                 store=True,
-                                string="Nom de la phase"),
+                                string="Nom du partner"),
+        "projet_name": fields.function(_get_project_name,
+                                       type='char',
+                                       store=True,
+                                       string="Nom du projet"),
         "affecte": fields.integer(string="Affecté à"),
         "depuis": fields.date(string="Depuis"),
         "jusqua": fields.date(string="Jusqu'à"),