Browse Source
Merge pull request #57 from hilarak/10.0
[FIX] #44 Bug when generating payslip batch
pull/78/head
Cybrosys Technologies
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
3 deletions
-
payroll_timesheet/models/models.py
|
|
|
@ -121,6 +121,7 @@ class HrPayslip(models.Model): |
|
|
|
(self.employee_id, from_date, to_date, code)) |
|
|
|
res = self.env.cr.fetchone() |
|
|
|
return res and res[0] or 0.0 |
|
|
|
timesheet_hours = self.timesheet_hours |
|
|
|
total_hours = self.total_hours |
|
|
|
return super(HrPayslip, self).get_payslip_lines(contract_ids, payslip_id) |
|
|
|
for record in self: |
|
|
|
timesheet_hours = record.timesheet_hours |
|
|
|
total_hours = record.total_hours |
|
|
|
return super(HrPayslip, self).get_payslip_lines(contract_ids, payslip_id) |
|
|
|
|
