From a2419df4b3d314eaf69c0afb746a0b6c57b0d54a Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 13 Sep 2010 17:56:58 +0530
Subject: [PATCH] [MOD] hr_holidays : Department column should come only when
 user group by Department

bzr revid: vir@tinyerp.com-20100913122658-i0ppv6ukld1rzzmm
---
 addons/hr_evaluation/__openerp__.py     | 2 +-
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index a9013531a86..63ea9a7bc22 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -44,7 +44,7 @@
         "hr_evaluation_view.xml",
         "report/hr_evaluation_report_view.xml"
         ],
-#    "test": ["test/test_hr_evaluation.yml"],
+    "test": ["test/test_hr_evaluation.yml"],
     "active": False,
     "installable": True
 }
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 3b82a91f0c0..41581a9c570 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -28,7 +28,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>                        
-                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>                        
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>                        
                          <separator orientation="vertical"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"
                             default="context.get('report', False)"/>
@@ -221,7 +221,7 @@
             <field name="arch" type="xml">
                 <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1');gray:state in ('cancel')">
                     <field name="employee_id"/>
-                    <field name="department_id"/>
+                    <field name="department_id" invisible="not context.get('set_visible',False)"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
                     <field name="date_from"/>
                     <field name="date_to"/>