[MERGE] lp:~openerp-dev/openobject-addons/trunk-wizard-remove-cancel-editable-tch

[odoo/odoo.git] / addons / hr_holidays / hr_holidays_view.xml

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c9f2176..32790cb 100644 (file)
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -8,22 +8,17 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <group>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
+                        <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                        <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
-                        <filter icon="terp-go-month" name="This Month" string="Month" domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" name="This Month-1" string=" Month-1"
-                         domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Leaves during last month"/>
                         <separator orientation="vertical"/>
-                        <field name="employee_id">
-                            <filter icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
-                        </field>
-                        <field name="department_id" widget="selection">
-                            <filter icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
-                        </field>
+                        <field name="employee_id"/>
+                        <field name="department_id" widget="selection"/>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -249,7 +244,6 @@
             </field>
         </record>
 
-        <!-- My leave dashboard -->
         <menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
@@ -358,7 +352,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave Type">
-                    <field name="name"/>
+                    <field name="name" string="Leave Types"/>
+                    <separator orientation="vertical"/>
                     <field name="categ_id" widget="selection"/>
                 </search>
             </field>
@@ -424,7 +419,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leave Type">
-                    <field name="name"/>
+                    <field name="name" string="Leave Types"/>
+                    <separator orientation="vertical"/>
                     <field name="categ_id" widget="selection"/>
                 </search>
             </field>