[MERGE] merge with latest stable

[odoo/odoo.git] / addons / hr_payroll / hr_payroll_view.xml

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 73d354b..78b9da0 100644 (file)
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -277,8 +277,6 @@
                 <group colspan="2">
                             <separator string="Validation" colspan="2"/>
                                 <newline/>
-                            <field name="active" />
-                                <newline/>
                             <field name="double_validation"/>
                                 <newline/>
                             <field name="limit"/>
@@ -965,6 +963,7 @@
         <!--  Shortcuts -->
         <act_window name="Payslips"
             domain="[('employee_id', '=', active_id)]"
+            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
             res_model="hr.payslip"
             src_model="hr.employee"
             view_id ="view_hr_payslip_tree"