[MERGE] hr fixes

bzr revid: fp@tinyerp.com-20120920090706-usen24pssndoag0g

diff --cc addons/hr/res_config_view.xml
index c42857e,29f2f2a..7507665
--- 1/addons/hr/res_config_view.xml
--- 2/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@@ -17,7 -17,8 +17,7 @@@
              <field name="name">Payroll</field>
              <field name="res_model">ir.module.module</field>
              <field name="view_mode">kanban,tree,form</field>
-             <field name="context" eval="{'search_default_category_id': ref('base.module_category_localization'), 'search_default_name': 'payroll'}"/>
+             <field name="context" eval="{'search_default_category_id': ref('base.module_category_localization')}"/>
 -            <field name="domain">[('name','=','l10n_be_hr_payroll')]</field>
              <field name="search_view_id" ref="base.view_module_filter"/>
          </record>
  

diff --cc addons/hr_holidays/hr_holidays_view.xml
index 552b75f,c915b99..347e2b1
--- 1/addons/hr_holidays/hr_holidays_view.xml
--- 2/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@@ -523,7 -522,7 +523,7 @@@
                      </group>
                  </xpath>
                  <xpath expr="//div[@name='button_box']" position="inside">
-                     <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action"/>
 -                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" groups="base.group_hr_manager"/>
++                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" groups="base.group_hr_user"/>
                  </xpath>
              </field>
          </record>

diff --cc addons/hr_payroll/hr_payroll_view.xml
index d5b8b50,0fd78ab..d6df0e0
--- 1/addons/hr_payroll/hr_payroll_view.xml
--- 2/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@@ -369,7 -369,7 +369,7 @@@
              <field name="view_id" ref="view_hr_payslip_tree"/>
              <field name="search_view_id" ref="view_hr_payslip_filter"/>
          </record>
-         <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
 -        <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll" groups="base.group_hr_manager"/>
++        <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll" groups="base.group_hr_user"/>
          <act_window name="Payslips"
                      context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
                      res_model="hr.payslip"
@@@ -386,7 -386,7 +386,7 @@@
              <field name="arch" type="xml">
                  <data>
                      <xpath expr="//div[@name='button_box']" position="inside">
-                         <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
 -                        <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action" groups="base.group_hr_manager"/>
++                        <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action" groups="base.group_hr_user"/>
                      </xpath>
                  </data>
              </field>

diff --cc addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 52d2cfa,589d34a..6c92e28
--- 1/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
--- 2/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@@ -187,7 -187,7 +187,7 @@@
          </record>
  
          <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
-              sequence="2" groups="base.group_hr_user,base.group_hr_manager"/>
 -             sequence="2" groups="base.group_hr_manager"/>
++             sequence="2" groups="base.group_hr_user"/>
  
          <!--
              Company inheritancy