diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 058d5a092ff..70192dba702 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -1110,7 +1110,7 @@ class hr_payslip(osv.osv): func = func_pool.read(cr, uid, function, ['line_ids'], context=context) lines = slip_line_pool.browse(cr, uid, func['line_ids'], context=context) - lines += slip.employee_id.line_ids + #lines += slip.employee_id.line_ids ad = [] lns = {} @@ -1224,6 +1224,17 @@ class hr_payslip(osv.osv): 'contract_id':contract.id, 'company_id':slip.employee_id.company_id.id }) + + for line in slip.employee_id.line_ids: + vals = { + 'amount':line.amount, + 'slip_id':slip.id, + 'employee_id':False, + 'function_id':False, + 'base':base + } + slip_line_pool.copy(cr, uid, line.id, vals, {}) + self.write(cr, uid, [slip.id], update, context=context) for slip in self.browse(cr, uid, ids, context=context): diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 542b1131d16..cf45b77fbe6 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -87,7 +87,6 @@ - res.partner.bank.form res.partner.bank @@ -157,7 +156,6 @@ - @@ -192,7 +190,7 @@ - + @@ -205,7 +203,6 @@ - hr.employee.passport.form hr.employee @@ -357,7 +354,7 @@ - + @@ -385,7 +382,7 @@ - + @@ -396,7 +393,7 @@ - + @@ -449,7 +446,7 @@ - +