Merge lp:~openerp-dev/openobject-addons/trunk-clean-search-hr_contract-tpa

bzr revid: jam@tinyerp.com-20120723124527-yb8so34tzilae74s
This commit is contained in:
Jigar Amin - OpenERP
2012-07-23 18:15:27 +05:30
+6 -15
View File
@@ -40,22 +40,15 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Contract">
<group>
<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/>
<field name="name" string="Contracts"/>
<field name="date_start"/>
<field name="date_end"/>
<field name="employee_id"/>
<field name="working_hours"/>
<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'}"/>
</group>
</search>
@@ -174,9 +167,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Contract Type">
<group>
<field name="name" string="Contract Type"/>
</group>
<field name="name" string="Contract Type"/>
</search>
</field>
</record>