Fin de la restructuration

diff --git a/__openerp__.py b/__openerp__.py
index 5e8100a..8fc5f7f 100644 (file)
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -13,7 +13,7 @@
         # fichiers de données (vues, ...)
     ],
     "demo": [
-        'demo/projet_demo.xml'
+        'demo/projet.xml'
     ],
     "test": [
         # fichiers de test

diff --git a/axes.py b/axes.py
index 573ca49..7989c5b 100644 (file)
--- a/axes.py
+++ b/axes.py
@@ -49,13 +49,13 @@ class Mesurable(osv.Model):
 class Chantier(osv.Model):
     _name = "cmmi.axes.chantier"
 
-    _inherit = "projet.axes.mesurable"
+    _inherit = "cmmi.axes.mesurable"
 
     _columns = {
-        "projet_id": fields.many2one("projet.projet",
+        "projet_id": fields.many2one("cmmi.projet",
                                      string="Projet",
                                      required=True),
-        "evolutions": fields.one2many("projet.evolution",
+        "evolutions": fields.one2many("cmmi.evolution",
                                       "chantier_id",
                                       string="Evolutions"),
     }
@@ -64,20 +64,20 @@ class Chantier(osv.Model):
 class Palier(osv.Model):
     _name = "cmmi.axes.palier"
 
-    _inherit = "projet.axes.mesurable"
+    _inherit = "cmmi.axes.mesurable"
 
     _types_palier = [("normal", "Normal"), ("exceptionnel", "Exceptionnel"),
                      ("correctif", "Correctif"), ("autre", "Autre")]
 
     _columns = {
         "type_palier": fields.selection(_types_palier, string="Type"),
-        "projet_id": fields.many2one("projet.projet",
+        "projet_id": fields.many2one("cmmi.projet",
                                      string="Projet",
                                      required=True),
-        "evolutions": fields.one2many("projet.evolution",
+        "evolutions": fields.one2many("cmmi.evolution",
                                       "palier_id",
                                       string="Evolutions"),
-        "phases": fields.one2many("projet.phase",
+        "phases": fields.one2many("cmmi.phase",
                                   "palier_id",
                                   string="Phases"),
     }

diff --git a/description.py b/description.py
index 2b67f29..0683d46 100644 (file)
--- a/description.py
+++ b/description.py
@@ -11,10 +11,10 @@ class Module(osv.Model):
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),
         "description": fields.text(string="Description"),
-        "projet_id": fields.many2one("projet.projet",
+        "projet_id": fields.many2one("cmmi.projet",
                                      string="Projet",
                                      required=True),
-        "evolutions": fields.one2many("projet.evolution",
+        "evolutions": fields.one2many("cmmi.evolution",
                                       "module_id",
                                       string="Evolutions")
     }
@@ -30,11 +30,9 @@ class Domaine(osv.Model):
         "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"),
+        "parent_id": fields.many2one("cmmi.description.domaine", string="Parent_id"),
         "statut": fields.selection(_statuts, string="Statut"),
-        "projets": fields.many2many("projet.projet",
-                                    "projet_projet_structure_rel",
-                                    "domaines",
+        "projets": fields.many2many("cmmi.projet",
                                     string="Projets"),
     }
 

diff --git a/evolution.py b/evolution.py
index c45b089..9ceff4f 100644 (file)
--- a/evolution.py
+++ b/evolution.py
@@ -25,18 +25,18 @@ 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("projet.charge",
+        "charges": fields.one2many("cmmi.evolution.charge",
                                    "evolution_id",
                                    string="Charges"),
-        "module_id": fields.many2one("projet.module",
+        "module_id": fields.many2one("cmmi.description.module",
                                      string="Modules"),
-        "chantier_id": fields.many2one("projet.chantier",
+        "chantier_id": fields.many2one("cmmi.axes.chantier",
                                        string="Chantier"),
-        "palier_id": fields.many2one("projet.palier",
+        "palier_id": fields.many2one("cmmi.axes.palier",
                                      string="Palier"),
-        "phase_id": fields.many2one("projet.phase",
+        "phase_id": fields.many2one("cmmi.phase",
                                     string="Phase"),
-        "projet_id": fields.many2one("projet.projet",
+        "projet_id": fields.many2one("cmmi.projet",
                                      string="Projet"),
     }
 
@@ -47,15 +47,15 @@ class Charge(osv.Model):
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),
         "description": fields.text(string="Description"),
-        "teammember_id": fields.many2one("projet.teammember",
+        "teammember_id": fields.many2one("cmmi.partner.teammember",
                                          string="Team Member",
                                          required=True),
-        "phase_id": fields.many2one("projet.phase",
+        "phase_id": fields.many2one("cmmi.phase",
                                     string="Phase",
                                     required=True),
-        "evolution_id": fields.many2one("projet.evolution",
+        "evolution_id": fields.many2one("cmmi.evolution",
                                         string="Evolution",
                                         required=True),
-        "mo_id": fields.many2one("projet.mo",
+        "mo_id": fields.many2one("cmmi.mo",
                                  string="Mo"),
     }

diff --git a/mo.py b/mo.py
index dcffb04..d8fe2f2 100644 (file)
--- a/mo.py
+++ b/mo.py
@@ -28,10 +28,10 @@ class RoleMO(osv.Model):
         "type_mo": fields.selection(_types_mo,
                                     string="Type de MO",
                                     required=True),
-        "structures": fields.one2many("projet.structure",
+        "structures": fields.one2many("cmmi.mo.structure",
                                       "role_mo_id",
                                       string="MOs"),
-        "mo_ids": fields.one2many("projet.mo",
+        "mo_ids": fields.one2many("cmmi.mo",
                                   "role_mo_id",
                                   string="MOs"),
     }
@@ -48,14 +48,14 @@ class Mo(osv.Model):
         "name": fields.char(string="Title"),
         "description": fields.text(string="Description"),
         "rang": fields.selection(_rangs, string="Rang", required=True),
-        "role_mo_id": fields.many2one("projet.role_mo", string="Role"),
-        "charges": fields.one2many("projet.charge",
+        "role_mo_id": fields.many2one("cmmi.mo.role", string="Role"),
+        "charges": fields.one2many("cmmi.evolution.charge",
                                    "mo_id",
                                    string="Charges"),
     }
 
     _defaults = {
-        "chose": "generique"}
+        "rang": "primaire"}
 
 
 class Moe(osv.Model):
@@ -63,7 +63,7 @@ class Moe(osv.Model):
     _inherit = "cmmi.mo"
 
     _columns = {
-        "projets": fields.one2many("projet.projet",
+        "projets": fields.one2many("cmmi.projet",
                                    "moe_id",
                                    string="Projets"),
     }
@@ -74,7 +74,7 @@ class Moa(osv.Model):
     _inherit = "cmmi.mo"
 
     _columns = {
-        "projets": fields.one2many("projet.projet",
+        "projets": fields.one2many("cmmi.projet",
                                    "moa_id",
                                    string="Projets"),
     }
@@ -90,10 +90,10 @@ class Structure(osv.Model):
         "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"),
+        "parent_id": fields.many2one("cmmi.mo.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",
+        "role_mo_id": fields.many2one("cmmi.mo.role", string="Role MO"),
+        "projets": fields.many2many("cmmi.projet",
                                     "projet_projet_structure_rel",
                                     "structures",
                                     string="Projets"),

diff --git a/partner.py b/partner.py
index e8f8b6c..e5277f2 100644 (file)
--- a/partner.py
+++ b/partner.py
@@ -6,16 +6,17 @@ from openerp.osv import osv, fields
 
 
 class Teammember(osv.Model):
-    _name = "projet.partner.teammember"
+    _name = "cmmi.partner.teammember"
 
     _inherit = "res.partner"
 
     _columns = {
-        "projets": fields.many2many("projet.projet",
-                                    "projet_projet_teammember_rel",
-                                    "team_members",
+        "projets": fields.many2many("cmmi.projet",
+                                    "cmmi_projet_teammember_rel",
+                                    "partner_id",
+                                    "projet_id",
                                     string="Projets"),
-        "charges": fields.one2many("projet.projet",
+        "charges": fields.one2many("cmmi.projet",
                                    "team_members",
                                    string="Charges"),
     }

diff --git a/phase.py b/phase.py
index 973657a..7647037 100644 (file)
--- a/phase.py
+++ b/phase.py
@@ -26,17 +26,17 @@ class Phase(osv.Model):
         "name": fields.char(string="Title", size=64, required=True),
         "description": fields.text(string="Description"),
         "statut": fields.selection(_statuts, string="Statut"),
-        "type_phase_id": fields.many2one("projet.type_phase",
+        "type_phase_id": fields.many2one("cmmi.phase.type",
                                          string="Type phase"),
-        "projet_id": fields.many2one("projet.projet",
+        "projet_id": fields.many2one("cmmi.projet",
                                      string="Projet",
                                      required=True),
-        "charges": fields.one2many("projet.charge",
+        "charges": fields.one2many("cmmi.evolution.charge",
                                    "phase_id",
                                    string="Charges"),
-        "evolutions": fields.one2many("projet.evolution",
+        "evolutions": fields.one2many("cmmi.evolution",
                                       "phase_id",
                                       string="Evolutions"),
-        "palier_id": fields.many2one("projet.palier",
+        "palier_id": fields.many2one("cmmi.axes.palier",
                                      string="Palier"),
     }

diff --git a/projet.py b/projet.py
index f906d7f..2b4d94a 100644 (file)
--- a/projet.py
+++ b/projet.py
@@ -17,47 +17,40 @@ class Projet(osv.Model):
     _columns = {
         "name": fields.char(string="Title", size=64, required=True),
         "description": fields.text(string="Description"),
-        "domaines": fields.many2many("projet.domaine",
-                                     "projet_projet_domaine_rel",
-                                     "projets",
+        "domaines": fields.many2many("cmmi.description.domaine",
                                      string="Domaines"),
-        "structures": fields.many2many("projet.structure",
-                                       "projet_projet_structure_rel",
-                                       "projets",
+        "structures": fields.many2many("cmmi.mo.structure",
                                        string="Structures"),
-        "structures_moe": fields.many2many("projet.structure",
-                                           "projet_projet_structure_rel",
-                                           "projets",
+        "structures_moe": fields.many2many("cmmi.mo.structure",
                                            string="Structures",
                                            domain=_domains['moe']),
-        "structures_moa": fields.many2many("projet.structure",
-                                           "projet_projet_structure_rel",
-                                           "projets",
+        "structures_moa": fields.many2many("cmmi.mo.structure",
                                            string="Structures",
                                            domain=_domains['moa']),
-        "team_members": fields.many2many("projet.teammember",
-                                         "projet_projet_teammember_rel",
-                                         "projets",
+        "team_members": fields.many2many("cmmi.partner.teammember",
+                                         "cmmi_projet_teammember_rel",
+                                         "projet_id",
+                                         "partner_id",
                                          string="Team Members"),
-        "modules": fields.one2many("projet.module",
+        "modules": fields.one2many("cmmi.description.module",
                                    "projet_id",
                                    string="Modules"),
-        "chantiers": fields.one2many("projet.chantier",
+        "chantiers": fields.one2many("cmmi.axes.chantier",
                                      "projet_id",
                                      string="Chantiers"),
-        "paliers": fields.one2many("projet.palier",
+        "paliers": fields.one2many("cmmi.axes.palier",
                                    "projet_id",
                                    string="Paliers"),
-        "phases": fields.one2many("projet.phase",
+        "phases": fields.one2many("cmmi.phase",
                                   "projet_id",
                                   string="Phases"),
-        "evolutions": fields.one2many("projet.evolution",
+        "evolutions": fields.one2many("cmmi.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",
+        "moe_id": fields.many2one("cmmi.mo.moe", string="MoE", required=True),
+        "moa_id": fields.many2one("cmmi.mo.moa", string="MoA", required=True),
+        "main_domain": fields.many2one("cmmi.description.domaine",
                                        string="Domaine principal"),
-        "main_structure": fields.many2one("projet.structure",
+        "main_structure": fields.many2one("cmmi.mo.structure",
                                           string="Structure principale"),
     }

diff --git a/views/projet.xml b/views/projet.xml
index b0673eb..0aa0c20 100644 (file)
--- a/views/projet.xml
+++ b/views/projet.xml
@@ -4,7 +4,7 @@
         <!--         VIEWS PROJET         -->
         <record model="ir.ui.view" id="projet_form_view">
             <field name="name">projet.form</field>
-            <field name="model">projet.projet</field>
+            <field name="model">cmmi.projet</field>
             <field name="arch" type="xml">
                 <form string="Todolist Form" version="7.0">
                     <header />
@@ -135,25 +135,25 @@
 
         <record model="ir.actions.act_window" id="projets_list_action">
             <field name="name">Liste des projets</field>
-            <field name="res_model">projet.projet</field>
+            <field name="res_model">cmmi.projet</field>
             <field name="view_mode">tree,form</field>
         </record>
 
         <record model="ir.actions.act_window" id="domaines_list_action">
             <field name="name">Liste des domaines</field>
-            <field name="res_model">projet.domaine</field>
+            <field name="res_model">cmmi.description.domaine</field>
             <field name="view_mode">tree,form</field>
         </record>
 
         <record model="ir.actions.act_window" id="structures_list_action">
             <field name="name">Liste des structures</field>
-            <field name="res_model">projet.structure</field>
+            <field name="res_model">cmmi.mo.structure</field>
             <field name="view_mode">tree,form</field>
         </record>
 
         <record model="ir.actions.act_window" id="phases_list_action">
             <field name="name">Liste des phases</field>
-            <field name="res_model">projet.phase</field>
+            <field name="res_model">cmmi.phase</field>
             <field name="view_mode">tree,form</field>
         </record>