[MERGE]

[odoo/odoo.git] / addons / hr_contract / hr_contract_view.xml

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index ce50d7f..5622d3d 100644 (file)
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -39,23 +39,22 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group>
-                   <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"/>
-                   <field name="working_hours"/>
-                   <field name="date_start"/>
-                   <field name="date_end"/>
+                       <field name="name" string="Contracts"/>
+                       <separator orientation="vertical"/>
+                       <field name="date_start"/>
+                       <field name="date_end"/>
+                       <separator orientation="vertical"/>
+                       <field name="employee_id"/>
+                       <field name="working_hours"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
-                   <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'}"/>
+                       <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>
@@ -166,7 +165,7 @@
             <field name="arch" type="xml">
                 <search string="Search Contract Type">
                    <group>
-                    <field name="name"/>
+                       <field name="name" string="Contract Type"/>
                    </group>
                </search>
             </field>