Presik
/
trytonpsk-staff_payroll
mirror of https://bitbucket.org/presik/trytonpsk-staff_payroll.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor fix

This commit is contained in:
Camilo Sarmiento 2020-08-06 12:33:45 -05:00
parent 0375ac9a0e
commit 43700fcc95
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
payroll.py
View File

@ -806,7 +806,7 @@ class PayrollGroup(Wizard):
if not contract:
continue
values = self.get_values(contract.employee, start, end)
values = self.get_values(contract, start, end)
payroll_to_create.append(values)
wages = [(wage_type, None) for wage_type in self.start.wage_types]
@ -829,16 +829,17 @@ class PayrollGroup(Wizard):
]
return dom_employees
def get_values(self, employee, start_date, end_date):
def get_values(self, contract, start_date, end_date):
employee = contract.employee
Payroll = Pool().get('staff.payroll')
if employee.contract.start_date and \
employee.contract.start_date >= start_date and \
employee.contract.start_date <= start_date:
start_date = employee.contract.start_date
if employee.contract.end_date and \
employee.contract.end_date >= start_date and \
employee.contract.end_date <= end_date:
end_date = employee.contract.end_date
if contract.start_date and \
contract.start_date >= start_date and \
contract.start_date <= start_date:
start_date = contract.start_date
if contract.end_date and \
contract.end_date >= start_date and \
contract.end_date <= end_date:
end_date = contract.end_date
values = {
'employee': employee.id,
'period': self.start.period.id,