From 3cde22c2a2618f4b5db8f68f558e93a71a98f6d6 Mon Sep 17 00:00:00 2001
From: "RHA (OpenERP)" <>
Date: Wed, 22 Sep 2010 13:28:44 +0530
Subject: [PATCH] [IMP]: Usability improvements

bzr revid: rvo@tinyerp.co.in-20100922075844-jpygvjk9pvix569t
---
 addons/project/project.py                     |  2 +-
 addons/project/project_view.xml               | 12 +++---
 addons/project/report/project_report.py       |  2 +-
 addons/project/report/project_report_view.xml | 27 ++++++------
 addons/project_gtd/project_gtd.py             |  2 +-
 addons/project_gtd/project_gtd_view.xml       |  4 +-
 addons/project_issue/project_issue_menu.xml   |  2 +-
 addons/project_issue/project_issue_view.xml   |  4 +-
 .../report/project_issue_report_view.xml      | 41 +++++++++----------
 .../project_long_term_view.xml                | 18 ++++----
 .../project_messages_view.xml                 |  2 +-
 addons/project_scrum/project_scrum_view.xml   |  8 ++--
 addons/resource/resource_view.xml             | 29 +++++++------
 13 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 4b43a37a76f..76ff7c5afa0 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -417,7 +417,7 @@ class task(osv.osv):
         'active': fields.function(_is_template, method=True, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', size=128, required=True),
         'description': fields.text('Description'),
-        'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
+        'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Priority'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
         'type_id': fields.many2one('project.task.type', 'Stage',),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bf801adca1d..1c854649535 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -302,7 +302,9 @@
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                     <field name="user_id"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
+                    <field name="planned_hours"/>
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
+                    <field name="delay_hours"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
                     <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <button name="next_type" invisible="context.get('set_visible',False)"
@@ -387,7 +389,7 @@
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         </field>
                         <field name="user_id" select="1">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal" separator="1"/>
+                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" separator="1"/>
                         </field>
                     </group>
                     <newline/>
@@ -486,10 +488,10 @@
         <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system"/>
         <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
 
-        <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
+        <act_window context="{'search_default_user_id': [active_id]}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
         <act_window
-            domain="[('project_id', '=', active_id)]"
+        	context="{'search_default_project_id': [active_id]}"
             id="act_project_project_2_project_task_all"
             name="Tasks"
             res_model="project.task"
@@ -537,7 +539,7 @@
             </page>
        </field>
     </record>
-    <act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
-    <act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
+    <act_window context="{'search_default_user_id': [active_id]}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+    <act_window context="{'search_default_user_id': [active_id]}" domain="[('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
     </data>
 </openerp>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index b9c22faee8b..e411248db4b 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -49,7 +49,7 @@ class report_project_task_user(osv.osv):
         'delay_endings_days': fields.float('Overpassed Deadline', digits=(16,2), readonly=True),
         'nbr': fields.integer('# of tasks', readonly=True),
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'),
-('0','Very urgent')], 'Importance', readonly=True),
+('0','Very urgent')], 'Priority', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'State', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"),
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 7e17494a5d4..93f59cd38bd 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -58,18 +58,18 @@
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
                 	<group colspan="10" col="12">
-	                    <filter icon="terp-go-year" string="  365 Days  "
+	                    <filter icon="terp-go-year" string="  Year  "
 	                    	    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    	    help="Tasks performed in last 365 Days"/>
-	                    <filter icon="terp-go-month" string="   30 Days   "
+	                    	    help="Current Year"/>
+	                    <filter icon="terp-go-month" string="   Month   "
 	                    		name="month"
 	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                    		help="Tasks performed in last 30 days"/>
+	                    		help="Current Month"/>
 		                <filter icon="terp-go-week"
-	                            string="    7 Days    "
+	                            string="    Month-1    "
 	                            separator="1"
 	                            domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                            help="Tasks during last 7 days"/>
+	                            help="Previous Month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter string="Draft"
 	                    		icon="terp-document-new"
@@ -111,26 +111,25 @@
                         <filter string="Project" name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
                         <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                         <filter string="Stage" icon="terp-stage" context="{'group_by':'type_id'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Current Day"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Current Month"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Current Year"/>
                     </group>
                     <newline/>
 	                <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+	                	<field name="priority" string="Priority"/>
 	                    <field name="type_id" widget="selection"/>
-	                    <separator orientation="vertical"/>
+	                    <newline/>
                         <field name="date_start"/>
-                        <field name="date_deadline"/>
                         <field name="date_end"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="priority"/>
+                        <field name="date_deadline"/>
 	                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </search>
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 46031048ae9..f29780126e0 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -114,7 +114,7 @@ class project_task(osv.osv):
         if res['type'] == 'search':
             tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]))
             search_extended ='''<newline/><group col="%d" expand="0" string="%s" groups="project_gtd.group_project_getting">''' % (len(tt)+7,_('Getting Things Done'))
-            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True}" icon="gtk-new" string="%s"/>''' % (_('Inbox'),)
+            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),)
             search_extended += '''<separator orientation="vertical"/>'''
             for time in tt:
                 if time.icon:
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 5672fdafa7c..99e87fcb325 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -19,7 +19,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Context">
-                <field name="name"/>
+                <field name="name" select="1"/>
                 <field name="sequence"/>
             </form>
         </field>
@@ -53,7 +53,7 @@
         <field name="arch" type="xml">
             <form string="Timeboxes">
                 <separator string="Timebox Definition" colspan="4"/>
-                <field name="name"/>
+                <field name="name" select="1"/>
                 <field name="sequence"/>
                 <field name="icon"/>
             </form>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 514fd59c8d6..df76e808bff 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -40,7 +40,7 @@
     </record>
 
     <act_window
-            domain="[('project_id', '=', active_id)]"
+    		context="{'search_default_project_id': [active_id]}"
             id="act_project_project_2_project_issue_all"
             name="Issues"
             res_model="project.issue"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 7fc2db7c775..46a6e2d44c9 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -163,7 +163,7 @@
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="project_id" />
-                    <field name="priority" string="Severity"/>
+                    <field name="priority" string="Priority"/>
                     <field name="stage_id" string="Resolution"/>
                     <button icon="gtk-go-back" string="" name="stage_previous" type="object"
                         states="open,draft,pending,done,cancel" />
@@ -261,7 +261,7 @@
                     <field name="id"/>
                     <field name="name" string="Feature description"/>
                     <field name="partner_id"/>
-                    <field name="priority" string="Severity"/>
+                    <field name="priority" string="Priority"/>
                     <field name="stage_id" string="Resolution"/>
                     <button icon="gtk-go-back" string="" name="stage_previous" type="object"
                         states="open,draft,pending,done,cancel" />
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index c80ccc86e28..5dd6242137b 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -54,14 +54,14 @@
             <field name="arch" type="xml">
 				<search string="Search">
                   <group col="16" colspan="8">
-                   		<filter string="365 Days" icon="terp-go-year"
-                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+                   		<filter string="Year" icon="terp-go-year"
+                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Current Year"/>
 
-                       <filter string="30 Days" icon="terp-go-month" name="This Month"
-                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter string="Month" icon="terp-go-month" name="This Month"
+                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Current Month"/>
 
-                       <filter icon="terp-go-week" string="7 Days" separator="1"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter icon="terp-go-week" string="Month-1" separator="1"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Previous Month"/>
 
                    		<separator orientation="vertical" />
                         <filter  icon="terp-camera_test"
@@ -76,6 +76,7 @@
 
                    		<separator orientation="vertical" />
                    		<field name="section_id"
+                   			string="Sale Team	"
                    			default="context.get('section_id', False)"
                    			widget="selection"
                    			context="{'invisible_section': False}">
@@ -91,42 +92,40 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
-                        <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
-                        <separator orientation="vertical" />
-                        <filter name="User" string="Responsible" icon="terp-personal"
+                   		<filter name="User" string="Responsible" icon="terp-personal"
                         domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Assigned to" name="Responsible" icon="terp-personal"
                         domain="[]" context="{'group_by':'assigned_to'}" />
-                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
+						<separator orientation="vertical" />
+						<filter string="Sale Team" icon="terp-personal+"
                         	domain="[]"
                         	context="{'group_by':'section_id'}" />
+						<separator orientation="vertical" />
+                        <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
+                        <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                         	domain="[]" context="{'group_by':'categ_id'}" />
-                        <separator orientation="vertical" />
                         <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+						<separator orientation="vertical" />
+						<filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                         	domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home"
                         	domain="[]"
                         	context="{'group_by':'company_id'}" />
-
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
-                        	domain="[]" context="{'group_by':'day'}"/>
+                        	domain="[]" context="{'group_by':'day'}" help="Current Day"/>
 
                         <filter string="Month" icon="terp-go-month"
-                        	domain="[]" context="{'group_by':'month'}" />
+                        	domain="[]" context="{'group_by':'month'}" help="Current Month"/>
 
                         <filter string="Year" icon="terp-go-year"
-                        	domain="[]" context="{'group_by':'name'}" />
+                        	domain="[]" context="{'group_by':'name'}" help="Current Year"/>
 
                   </group>
                    <newline/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 132dc24ce4a..63cc512c92a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -93,17 +93,17 @@
 	                    <group colspan="2" col="2">
 	                        <field name="name" select="1"/>
 	                        <field name="date_start"/>
-	                        <field name="date_end"/>
 	                    </group>
-	                    <group colspan="2" col="2">
-	                       <field name="project_id" on_change="onchange_project(project_id)" />
-	                       <field name="duration" />
+	                    <group colspan="2" col="4">
+	                       <field name="project_id" on_change="onchange_project(project_id)" colspan="4"/>
+                           <newline/>
+	                       <field name="duration" colspan="1"/>
+                           <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
 	                    </group>
 	                    <group colspan="2" col="2">
 	                       <field name="responsible_id"/>
-	                       <newline/>
-	                       <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]" colspan="2"/>
-                    </group>
+	                       <field name="date_end"/>
+                    	</group>
 					</group>
                     <notebook colspan="4">
                         <page string="Resource Allocation">
@@ -306,10 +306,10 @@
         res_model="project.task"
         src_model="project.phase"
         view_mode="tree,form"
-        domain="[('phase_id','=',active_id)]"/>
+        context="{'search_default_phase_id': [active_id]}"/>
 
     <act_window
-        domain="[('project_id', '=', active_id)]"
+    	context="{'search_default_project_id': [active_id]}"
         id="act_project_phases"
         name="Phases"
         res_model="project.phase"
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 6780da6c694..456a0269c99 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -95,7 +95,7 @@
 			<field name="help">An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis.</field>
         </record>
 
-        <act_window domain="[('project_id', '=', active_id)]" id="act_project_messages" name="Messages" res_model="project.messages" src_model="project.project"/>
+        <act_window context="{'search_default_project_id': [active_id]}" id="act_project_messages" name="Messages" res_model="project.messages" src_model="project.project"/>
 
          <!--Actions for deshboard -->
 
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index f857c31d756..d145339e970 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -198,7 +198,7 @@
             <field name="model">project.scrum.sprint</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('pending');grey:state in ('cancel','done')" string="Scrum Sprint">
+                <tree colors="blue:state in ('draft','pending');grey:state in ('cancel','done')" string="Scrum Sprint">
                     <field name="name"/>
                     <field name="project_id"/>
                     <field name="scrum_master_id"/>
@@ -515,7 +515,7 @@
                 <field name="project_id" position="after">
                     <field name="sprint_id" context="{'sprint_invisible':False}">
                         <filter icon="terp-check" string="Current" context="{'sprint_invisible':False}" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
-                        <filter icon="terp-check" string="Current" context="{'sprint_invisible':False}" domain="[]" help="View Sprints"/>
+                        <filter icon="gtk-find" string="Current" context="{'sprint_invisible':False}" domain="[]" help="View Sprints"/>
                     </field>
                 </field>
             </field>
@@ -536,7 +536,7 @@
         </record>
 
         <act_window
-            domain="[('sprint_id', '=', active_id)]"
+        	context="{'search_default_sprint_id': [active_id]}"
             id="act_scrum_sprint_2_product_backlog"
             name="Backlogs"
             res_model="project.scrum.product.backlog"
@@ -545,7 +545,7 @@
             view_type="form"/>
 
         <act_window
-            domain="[('sprint_id', '=', active_id)]"
+        	context="{'search_default_sprint_id': [active_id]}"
             id="act_scrum_sprint_2_project_task"
             name="Tasks"
             res_model="project.task"
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index ba68ea09f65..de602a177af 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -41,10 +41,6 @@
                        <field name="manager"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
-                   <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager'}"/>
-                    </group>
                </search>
             </field>
         </record>
@@ -56,7 +52,7 @@
             <field name="arch" type="xml">
                 <search string="Search Working Period Leaves">
                    <group col='15' colspan='4'>
-                       <field name="name" string="Name"/>
+                       <field name="name" string="Reason"/>
                        <field name="resource_id" string="Resource"/>
                        <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>
                        <field name="calendar_id" string="Working Time" widget="selection"/>
@@ -214,13 +210,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Detail">
-                    <field name="name"/>
-                    <field name="resource_id"  on_change="onchange_resource(resource_id)"/>
-                    <field name="company_id"  widget="selection" groups="base.group_multi_company"/>
-                    <field name="calendar_id" widget="selection"/>
-                    <newline/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
+                    <group colspan="4" col="6">
+                       <group colspan="2" col="2">
+                           <field name="resource_id" on_change="onchange_resource(resource_id)"/>
+                           <field name="name" string="Reason"/>
+                       </group>
+                       <group colspan="2" col="2">
+                           <field name="date_from"/>
+                           <field name="calendar_id"/>
+                           <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       </group>
+                       <group colspan="2" col="2">
+                           <field name="date_to"/>
+                       </group>
+                   </group>
                 </form>
             </field>
         </record>
@@ -230,7 +233,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Leave Detail">
-                    <field name="name" />
+                    <field name="name" string="Reason"/>
                     <field name="resource_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="calendar_id" />