Réorganisation DB

diff --git a/axes.py b/axes.py
index 9fc7a31..573ca49 100644 (file)
--- a/axes.py
+++ b/axes.py
@@ -6,7 +6,7 @@ from openerp.osv import osv, fields
 
 
 class Mesurable(osv.Model):
-    _name = "projet.mesurable"
+    _name = "cmmi.axes.mesurable"
 
     _statuts = [("cree", "Crée"), ("encours", "En cours"),
                 ("termine", "Terminé"), ("abandonne", "Abandonné"),
@@ -47,9 +47,9 @@ class Mesurable(osv.Model):
 
 
 class Chantier(osv.Model):
-    _name = "projet.chantier"
+    _name = "cmmi.axes.chantier"
 
-    _inherit = "projet.mesurable"
+    _inherit = "projet.axes.mesurable"
 
     _columns = {
         "projet_id": fields.many2one("projet.projet",
@@ -62,13 +62,13 @@ class Chantier(osv.Model):
 
 
 class Palier(osv.Model):
-    _name = "projet.palier"
+    _name = "cmmi.axes.palier"
+
+    _inherit = "projet.axes.mesurable"
 
     _types_palier = [("normal", "Normal"), ("exceptionnel", "Exceptionnel"),
                      ("correctif", "Correctif"), ("autre", "Autre")]
 
-    _inherit = "projet.mesurable"
-
     _columns = {
         "type_palier": fields.selection(_types_palier, string="Type"),
         "projet_id": fields.many2one("projet.projet",

diff --git a/description.py b/description.py
index d2e5098..2b67f29 100644 (file)
--- a/description.py
+++ b/description.py
@@ -6,7 +6,7 @@ from openerp.osv import osv, fields
 
 
 class Module(osv.Model):
-    _name = "projet.module"
+    _name = "cmmi.description.module"
 
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),
@@ -21,7 +21,7 @@ class Module(osv.Model):
 
 
 class Domaine(osv.Model):
-    _name = "projet.domaine"
+    _name = "cmmi.description.domaine"
 
     _statuts = [("actif", "Actif"), ("inactif", "Inactif")]
 

diff --git a/evolution.py b/evolution.py
index 1cb6e65..c999249 100644 (file)
--- a/evolution.py
+++ b/evolution.py
@@ -6,7 +6,7 @@ from openerp.osv import osv, fields
 
 
 class Evolution(osv.Model):
-    _name = "projet.evolution"
+    _name = "cmmi.evolution"
 
     _priorites = [("incontournable", "Incontournable"),
                   ("necessaire", "Nécéssaire"),
@@ -42,7 +42,7 @@ class Evolution(osv.Model):
 
 
 class Charge(osv.Model):
-    _name = "projet.charge"
+    _name = "cmmi.evolution.charge"
 
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),

diff --git a/mo.py b/mo.py
index 76fb9f4..ed52ebf 100644 (file)
--- a/mo.py
+++ b/mo.py
@@ -11,10 +11,10 @@ MOA = Maîtrise d'ouvrage (ceux qui demandent et contrôlent)
 from openerp.osv import osv, fields
 
 
-class Role_MO(osv.Model):
+class RoleMO(osv.Model):
     """Role MO: différents types de MOE et MOA"""
 
-    _name = "projet.role_mo"
+    _name = "cmmi.mo.role"
 
     _statuts = [("actif", "Actif"), ("inactif", "Inactif")]
 
@@ -36,7 +36,7 @@ class Role_MO(osv.Model):
 
 
 class mo(osv.Model):
-    _name = "projet.mo"
+    _name = "cmmi.mo"
 
     _rangs = [("primaire", "Primaire"),
                ("secondaire", "Secondaire"),
@@ -57,8 +57,8 @@ class mo(osv.Model):
 
 
 class moe(osv.Model):
-    _name = "projet.moe"
-    _inherit = "projet.mo"
+    _name = "cmmi.mo.moe"
+    _inherit = "cmmi.mo"
 
     _columns = {
         "projets": fields.one2many("projet.projet",
@@ -68,8 +68,8 @@ class moe(osv.Model):
 
 
 class moa(osv.Model):
-    _name= "projet.moa"
-    _inherit = "projet.mo"
+    _name = "cmmi.mo.moa"
+    _inherit = "cmmi.mo"
 
     _columns = {
         "projets": fields.one2many("projet.projet",
@@ -80,7 +80,7 @@ class moa(osv.Model):
 
 class Structure(osv.Model):
 
-    _name = "projet.structure"
+    _name = "cmmi.mo.structure"
 
     _statuts = [("actif", "Actif"), ("inactif", "Inactif")]
 

diff --git a/partner.py b/partner.py
index 4e0a6de..e8f8b6c 100644 (file)
--- a/partner.py
+++ b/partner.py
@@ -6,7 +6,7 @@ from openerp.osv import osv, fields
 
 
 class Teammember(osv.Model):
-    _name = "projet.teammember"
+    _name = "projet.partner.teammember"
 
     _inherit = "res.partner"
 

diff --git a/phase.py b/phase.py
index 035c8c2..973657a 100644 (file)
--- a/phase.py
+++ b/phase.py
@@ -5,8 +5,8 @@
 from openerp.osv import osv, fields
 
 
-class Type_Phase(osv.Model):
-    _name = "projet.type_phase"
+class TypePhase(osv.Model):
+    _name = "cmmi.phase.type"
 
     _statuts = [("actif", "Actif"), ("inactif", "Inactif")]
 
@@ -18,7 +18,7 @@ class Type_Phase(osv.Model):
 
 
 class Phase(osv.Model):
-    _name = "projet.phase"
+    _name = "cmmi.phase"
 
     _statuts = [("actif", "Actif"), ("inactif", "Inactif")]
 

diff --git a/projet.py b/projet.py
index bcae1d4..ce2e8ea 100644 (file)
--- a/projet.py
+++ b/projet.py
@@ -6,7 +6,7 @@ from openerp.osv import osv, fields
 
 class Projet(osv.Model):
 
-    _name = "projet.projet"
+    _name = "cmmi.projet"
 
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),