[MERGE] merge with trunk

[odoo/odoo.git] / addons / scrum / scrum_view.xml

diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 70c3e82..b076e98 100644 (file)
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -40,7 +40,7 @@
                     <field name="sprint_id"/>
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar"/>
-                    <field name="expected_hours" sum="Expected hours" widget="float_time"/>
+                    <field name="expected_hours" sum="Planned hours" widget="float_time"/>
                     <field name="effective_hours" sum="Effective hours" widget="float_time"/>
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
@@ -57,10 +57,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product backlog">
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="8">
                         <field name="name" select="1"/>
                         <field name="project_id" select="1"/>
                         <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
+                                       <button name="button_postpone" string="Post Pone" type="object"                  
+                                               help="Post Pone backlog" colspan="2"
+                         icon="gtk-convert"  attrs="{'invisible':[('state','=','done')]}"/>
                         <field name="user_id" select="1"/>
                         <field name="sequence" groups="base.group_extended"/>
                         <field name="create_date"/>
@@ -71,6 +74,7 @@
                             <group colspan="6" col="8">
                                 <field name="expected_hours" widget="float_time"/>
                                 <field name="effective_hours" widget="float_time"/>
+                                <field name="task_hours" widget="float_time"/>
                             </group>
                             <separator string="Feature Description" colspan="4"/>
                             <field colspan="4" name="note" nolabel="1"/>
@@ -192,8 +196,7 @@
                     <field name="date_start"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="effective_hours" sum="Effective hours" widget="float_time"/>
-                    <field name="planned_hours" sum="Planned hours" widget="float_time"/>
-                    <field name="expected_hours" sum="Expected hours" widget="float_time"/>
+                    <field name="expected_hours" sum="Planned hours" widget="float_time"/>
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
@@ -226,7 +229,6 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Planning" colspan="2"/>
-                                <field name="planned_hours" widget="float_time"/>
                                 <field name="expected_hours" widget="float_time"/>
                                 <field name="effective_hours" widget="float_time"/>
                                 <field name="progress" widget="progressbar"/>
@@ -329,6 +331,9 @@
                             <field colspan="4" name="question_today" nolabel="1"/>
                             <separator colspan="4" string="Are there anything blocking you?"/>
                             <field colspan="4" name="question_blocks" nolabel="1"/>
+                            <separator colspan="4" string=""/>
+                                                       <button name="button_send_to_master" type="object" string="Send to Scrum Master" icon="gtk-ok"/>
+                            <button name="button_send_product_owner" type="object" string="Send to Product Owner" icon="gtk-ok"/>
                         </page>
                         <page string="Optional Info">
                             <separator colspan="4" string="Are your Sprint Backlog estimate accurate ?"/>