From: Sébastien CHAZALLET <s.chazallet@gmail.com>
Date: Thu, 30 May 2013 19:22:02 +0000 (+0200)
Subject: Deuxième passe de corrections
X-Git-Url: http://git.inspyration.org/?p=OpenERP%2Fcmmi.git;a=commitdiff_plain;h=e14dc7a307a498df63b54a319375aa4c3afef75c

Deuxième passe de corrections
---

diff --git a/__openerp__.py b/__openerp__.py
index 442b1e3..264ce04 100644
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -12,11 +12,11 @@
         'views/wizards/moa.xml',
         # Vues associées aux modèles
         'views/projet.xml',
-        'views/evolution.xml',
-        'views/phase.xml',
-        'views/chantier.xml',
-        'views/palier.xml',
-        'views/team_member.xml',
+#        'views/evolution.xml',
+#        'views/phase.xml',
+#        'views/chantier.xml',
+#        'views/palier.xml',
+#        'views/team_member.xml',
         # Menus
         'views/menu.xml',
         # Données
diff --git a/demo/projet.xml b/demo/projet.xml
index 79c8f85..a145835 100644
--- a/demo/projet.xml
+++ b/demo/projet.xml
@@ -39,14 +39,6 @@
         </record>
 
 
-        <record id="projet_projet_1" model="cmmi.projet">
-            <field name="name">Projet of the doom</field>
-            <field name="description">Ici c'est la description de ce super projet !</field><!--
-            <field name="moe_id" ref="cmmi_moe_0" />
-            <field name="moa_id" ref="cmmi_moa_0" />-->
-        </record>
-
-
     <!--
        Resource: projet.projet_domaine_rel
     -->
diff --git a/views/menu.xml b/views/menu.xml
index 9c4f136..365437b 100644
--- a/views/menu.xml
+++ b/views/menu.xml
@@ -8,7 +8,7 @@
             <field name="name">Liste des projets</field>
             <field name="res_model">cmmi.projet</field>
             <field name="view_mode">tree,form</field>
-        </record>
+        </record><!--
 
         <record model="ir.actions.act_window" id="domaines_list_action">
             <field name="name">Liste des domaines</field>
@@ -32,18 +32,18 @@
             <field name="name">Team members</field>
             <field name="res_model">res.partner</field>
             <field name="view_mode">tree,form</field>
-        </record>
+        </record>-->
 
         <!--         MENUS         -->
 
         <menuitem id="main_projet_menu" name="Projet" />
         <menuitem id="mt_projet_menu" name="CMMI" parent="main_projet_menu" />
         <menuitem id="mt_referentiels_menu" name="Référentiels" parent="main_projet_menu" groups="base.group_no_one" /> <!-- group_no_one : Technical Features -->
-        <menuitem id="mt_projet_projets_list_menu" name="Liste des projets" parent="mt_projet_menu" action="projets_list_action"/>
+        <menuitem id="mt_projet_projets_list_menu" name="Liste des projets" parent="mt_projet_menu" action="projets_list_action"/><!--
         <menuitem id="mt_projet_domaines_list_menu" name="Liste des domaines" parent="mt_referentiels_menu" action="domaines_list_action"/>
         <menuitem id="mt_projet_structures_list_menu" name="Liste des structures" parent="mt_referentiels_menu" action="structures_list_action"/>
         <menuitem id="mt_projet_phases_list_menu" name="Liste des phases" parent="mt_referentiels_menu" action="phases_list_action"/>
-        <menuitem id="mt_projet_teammember_list_menu" name="Team members" parent="mt_referentiels_menu" action="teammembers_list_action"/>
+        <menuitem id="mt_projet_teammember_list_menu" name="Team members" parent="mt_referentiels_menu" action="teammembers_list_action"/>-->
 
 
     </data>
diff --git a/views/phase.xml b/views/phase.xml
index b6bfd69..a98293f 100644
--- a/views/phase.xml
+++ b/views/phase.xml
@@ -6,7 +6,7 @@
 
         <record model="ir.ui.view" id="phase_form_view">
             <field name="name">phase.form</field>
-            <field name="model">cmmi.phase</field>
+            <field name="model">cmmi.projet.phase</field>
             <field name="arch" type="xml">
                 <form string="Formulaire phase" version="7.0">
                     <header />
@@ -21,7 +21,7 @@
                                 <group colspan="4">
                                     <field name="description" />
                                     <field name="statut" colspan="2" />
-                                    <field name="type_phase_id" colspan="2" />
+                                    <field name="phase_id" colspan="2" />
                                     <field name="palier_id" colspan="2" />
                                 </group>
                             </page>