From 7934430265dce61e4cfed841b111a0628388c6ef Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Sat, 18 Sep 2010 12:42:47 +0530
Subject: [PATCH] [IMP]: Usability Improvements

bzr revid: rvo@tinyerp.co.in-20100918071247-tulwaj04sf1pxb6z
---
 .../project_messages_view.xml                 |  1 +
 addons/project_scrum/project_scrum.py         |  3 ++-
 addons/project_scrum/project_scrum_view.xml   | 25 ++++++++++---------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 2689e2fd7c5..6780da6c694 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -38,6 +38,7 @@
                 <form string="Messages">
                 	<group attrs="{'readonly':[('from_id', '!=', uid)]}">
                         <field name="project_id" select="1" domain="[('user_id','=',uid)]"/>
+                        <newline/>
                         <field name="from_id" select="1"/>
                         <field name="to_id" select="1"/>
                         <newline/>
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index a80a31ff257..652da446342 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -318,7 +318,8 @@ class project_scrum_meeting(osv.osv):
         'question_today': fields.text('Tasks for today'),
         'question_blocks': fields.text('Blocks encountered'),
         'question_backlog': fields.text('Backlog Accurate'),
-        'task_ids': fields.many2many('project.task', 'meeting_task_rel', 'metting_id', 'task_id', 'Tasks')
+        'task_ids': fields.many2many('project.task', 'meeting_task_rel', 'metting_id', 'task_id', 'Tasks'),
+        'responsible_id': fields.related('sprint_id', 'scrum_master_id', type='many2one', relation='res.users', string='Responsible'),
     }
     #
     # TODO: Find the right sprint thanks to users and date
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index b8997d7ebb0..4d88aae05c0 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -113,10 +113,10 @@
                     </notebook>
                     <group col="8" colspan="4">
                         <field name="state" select="1" readonly="1"/>
-                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera-test"/>
+                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                         <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
                         <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                        <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
+                        <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
                         <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
                         <button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-stop"/>
                     </group>
@@ -208,9 +208,9 @@
                     <field name="effective_hours" sum="Effective 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-execute"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                    <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
                 </tree>
             </field>
@@ -228,7 +228,7 @@
                     <notebook colspan="4">
                         <page string="Sprint Info">
                             <group colspan="2" col="2">
-                                <separator string="Owners" colspan="2"/>
+                                <separator string="Responsible" colspan="2"/>
                                 <field name="product_owner_id"/>
                                 <field name="scrum_master_id"/>
                             </group>
@@ -256,9 +256,9 @@
                     </notebook>
                     <group col="6" colspan="4">
                         <field name="state" readonly="1"/>
-                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
+                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                         <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                        <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
+                        <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
                         <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
                     </group>
                 </form>
@@ -274,8 +274,8 @@
                     <group col="10" colspan="4">
                         <filter name="terp-check" icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Sprints"/>
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
+                        <filter icon="gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Sprints"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id"/>
@@ -284,14 +284,14 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Managers" icon="terp-personal" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
                         <filter string="Product owner" icon="terp-personal" domain="[]" context="{'group_by':'product_owner_id'}"/>
+                        <filter string="Managers" icon="terp-personal" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Start Date" icon="terp_go_month" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Sprint Month"/>
                     </group>
                 </search>
             </field>
@@ -335,6 +335,7 @@
                     <group colspan="4" col="6">
                         <field name="date"/>
                         <field name="sprint_id" domain="[('state', '=', 'open')]"/>
+                        <field name="responsible_id"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">