Merge branch 'master' of git+ssh://inspyration.org/~/OpenERP/cmmi

diff --combined views/projet.xml
index ea74c46,223e34b..4e19cf4
--- 1/views/projet.xml
--- 2/views/projet.xml
+++ b/views/projet.xml
@@@ -6,11 -6,10 +6,10 @@@
              <field name="name">projet.form</field>
              <field name="model">cmmi.projet</field>
              <field name="arch" type="xml">
-                 <form string="Todolist Form" version="7.0">
+                 <form string="Formulaire Projet" version="7.0">
                      <header />
  
                      <sheet>
-                         <label for="name" colspan="1" />
                          <field name="name" nolabel="1" />
                          <notebook colspan="4">
                              <page string="Projet">
@@@ -47,18 -46,17 +46,20 @@@
                                  <field name="team_members" nolabel="1">
                                      <tree>
                                          <field name="name"/>
-                                         <field name="title"/>
+                                         <field name="affectation" />
+                                         <field name="depuis" />
+                                         <field name="jusqua" />
                                      </tree>
                                  </field>
                              </page>
                              <page string="Domaines">
 +                                <button type="action" target="new" name="%(cmmi.wizard_add_domain_to_project)d" string="Add a domain" class="oe_highlight" context="{'project_id': id}" />
                                  <field name="domaines">
 -                                    <tree>
 +                                    <tree create="false" delete="true" editable="true">
 +                                        <field name="project_id" invisible="1" />
 +                                        <field name="domaine_id" invisible="1" />
                                          <field name="name" />
 -                                        <field name="main" />
 +                                        <field name="main" on_change="onchange_main(project_id, domaine_id, main)" />
                                      </tree>
                                  </field>
                              </page>
@@@ -114,6 -112,46 +115,46 @@@
                              <page string="Evolutions">
                                  <field name="evolutions">
                                      <tree>
+                                         <field name="name"/>
+                                         <field name="priorite" />
+                                         <field name="palier_id" />
+                                         <field name="chantier_id" />
+                                         <field name="statut" />
+                                     </tree>
+                                 </field>
+                             </page>
+                         </notebook>
+                     </sheet>
+                 </form>
+             </field>
+         </record>
+ 
+ 
+         <!--         VIEWS PHASE         -->
+ 
+         <record model="ir.ui.view" id="phase_form_view">
+             <field name="name">phase.form</field>
+             <field name="model">cmmi.phase</field>
+             <field name="arch" type="xml">
+                 <form string="Formulaire phase" version="7.0">
+                     <header />
+ 
+                     <sheet>
+                         <field name="name" />
+                         <notebook colspan="4">
+ 
+                             <page string="Détails">
+                                 <group colspan="4" col="1">
+                                     <field name="description" />
+                                     <field name="statut" colspan="2" />
+                                     <field name="type_phase_id" colspan="2" />
+                                     <field name="projet_id" colspan="2" />
+                                     <field name="palier_id" colspan="2" />
+                                 </group>
+                             </page>
+                             <page string="Évolutions">
+                                 <field name="evolutions">
+                                     <tree>
                                          <field name="name" />
                                          <field name="priorite" />
                                          <field name="palier_id" />
@@@ -129,9 -167,41 +170,41 @@@
          </record>
  
  
-         <!--         VIEWS STRUCTURES         -->
+         <!--         VIEWS EVOLUTIONS         -->
  
+         <record model="ir.ui.view" id="evolution_form_view">
+             <field name="name">evolution.form</field>
+             <field name="model">cmmi.evolution</field>
+             <field name="arch" type="xml">
+                 <form string="Formulaire évolution" version="7.0">
+                     <header />
  
+                     <sheet>
+                         <group colspan="4" col="3">
+                             <field name="name" colspan="3"/>
+                             <field name="pid" colspan="3"/>
+                             <field name="priorite" colspan="3"/>
+                             <field name="statut" colspan="3"/>
+                         </group>
+                         <notebook colspan="4">
+                             <page string="Détails">
+                                 <group colspan="4" col="1">
+                                     <field name="demandeur" />
+                                     <field name="description" />
+                                     <field name="objectif" />
+                                     <field name="commentaire" />
+                                 </group>
+                             </page>
+                             <page string="Charges">
+                                 <field name="charges">
+                                     <field name="name" />
+                                 </field>
+                             </page>
+                         </notebook>
+                     </sheet>
+                 </form>
+             </field>
+         </record>
  
  
          <!--         ACTIONS         -->