From: Sébastien CHAZALLET <s.chazallet@gmail.com>
Date: Thu, 23 May 2013 13:09:45 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://inspyration.org/~/OpenERP/cmmi
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=c138aeffc48b73e3485f745e56b8e58206950ae8;hp=-c;p=OpenERP%2Fcmmi.git

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

c138aeffc48b73e3485f745e56b8e58206950ae8
diff --combined views/projet.xml
index d4af94d,1c282a3..40d263e
--- a/views/projet.xml
+++ b/views/projet.xml
@@@ -23,8 -23,8 +23,8 @@@
                                  <field name="main_domain" nolabel="1" widget="selection" />
                              </page>
                              <page string="MO">
 -                                <p>MOE</p><!--
 -                                <button type="object" target="new" name="cmmi.wizard_add_moe_to_project" string="Add a MOE" class="oe_highlight" context="{'project_id': id}" />-->
 +                                <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}" />
                                  <field name="structures_moe">
                                      <tree>
                                          <field name="name" />
@@@ -32,8 -32,8 +32,8 @@@
                                          <field name="role_mo_id" />
                                      </tree>
                                  </field>
 -                                <p>MOA</p><!--
 -                                <button type="object" target="new" name="cmmi.wizard_add_moa_to_project" string="Add a MOA" class="oe_highlight" context="{'project_id': id}" />-->
 +                                <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}" />
                                  <field name="structures_moe">
                                      <tree>
                                          <field name="name" />
@@@ -106,12 -106,7 +106,7 @@@
                                  </field>
                              </page>
                              <page string="Phases">
-                                 <field name="phases">
-                                     <tree>
-                                         <field name="name" />
-                                         <field name="description" />
-                                     </tree>
-                                 </field>
+                                 <field name="phases" />
                              </page>
                              <page string="Evolutions">
                                  <field name="evolutions">