From e34fb1ffd9e445789dbb9d787815a584ab9d5c74 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Fri, 21 May 2010 17:20:17 +0530
Subject: [PATCH] [IMP] project, scrum: Improve search and form views (Backlog:
 623)

bzr revid: mra@tinyerp.com-20100521115017-pweql4e1hguj9ajd
---
 addons/project/project_view.xml |  4 ++--
 addons/scrum/scrum.py           |  2 --
 addons/scrum/scrum_view.xml     | 15 +++++++--------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c148b8ca7b0..76ee14b990a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -408,7 +408,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" default="1"/>
+                        <filter name="current" string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-project"/>
                         <separator orientation="vertical"/>
@@ -444,7 +444,7 @@
             <field name="view_mode">tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" ref="view_task_tree2"/>
-            <field name="context">{"search_default_project_id":project_id,'search_default_user_id':uid}</field>
+            <field name="context">{"search_default_project_id":project_id,'search_default_user_id':uid, 'search_default_current': 1}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
 
         </record>
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index 9d3d9705674..e463ad2e4aa 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -92,7 +92,6 @@ class scrum_sprint(osv.osv):
         return True
     _columns = {
         'name' : fields.char('Sprint Name', required=True, size=64),
-        'active' : fields.boolean('Active', help="If Active field is set to true, it will allow you to select sprint from task list view. "),
         'date_start': fields.date('Starting Date', required=True),
         'date_stop': fields.date('Ending Date', required=True),
         'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)], help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
@@ -111,7 +110,6 @@ class scrum_sprint(osv.osv):
     _defaults = {
         'state': 'draft',
         'date_start' : time.strftime('%Y-%m-%d'),
-        'active': 1,
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 394ea4c4219..b9c4e0149b8 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -60,7 +60,7 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
                         <field name="project_id" select="1"/>
-                        <field domain="[('project_id','=',project_id)]" name="sprint_id" select="1"/>
+                        <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
                         <field name="user_id" select="1"/>
                         <field name="sequence" groups="base.group_extended"/>
                            <field name="date"/>
@@ -129,6 +129,7 @@
                         <filter default="1"
                             icon="terp-project"
                             string="Current"
+                            name="current"
                             domain="['|','&amp;',('sprint_id.date_start','&lt;=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','&gt;=',time.strftime('%%Y-%%m-%%d')), ('state','in',['draft','open'])]"
                             help="Current Backlogs"/>
                         <separator orientation="vertical"/>
@@ -165,7 +166,7 @@
             <field name="name">Product Backlogs</field>
             <field name="res_model">scrum.product.backlog</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_user_id":uid}</field>
+            <field name="context">{"search_default_user_id":uid, 'search_default_current': 1}</field>
             <field name="search_view_id" ref="view_scrum_product_backlog_search"/>
         </record>
         <menuitem
@@ -210,7 +211,6 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
                         <field name="project_id" on_change="onchange_project_id(project_id)"/>
-                        <field name="active"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sprint Info">
@@ -287,9 +287,8 @@
             <field name="res_model">scrum.sprint</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_filter_current': 1}</field>
             <field name="view_id" ref="view_scrum_sprint_tree"/>
-            <field name="context">{"search_default_scrum_master_id":uid}</field>
+            <field name="context">{"search_default_filter_current": 1, "search_default_scrum_master_id":uid}</field>
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
         </record>
         <menuitem
@@ -456,7 +455,7 @@
             <field name="inherit_id" ref="project.view_task_tree2"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
-                    <field name="sprint_id" invisible="context.get('sprint_invisible',True)"/>
+                    <field name="sprint_id" domain="[('state', 'in', ['draft', 'open'])]" invisible="context.get('sprint_invisible',True)"/>
                     <field name="product_backlog_id" invisible="1"/>
                 </field>
             </field>
@@ -481,7 +480,7 @@
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page[@string='Extra Info']/group/field[@name='sequence']" position="after">
-                    <field name="sprint_id" />
+                    <field name="sprint_id" domain="[('state', 'in', ['draft', 'open'])]" />
                 </xpath>
             </field>
         </record>
@@ -493,7 +492,7 @@
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <field name="project_id" position="after">
-                    <field name="sprint_id" widget="selection" context="{'sprint_invisible':False}">
+                    <field name="sprint_id" context="{'sprint_invisible':False}">
                         <filter icon="terp-project" string="Current" context="{'sprint_invisible':False}" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
                     </field>
                 </field>