revert
This commit is contained in:
parent
defc02a119
commit
5c24cc29bd
|
|
@ -2528,7 +2528,7 @@ class HrPayslipRun(models.Model):
|
||||||
'company_id': employee.company_id.id,
|
'company_id': employee.company_id.id,
|
||||||
'percentage': self.percentage}
|
'percentage': self.percentage}
|
||||||
|
|
||||||
item_payslip = self.env['hr.payslip'].sudo().create(res)
|
item_payslip = self.env['hr.payslip'].create(res)
|
||||||
payslips += item_payslip
|
payslips += item_payslip
|
||||||
# if pays:
|
# if pays:
|
||||||
# for p in pays:
|
# for p in pays:
|
||||||
|
|
@ -2544,7 +2544,7 @@ class HrPayslipRun(models.Model):
|
||||||
'number_of_days': duration,
|
'number_of_days': duration,
|
||||||
'number_of_hours': hours,
|
'number_of_hours': hours,
|
||||||
'contract_id': employee.contract_id.id}
|
'contract_id': employee.contract_id.id}
|
||||||
worked_days += self.env['hr.payslip.worked_days'].sudo().create(days)
|
worked_days += self.env['hr.payslip.worked_days'].create(days)
|
||||||
else:
|
else:
|
||||||
item_payslip = employee_slip_line
|
item_payslip = employee_slip_line
|
||||||
payslips += item_payslip
|
payslips += item_payslip
|
||||||
|
|
@ -2594,7 +2594,7 @@ class HrPayslipRun(models.Model):
|
||||||
'company_id': employee.company_id.id,
|
'company_id': employee.company_id.id,
|
||||||
'percentage': self.percentage}
|
'percentage': self.percentage}
|
||||||
|
|
||||||
item_payslip = self.env['hr.payslip'].sudo().create(res)
|
item_payslip = self.env['hr.payslip'].create(res)
|
||||||
payslips += item_payslip
|
payslips += item_payslip
|
||||||
|
|
||||||
# if pays:
|
# if pays:
|
||||||
|
|
@ -2647,7 +2647,7 @@ class HrPayslipRun(models.Model):
|
||||||
'company_id': employee.company_id.id,
|
'company_id': employee.company_id.id,
|
||||||
'percentage': self.percentage}
|
'percentage': self.percentage}
|
||||||
|
|
||||||
item_payslip = self.env['hr.payslip'].sudo().create(res)
|
item_payslip = self.env['hr.payslip'].create(res)
|
||||||
payslips += item_payslip
|
payslips += item_payslip
|
||||||
# if pays:
|
# if pays:
|
||||||
# for p in pays:
|
# for p in pays:
|
||||||
|
|
@ -2663,7 +2663,7 @@ class HrPayslipRun(models.Model):
|
||||||
'number_of_days': duration,
|
'number_of_days': duration,
|
||||||
'number_of_hours': hours,
|
'number_of_hours': hours,
|
||||||
'contract_id': employee.contract_id.id}
|
'contract_id': employee.contract_id.id}
|
||||||
worked_days += self.env['hr.payslip.worked_days'].sudo().create(days)
|
worked_days += self.env['hr.payslip.worked_days'].create(days)
|
||||||
else:
|
else:
|
||||||
item_payslip = employee_slip_line
|
item_payslip = employee_slip_line
|
||||||
payslips += item_payslip
|
payslips += item_payslip
|
||||||
|
|
@ -2695,7 +2695,7 @@ class HrPayslipRun(models.Model):
|
||||||
'company_id': employee.company_id.id,
|
'company_id': employee.company_id.id,
|
||||||
'percentage': self.percentage}
|
'percentage': self.percentage}
|
||||||
|
|
||||||
payslips += self.env['hr.payslip'].sudo().create(res)
|
payslips += self.env['hr.payslip'].create(res)
|
||||||
else:
|
else:
|
||||||
res = {
|
res = {
|
||||||
'employee_id': employee.id,
|
'employee_id': employee.id,
|
||||||
|
|
@ -2713,7 +2713,7 @@ class HrPayslipRun(models.Model):
|
||||||
'company_id': employee.company_id.id,
|
'company_id': employee.company_id.id,
|
||||||
'percentage': self.percentage}
|
'percentage': self.percentage}
|
||||||
|
|
||||||
payslips += self.env['hr.payslip'].sudo().create(res)
|
payslips += self.env['hr.payslip'].create(res)
|
||||||
else:
|
else:
|
||||||
if employee.leaving_date and str(employee.first_hiring_date) < from_date:
|
if employee.leaving_date and str(employee.first_hiring_date) < from_date:
|
||||||
if str(employee.leaving_date) <= from_date:
|
if str(employee.leaving_date) <= from_date:
|
||||||
|
|
@ -2758,7 +2758,7 @@ class HrPayslipRun(models.Model):
|
||||||
'credit_note': self.credit_note,
|
'credit_note': self.credit_note,
|
||||||
'company_id': emp.company_id.id,
|
'company_id': emp.company_id.id,
|
||||||
'percentage': self.percentage}
|
'percentage': self.percentage}
|
||||||
item_payslip = self.env['hr.payslip'].sudo().create(res)
|
item_payslip = self.env['hr.payslip'].create(res)
|
||||||
payslips += item_payslip
|
payslips += item_payslip
|
||||||
# if pays:
|
# if pays:
|
||||||
# for p in pays:
|
# for p in pays:
|
||||||
|
|
@ -2774,7 +2774,7 @@ class HrPayslipRun(models.Model):
|
||||||
'number_of_days': duration,
|
'number_of_days': duration,
|
||||||
'number_of_hours': hours,
|
'number_of_hours': hours,
|
||||||
'contract_id': emp.contract_id.id}
|
'contract_id': emp.contract_id.id}
|
||||||
worked_days += self.env['hr.payslip.worked_days'].sudo().create(days)
|
worked_days += self.env['hr.payslip.worked_days'].create(days)
|
||||||
else:
|
else:
|
||||||
item_payslip = employee_slip_line
|
item_payslip = employee_slip_line
|
||||||
payslips += item_payslip
|
payslips += item_payslip
|
||||||
|
|
@ -2818,7 +2818,7 @@ class HrPayslipRun(models.Model):
|
||||||
'credit_note': self.credit_note,
|
'credit_note': self.credit_note,
|
||||||
'company_id': emp.company_id.id,
|
'company_id': emp.company_id.id,
|
||||||
'percentage': self.percentage}
|
'percentage': self.percentage}
|
||||||
item_payslip = self.env['hr.payslip'].sudo().create(res)
|
item_payslip = self.env['hr.payslip'].create(res)
|
||||||
payslips += item_payslip
|
payslips += item_payslip
|
||||||
# if pays:
|
# if pays:
|
||||||
# for p in pays:
|
# for p in pays:
|
||||||
|
|
@ -2834,7 +2834,7 @@ class HrPayslipRun(models.Model):
|
||||||
'number_of_days': duration,
|
'number_of_days': duration,
|
||||||
'number_of_hours': hours,
|
'number_of_hours': hours,
|
||||||
'contract_id': emp.contract_id.id}
|
'contract_id': emp.contract_id.id}
|
||||||
worked_days += self.env['hr.payslip.worked_days'].sudo().create(days)
|
worked_days += self.env['hr.payslip.worked_days'].create(days)
|
||||||
else:
|
else:
|
||||||
item_payslip = employee_slip_line
|
item_payslip = employee_slip_line
|
||||||
payslips += item_payslip
|
payslips += item_payslip
|
||||||
|
|
@ -2865,7 +2865,7 @@ class HrPayslipRun(models.Model):
|
||||||
'credit_note': self.credit_note,
|
'credit_note': self.credit_note,
|
||||||
'company_id': emp.company_id.id,
|
'company_id': emp.company_id.id,
|
||||||
'percentage': self.percentage}
|
'percentage': self.percentage}
|
||||||
item_payslip = self.env['hr.payslip'].sudo().create(res)
|
item_payslip = self.env['hr.payslip'].create(res)
|
||||||
payslips += item_payslip
|
payslips += item_payslip
|
||||||
# if pays:
|
# if pays:
|
||||||
# for p in pays:
|
# for p in pays:
|
||||||
|
|
@ -2881,7 +2881,7 @@ class HrPayslipRun(models.Model):
|
||||||
'number_of_days': duration,
|
'number_of_days': duration,
|
||||||
'number_of_hours': hours,
|
'number_of_hours': hours,
|
||||||
'contract_id': emp.contract_id.id}
|
'contract_id': emp.contract_id.id}
|
||||||
worked_days += self.env['hr.payslip.worked_days'].sudo().create(days)
|
worked_days += self.env['hr.payslip.worked_days'].create(days)
|
||||||
else:
|
else:
|
||||||
item_payslip = employee_slip_line
|
item_payslip = employee_slip_line
|
||||||
payslips += item_payslip
|
payslips += item_payslip
|
||||||
|
|
@ -2915,9 +2915,9 @@ class HrPayslipRun(models.Model):
|
||||||
# if pays:
|
# if pays:
|
||||||
# for p in pays:
|
# for p in pays:
|
||||||
# if p.employee_id != emp and p not in payslips:
|
# if p.employee_id != emp and p not in payslips:
|
||||||
# payslips += self.env['hr.payslip'].sudo().create(res)
|
# payslips += self.env['hr.payslip'].create(res)
|
||||||
# else:
|
# else:
|
||||||
payslips += self.env['hr.payslip'].sudo().create(res)
|
payslips += self.env['hr.payslip'].create(res)
|
||||||
else:
|
else:
|
||||||
res = {
|
res = {
|
||||||
'employee_id': emp.id,
|
'employee_id': emp.id,
|
||||||
|
|
@ -2937,9 +2937,9 @@ class HrPayslipRun(models.Model):
|
||||||
# if pays:
|
# if pays:
|
||||||
# for p in pays:
|
# for p in pays:
|
||||||
# if p.employee_id != emp and p not in payslips:
|
# if p.employee_id != emp and p not in payslips:
|
||||||
# payslips += self.env['hr.payslip'].sudo().create(res)
|
# payslips += self.env['hr.payslip'].create(res)
|
||||||
# else:
|
# else:
|
||||||
payslips += self.env['hr.payslip'].sudo().create(res)
|
payslips += self.env['hr.payslip'].create(res)
|
||||||
else:
|
else:
|
||||||
if emp.leaving_date and str(emp.first_hiring_date) < from_date:
|
if emp.leaving_date and str(emp.first_hiring_date) < from_date:
|
||||||
if str(emp.leaving_date) <= from_date:
|
if str(emp.leaving_date) <= from_date:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue