Séparation Description

diff --git a/__init__.py b/__init__.py
index 44e8cb9..f26bc11 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,5 @@
 import mo
 import axes
 import phase
+import description
 import projet

diff --git a/mo.py b/mo.py
index 1873041..261222e 100644 (file)
--- a/mo.py
+++ b/mo.py
@@ -76,3 +76,23 @@ class moa(osv.Model):
                                      "moa_id",
                                      string="Projets"),
     }
+
+
+class Structure(osv.Model):
+
+    _name = "projet.structure"
+
+    _statuts = [("actif", "Actif"), ("inactif", "Inactif")]
+
+    _columns = {
+        "name": fields.char(string="Title", size=64, required=True),
+        "code": fields.char(string="Code", size=8, required=True),
+        "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"),
+        "projets": fields.many2many("projet.projet",
+                                    "projet_projet_structure_rel",
+                                    "structures",
+                                    string="Projets"),
+    }

diff --git a/projet.py b/projet.py
index 31d5014..fe8149f 100644 (file)
--- a/projet.py
+++ b/projet.py
@@ -93,62 +93,6 @@ class Evolution(osv.Model):
     }
 
 
-class Structure(osv.Model):
-
-    _name = "projet.structure"
-
-    _statuts = [("actif", "Actif"), ("inactif", "Inactif")]
-
-    _columns = {
-        "name": fields.char(string="Title", size=64, required=True),
-        "code": fields.char(string="Code", size=8, required=True),
-        "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"),
-        "projets": fields.many2many("projet.projet",
-                                    "projet_projet_structure_rel",
-                                    "structures",
-                                    string="Projets"),
-    }
-
-
-class Module(osv.Model):
-    _name = "projet.module"
-
-    _columns = {
-        "name": fields.char(string="Title", size=64, required=True),
-        "description": fields.text(string="Description"),
-        "projet_id": fields.many2one("projet.projet",
-                                     string="Projet",
-                                     required=True),
-        "evolutions": fields.one2many("projet.evolution",
-                                      "module_id",
-                                      string="Evolutions")
-    }
-
-
-class Domaine(osv.Model):
-    _name = "projet.domaine"
-
-    _statuts = [("actif", "Actif"), ("inactif", "Inactif")]
-
-    _columns = {
-        "name": fields.char(string="Title", size=64, required=True),
-        "code": fields.char(string="Code", size=8),
-        "description": fields.text(string="Description"),
-        "ordre": fields.integer(string="Ordre"),
-        "parent_id": fields.many2one("projet.domaine", string="Parent_id"),
-        "statut": fields.selection(_statuts, string="Statut"),
-        "projets": fields.many2many("projet.projet",
-                                    "projet_projet_structure_rel",
-                                    "domaines",
-                                    string="Projets"),
-    }
-
-    _order = "id"
-
-
 class Teammember(osv.Model):
     _name = "projet.teammember"