X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=views%2Fevolution.xml;h=389d8ae999cfae3f5519c6ee70a8e39bc7c0f8f6;hb=9cdded7af196dc2d25b46ba52d81838e56cd42c8;hp=0e5f8c53ebe0199ff5d529b27cc626420f82e4d2;hpb=c02cc886d4723aeb33a18ef14367bac990f34ebb;p=OpenERP%2Fcmmi.git

diff --git a/views/evolution.xml b/views/evolution.xml
index 0e5f8c5..389d8ae 100644
--- a/views/evolution.xml
+++ b/views/evolution.xml
@@ -17,31 +17,52 @@
                     </header>
 
                     <sheet>
-                        <group colspan="4" col="3">
-                            <field name="name" colspan="3"/>
-                            <field name="pid" colspan="3"/>
-                            <field name="priorite" colspan="3"/>
-                            <field name="state" colspan="3"/>
+                        <group colspan="4" col="4">
+                            <field name="name" colspan="4"/>
+                            <field name="pid" colspan="2"/>
+                            <field name="priorite" colspan="2"/>
+                            <field name="state" colspan="4"/>
+                            <field name="charge_init" colspan="2"/>
+                            <field name="charge_plan" colspan="2"/>
                         </group>
-                        <notebook colspan="4">
+                        <notebook>
                             <page string="Détails">
-                                <group colspan="4">
-                                    <field name="demandeur" />
-                                    <field name="description" />
-                                    <field name="objectif" />
-                                    <field name="commentaire" />
+                                <group col="4">
+                                    <field name="demandeur" colspan="4" />
+                                    <field name="description" colspan="4" />
+                                    <field name="objectif" colspan="2" />
+                                    <field name="commentaire" colspan="2" />
                                 </group>
-                            </page><!--
-                            <page string="Charges">
-                                <field name="charges">
+                            </page>
+                            <page string="Phases">
+                                <field name="phases">
                                     <field name="name" />
                                 </field>
-                            </page>-->
+                            </page>
                         </notebook>
                     </sheet>
                 </form>
             </field>
         </record>
 
+
+    <!--         LIST VIEW         -->
+
+    <record model="ir.ui.view" id="evolution_list_view">
+            <field name="name">evolution.list</field>
+            <field name="model">cmmi.evolution</field>
+            <field name="arch" type="xml">
+                <tree string="Liste des évolutions">
+                    <field name="name" />
+                    <field name="pid" />
+                    <field name="priorite" />
+                    <field name="state" />
+                    <field name="projet_id" />
+                    <field name="chantier_id" />
+                    <field name="palier_id" />
+                </tree>
+            </field>
+        </record>
+
     </data>
 </openerp>
\ No newline at end of file