diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 9221496f8e8..4af0e0fe6bd 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -1304,7 +1304,7 @@ class hr_employee(osv.osv): _description = 'Employee' _columns = { - 'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False), +# 'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False), 'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True), 'basic': fields.function(_calculate_basic, method=True, multi='dc', type='float', string='Basic Salary', digits_compute=dp.get_precision('Account')), } diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index ac0b493750a..921f7257d11 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -31,11 +31,6 @@ - @@ -571,7 +566,7 @@ groups="base.group_hr_manager"/> - + hr.salary.rule.tree hr.salary.rule @@ -645,14 +640,14 @@ - + Salary Rules hr.salary.rule form - + @@ -667,7 +662,7 @@ - + salary.head.type.form hr.salary.head.type @@ -679,16 +674,16 @@ - + Salary Head Types hr.salary.head.type form - + - +