Modification des vues

[OpenERP/cmmi.git] / views / projet.xml

diff --git a/views/projet.xml b/views/projet.xml
index 3d150aa..cfd9598 100644 (file)
--- a/views/projet.xml
+++ b/views/projet.xml
@@ -14,17 +14,26 @@
                         <field name="name" nolabel="1" />
                         <notebook colspan="4">
                             <page string="Projet">
-                                <field name="description" nolabel="1" /><!--
-                                <label for="moe_id" colspan="1" />
-                                <field name="moe_id" nolabel="1" />
-                                <label for="moa_id" colspan="1" />
-                                <field name="moa_id" nolabel="1" />
-                                <label for="main_domain" colspan="1" />
-                                <field name="main_domain" nolabel="1" widget="selection" />-->
+                                <label for="description" />
+                                <field name="description" nolabel="1" />
+                                <label for="moe_id" />
+                                <field name="moe_id" nolabel="1" widget="char" />
+                                <label for="moa_id" />
+                                <field name="moa_id" nolabel="1" widget="char" />
+                                <label for="main_domain" />
+                                <field name="main_domain" nolabel="1" widget="char" />
+                            </page>
+                            <page string="Modules">
+                                <field name="modules">
+                                    <tree>
+                                        <field name="name" />
+                                        <field name="description" />
+                                    </tree>
+                                </field>
                             </page>
                             <page string="MO">
                                 <p>MOE</p>
-                                <button type="action" target="new" name="cmmi.wizard_add_moe_to_project" string="Add a MOE" class="oe_highlight" context="{'project_id': id}" />
+                                <button type="action" target="new" name="%(wizard_add_moe_to_project)d" string="Add a MOE" class="oe_highlight" context="{'project_id': id}" />
                                 <field name="moe_ids">
                                     <tree create="false" delete="true" editable="true">
                                         <field name="project_id" invisible="1" />
@@ -34,7 +43,7 @@
                                     </tree>
                                 </field>
                                 <p>MOA</p>
-                                <button type="action" target="new" name="cmmi.wizard_add_moa_to_project" string="Add a MOA" class="oe_highlight" context="{'project_id': id}" />
+                                <button type="action" target="new" name="%(wizard_add_moa_to_project)d" string="Add a MOA" class="oe_highlight" context="{'project_id': id}" />
                                 <field name="moa_ids">
                                     <tree create="false" delete="true" editable="true">
                                         <field name="project_id" invisible="1" />
@@ -48,15 +57,15 @@
                                 <field name="team_members" nolabel="1">
                                     <tree>
                                         <field name="name"/>
-                                        <field name="affectation" />
+                                        <field name="affecte" />
                                         <field name="depuis" />
                                         <field name="jusqua" />
                                     </tree>
                                 </field>
                             </page>
                             <page string="Domaines">
-                                <button type="action" target="new" name="cmmi.wizard_add_domain_to_project" string="Add a domain" class="oe_highlight" context="{'project_id': id}" />
-                                <field name="domaines">
+                                <button type="action" target="new" name="%(wizard_add_domain_to_project)d" string="Add a domain" class="oe_highlight" context="{'project_id': id}" />
+                                <field name="domains">
                                     <tree create="false" delete="true" editable="true">
                                         <field name="project_id" invisible="1" />
                                         <field name="domaine_id" invisible="1" />
@@ -65,14 +74,6 @@
                                     </tree>
                                 </field>
                             </page>
-                            <page string="Modules">
-                                <field name="modules">
-                                    <tree>
-                                        <field name="name" />
-                                        <field name="description" />
-                                    </tree>
-                                </field>
-                            </page>
                             <page string="Chantiers">
                                 <field name="chantiers">
                                     <tree>
@@ -86,6 +87,7 @@
                                         <field name="date_plan_fin" />
                                         <field name="date_reel_deb" />
                                         <field name="date_reel_fin" />
+                                        <field name="nb_jours_projets" />
                                     </tree>
                                 </field>
                             </page>
@@ -93,7 +95,6 @@
                                 <field name="paliers">
                                     <tree>
                                         <field name="name" />
-                                        <field name="description" />
                                         <field name="statut" />
                                         <field name="date_jalon" />
                                         <field name="type_palier" />
@@ -103,11 +104,17 @@
                                         <field name="date_plan_fin" />
                                         <field name="date_reel_deb" />
                                         <field name="date_reel_fin" />
+                                        <field name="nb_jours_projets" />
                                     </tree>
                                 </field>
                             </page>
                             <page string="Phases">
-                                <field name="phases" />
+                                <field name="phases">
+                                    <tree>
+                                        <field name="name" />
+                                        <field name="selectionne" />
+                                   </tree>
+                                </field>
                             </page>
                             <page string="Evolutions">
                                 <field name="evolutions">