From 5b2361fbbdc292067e83362cd447ecbe93065486 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 13 Oct 2010 17:01:54 +0530
Subject: [PATCH] [IMP] hr_contract : Improvemetns in view

bzr revid: vir@tinyerp.com-20101013113154-daqk3yy39k9xpgjw
---
 addons/hr_contract/hr_contract_view.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 1ad05582d47..440afa2894e 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -146,8 +146,8 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group col='15' colspan='4'>
-                   <filter string="Current" icon="terp-check" name="current"  domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]"                       context="{'group_by':'date_end'}" help="Contracts in progress"/> 
-                   <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]"                          context="{'group_by':'date_end'}" help="Contracts whose end date already passed"/>   
+                   <filter string="Current" icon="terp-check" name="current"  domain="['|',('date_end','&gt;=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/> 
+                   <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>   
                    <separator orientation="vertical"/>                  
                    <field name="name"/>
                    <field name="employee_id"/>
@@ -157,9 +157,12 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-                   <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                   <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> 
+                   <separator orientation="vertical"/> 
                    <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
                    <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                    <separator orientation="vertical"/> 
+                    <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
                    </group>
                </search>
             </field>