[MERGE] latest trunk

bzr revid: abo@openerp.com-20120619143752-29v97mmr7xcttj9o

1 files changed, 24 insertions, 26 deletions

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 66b50a20433..58b0ece4f81 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -325,16 +325,18 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                     <header>
+                        <!--
                         <button name="do_open" string="Start Task" type="object"
                                 states="draft,pending"/>
+                        <button name="do_draft" string="Draft" type="object"
+                                states="cancel,done"/>
+                        -->
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="done,cancelled" context="{'button_reactivate':True}"/>
-                        <button name="do_pending" string="Pending" type="object"
-                                states="open"/>
                         <button name="action_close" string="Done" type="object"
                                 states="draft,open,pending"/>
-                        <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done"/>
+                        <button name="do_pending" string="Pending" type="object"
+                                states="open"/>
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
                                 states="pending,open,draft" groups="project.group_delegate_task"/>
                         <button name="do_cancel" string="Cancel" type="object"
@@ -350,16 +352,10 @@
                     <h1>
                         <field name="name"/>
                     </h1>
-                    <label for="project_id" class="oe_form_readonly_hidden"/>
-                    <h2>
-                        <field name="project_id"  on_change="onchange_project(project_id)"/>
-                    </h2>
                     <group>
                         <group>
-                            <field name="effective_hours"
-                                widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
                             <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
-                            <field name="partner_id" />
+                            <field name="project_id"  on_change="onchange_project(project_id)"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
@@ -367,30 +363,31 @@
                             <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
                                 groups="project.group_time_work_estimation_tasks"
                                 on_change="onchange_planned(planned_hours, effective_hours)"/>
-
-                            <label for="remaining_hours" string="+ Remaining"/>
-                            <div>
-                                <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
-                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/>
-                            </div>
-                            <field name="total_hours" widget="float_time" groups="project.group_tasks_work_on_tasks"
-                                string="= Total"/>
-
-                            <field name="progress" widget="progressbar" groups="project.group_tasks_work_on_tasks"/>
+                            <field name="progress" widget="progressbar"
+                                groups="project.group_time_work_estimation_tasks"
+                                invisible="1"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Description">
                             <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..." />
-                            <separator string="Task Works" />
-                            <field name="work_ids" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
+                            <field name="work_ids" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
-                                    <field name="name" />
+                                    <field name="date"/>
+                                    <field name="name"/>
+                                    <field name="user_id"/>
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
-                                    <field name="user_id" />
-                                    <field name="date" />
                                 </tree>
                             </field>
+                            <group class="oe_form_subtotal_footer" name="project_hours" groups="project.group_time_work_estimation_tasks">
+                                <field name="effective_hours" widget="float_time"/>
+                                <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
+                                <div>
+                                    <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/>
+                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
+                                </div>
+                                <field name="total_hours" widget="float_time" class="oe_form_subtotal_footer_separator"/>
+                            </group>
                         </page>
                         <page string="Delegations History" groups="project.group_delegate_task">
                             <separator string="Parent Tasks"/>
@@ -413,6 +410,7 @@
                             <group col="4">
                                 <field name="priority"/>
                                 <field name="sequence"/>
+                                <field name="partner_id" />
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
                         </page>