Mise en forme du code

diff --git a/__openerp__.py b/__openerp__.py
index 2823caa..5e8100a 100644 (file)
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -20,4 +20,4 @@
     ],
     "installable": True,
     "auto_install": False,
-}
\ No newline at end of file
+}

diff --git a/evolution.py b/evolution.py
index c999249..c45b089 100644 (file)
--- a/evolution.py
+++ b/evolution.py
@@ -31,7 +31,7 @@ class Evolution(osv.Model):
         "module_id": fields.many2one("projet.module",
                                      string="Modules"),
         "chantier_id": fields.many2one("projet.chantier",
-                                    string="Chantier"),
+                                       string="Chantier"),
         "palier_id": fields.many2one("projet.palier",
                                      string="Palier"),
         "phase_id": fields.many2one("projet.phase",
@@ -54,8 +54,8 @@ class Charge(osv.Model):
                                     string="Phase",
                                     required=True),
         "evolution_id": fields.many2one("projet.evolution",
-                                    string="Evolution",
-                                    required=True),
+                                        string="Evolution",
+                                        required=True),
         "mo_id": fields.many2one("projet.mo",
                                  string="Mo"),
     }

diff --git a/mo.py b/mo.py
index ed52ebf..9c2a81f 100644 (file)
--- a/mo.py
+++ b/mo.py
@@ -25,22 +25,24 @@ class RoleMO(osv.Model):
         "code": fields.char(string="Code", size=8, required=True),
         "description": fields.text(string="Description"),
         "statut": fields.selection(_statuts, string="Statut"),
-        "type_mo": fields.selection(_types_mo, string="Type de MO", required=True),
+        "type_mo": fields.selection(_types_mo,
+                                    string="Type de MO",
+                                    required=True),
         "structures": fields.one2many("projet.structure",
-                                   "role_mo_id",
-                                   string="MOs"),
+                                      "role_mo_id",
+                                      string="MOs"),
         "mo_ids": fields.one2many("projet.mo",
-                                   "role_mo_id",
-                                   string="MOs"),
+                                  "role_mo_id",
+                                  string="MOs"),
     }
 
 
-class mo(osv.Model):
+class Mo(osv.Model):
     _name = "cmmi.mo"
 
     _rangs = [("primaire", "Primaire"),
-               ("secondaire", "Secondaire"),
-               ("generique", "Générique")]
+              ("secondaire", "Secondaire"),
+              ("generique", "Générique")]
 
     _columns = {
         "name": fields.char(string="Title"),
@@ -56,25 +58,25 @@ class mo(osv.Model):
         "chose": "generique"}
 
 
-class moe(osv.Model):
+class Moe(osv.Model):
     _name = "cmmi.mo.moe"
     _inherit = "cmmi.mo"
 
     _columns = {
         "projets": fields.one2many("projet.projet",
-                                     "moe_id",
-                                     string="Projets"),
+                                   "moe_id",
+                                   string="Projets"),
     }
 
 
-class moa(osv.Model):
+class Moa(osv.Model):
     _name = "cmmi.mo.moa"
     _inherit = "cmmi.mo"
 
     _columns = {
         "projets": fields.one2many("projet.projet",
-                                     "moa_id",
-                                     string="Projets"),
+                                   "moa_id",
+                                   string="Projets"),
     }
 
 
@@ -90,7 +92,7 @@ class Structure(osv.Model):
         "description": fields.text(string="Description"),
         "parent_id": fields.many2one("projet.structure", string="Parent_id"),
         "statut": fields.selection(_statuts, string="Statut"),
-        "role_mo_id":fields.many2one("projet.role_mo", string="Role MO"),
+        "role_mo_id": fields.many2one("projet.role_mo", string="Role MO"),
         "projets": fields.many2many("projet.projet",
                                     "projet_projet_structure_rel",
                                     "structures",

diff --git a/projet.py b/projet.py
index ce2e8ea..f906d7f 100644 (file)
--- a/projet.py
+++ b/projet.py
@@ -4,10 +4,16 @@
 
 from openerp.osv import osv, fields
 
+
 class Projet(osv.Model):
 
     _name = "cmmi.projet"
 
+    _domains = {
+        'moe': [('role_mo_id.type_mo', '=', "MOE")],
+        'moa': [('role_mo_id.type_mo', '=', "MOA")],
+    }
+
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),
         "description": fields.text(string="Description"),
@@ -23,12 +29,12 @@ class Projet(osv.Model):
                                            "projet_projet_structure_rel",
                                            "projets",
                                            string="Structures",
-                                           domain=[('role_mo_id.type_mo', '=', "MOE")]),
+                                           domain=_domains['moe']),
         "structures_moa": fields.many2many("projet.structure",
                                            "projet_projet_structure_rel",
                                            "projets",
                                            string="Structures",
-                                           domain=[('role_mo_id.type_mo', '=', "MOA")]),
+                                           domain=_domains['moa']),
         "team_members": fields.many2many("projet.teammember",
                                          "projet_projet_teammember_rel",
                                          "projets",
@@ -43,11 +49,11 @@ class Projet(osv.Model):
                                    "projet_id",
                                    string="Paliers"),
         "phases": fields.one2many("projet.phase",
-                                   "projet_id",
-                                   string="Phases"),
-        "evolutions":fields.one2many("projet.evolution",
-                                     "projet_id",
-                                     string="Evolutions"),
+                                  "projet_id",
+                                  string="Phases"),
+        "evolutions": fields.one2many("projet.evolution",
+                                      "projet_id",
+                                      string="Evolutions"),
         "moe_id": fields.many2one("projet.moe", string="MoE", required=True),
         "moa_id": fields.many2one("projet.moa", string="MoA", required=True),
         "main_domain": fields.many2one("projet.domaine",