[MERGE]

bzr revid: mra@tinyerp.com-20100604031615-wzlffbef9v06farw
bzr revid: mra@tinyerp.com-20100604091419-umim5hl2iocem9ev

diff --cc addons/hr_contract/hr_contract_view.xml
index 2a929ec,84cc82e..40cebb9
--- 1/addons/hr_contract/hr_contract_view.xml
--- 2/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@@ -140,14 -140,14 +140,14 @@@
              <field name="arch" type="xml">
                  <search string="Search Contract">
                     <group col='15' colspan='4'>
 -                              <field name="name"/>
 -                              <field name="employee_id"/>
 -                              <field name="date_start"/>
 -                              <field name="date_end"/>
 +                           <field name="name"/>
 +                          <field name="employee_id"/>
 +                           <field name="date_start"/>
 +                           <field name="date_end"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
-                         <filter string="Wage Type" icon="terp-project" domain="[]" context="{'group_by':'wage_type_id'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="20">
+                         <filter string="Wage Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'wage_type_id'}"/>
                      </group>
                 </search>
              </field>