commit
defc02a119
|
|
@ -2413,7 +2413,6 @@ class HrPayslipRun(models.Model):
|
|||
|
||||
# Override function compute sheet in Payslip Batches
|
||||
|
||||
|
||||
def compute_sheet(self):
|
||||
payslips = self.env['hr.payslip']
|
||||
[data] = self.read()
|
||||
|
|
@ -2426,7 +2425,8 @@ class HrPayslipRun(models.Model):
|
|||
# worked_days, emps, dictionary = [], [], []
|
||||
worked_days, emps, dictionary, emp_last_payslip, emp_priv_payslip = [], [], [], [], []
|
||||
|
||||
if datetime.strptime(str(from_date), "%Y-%m-%d").date().month == datetime.strptime(str(to_date),"%Y-%m-%d").date().month:
|
||||
if datetime.strptime(str(from_date), "%Y-%m-%d").date().month == datetime.strptime(str(to_date),
|
||||
"%Y-%m-%d").date().month:
|
||||
month_date = datetime.strptime(str(from_date), "%Y-%m-%d").date()
|
||||
|
||||
if self.department_ids:
|
||||
|
|
@ -2448,7 +2448,8 @@ class HrPayslipRun(models.Model):
|
|||
employees = self.env['hr.employee'].browse(data['employee_ids'])
|
||||
|
||||
################### Employee run payslip one in month and previously month #######
|
||||
last_payslips = self.env['hr.payslip'].search([('date_from', '>=', self.date_start),('date_from', '<=', self.date_end),
|
||||
last_payslips = self.env['hr.payslip'].search(
|
||||
[('date_from', '>=', self.date_start), ('date_from', '<=', self.date_end),
|
||||
('payslip_run_id', '!=', self.id)])
|
||||
if last_payslips:
|
||||
for priv_pay in last_payslips:
|
||||
|
|
@ -2466,7 +2467,8 @@ class HrPayslipRun(models.Model):
|
|||
########################################################################################
|
||||
last_month = self.date_start - relativedelta(months=1)
|
||||
end_last_month = self.date_start - relativedelta(days=1)
|
||||
priv_payslips_month = self.env['hr.payslip'].search([('date_from', '>=', last_month),('date_from', '<=', end_last_month),
|
||||
priv_payslips_month = self.env['hr.payslip'].search(
|
||||
[('date_from', '>=', last_month), ('date_from', '<=', end_last_month),
|
||||
('payslip_run_id', '!=', self.id)]).employee_id
|
||||
old_payslips = self.env['hr.payslip'].search([('date_from', '<', self.date_start),
|
||||
('payslip_run_id', '!=', self.id)]).employee_id
|
||||
|
|
@ -2483,7 +2485,8 @@ class HrPayslipRun(models.Model):
|
|||
emp_priv_payslip.append(emp.name)
|
||||
if emp_priv_payslip:
|
||||
raise exceptions.Warning(
|
||||
_("Sorry, The Previous month's salary has Not been calculated for Employees \n %s") % (emp_priv_payslip))
|
||||
_("Sorry, The Previous month's salary has Not been calculated for Employees \n %s") % (
|
||||
emp_priv_payslip))
|
||||
|
||||
################### End ################################################################
|
||||
if employees:
|
||||
|
|
@ -2525,7 +2528,7 @@ class HrPayslipRun(models.Model):
|
|||
'company_id': employee.company_id.id,
|
||||
'percentage': self.percentage}
|
||||
|
||||
item_payslip = self.env['hr.payslip'].create(res)
|
||||
item_payslip = self.env['hr.payslip'].sudo().create(res)
|
||||
payslips += item_payslip
|
||||
# if pays:
|
||||
# for p in pays:
|
||||
|
|
@ -2541,7 +2544,7 @@ class HrPayslipRun(models.Model):
|
|||
'number_of_days': duration,
|
||||
'number_of_hours': hours,
|
||||
'contract_id': employee.contract_id.id}
|
||||
worked_days += self.env['hr.payslip.worked_days'].create(days)
|
||||
worked_days += self.env['hr.payslip.worked_days'].sudo().create(days)
|
||||
else:
|
||||
item_payslip = employee_slip_line
|
||||
payslips += item_payslip
|
||||
|
|
@ -2576,7 +2579,6 @@ class HrPayslipRun(models.Model):
|
|||
hours = (float((contract_end_date - contract_start_date).seconds) / 86400) * 24
|
||||
if not employee_slip_line:
|
||||
|
||||
|
||||
res = {
|
||||
'employee_id': employee.id,
|
||||
'name': slip_data['value'].get('name'),
|
||||
|
|
@ -2592,10 +2594,9 @@ class HrPayslipRun(models.Model):
|
|||
'company_id': employee.company_id.id,
|
||||
'percentage': self.percentage}
|
||||
|
||||
item_payslip = self.env['hr.payslip'].create(res)
|
||||
item_payslip = self.env['hr.payslip'].sudo().create(res)
|
||||
payslips += item_payslip
|
||||
|
||||
|
||||
# if pays:
|
||||
# for p in pays:
|
||||
# if p.employee_id != employee and p not in payslips:
|
||||
|
|
@ -2646,7 +2647,7 @@ class HrPayslipRun(models.Model):
|
|||
'company_id': employee.company_id.id,
|
||||
'percentage': self.percentage}
|
||||
|
||||
item_payslip = self.env['hr.payslip'].create(res)
|
||||
item_payslip = self.env['hr.payslip'].sudo().create(res)
|
||||
payslips += item_payslip
|
||||
# if pays:
|
||||
# for p in pays:
|
||||
|
|
@ -2662,7 +2663,7 @@ class HrPayslipRun(models.Model):
|
|||
'number_of_days': duration,
|
||||
'number_of_hours': hours,
|
||||
'contract_id': employee.contract_id.id}
|
||||
worked_days += self.env['hr.payslip.worked_days'].create(days)
|
||||
worked_days += self.env['hr.payslip.worked_days'].sudo().create(days)
|
||||
else:
|
||||
item_payslip = employee_slip_line
|
||||
payslips += item_payslip
|
||||
|
|
@ -2694,7 +2695,7 @@ class HrPayslipRun(models.Model):
|
|||
'company_id': employee.company_id.id,
|
||||
'percentage': self.percentage}
|
||||
|
||||
payslips += self.env['hr.payslip'].create(res)
|
||||
payslips += self.env['hr.payslip'].sudo().create(res)
|
||||
else:
|
||||
res = {
|
||||
'employee_id': employee.id,
|
||||
|
|
@ -2712,7 +2713,7 @@ class HrPayslipRun(models.Model):
|
|||
'company_id': employee.company_id.id,
|
||||
'percentage': self.percentage}
|
||||
|
||||
payslips += self.env['hr.payslip'].create(res)
|
||||
payslips += self.env['hr.payslip'].sudo().create(res)
|
||||
else:
|
||||
if employee.leaving_date and str(employee.first_hiring_date) < from_date:
|
||||
if str(employee.leaving_date) <= from_date:
|
||||
|
|
@ -2757,7 +2758,7 @@ class HrPayslipRun(models.Model):
|
|||
'credit_note': self.credit_note,
|
||||
'company_id': emp.company_id.id,
|
||||
'percentage': self.percentage}
|
||||
item_payslip = self.env['hr.payslip'].create(res)
|
||||
item_payslip = self.env['hr.payslip'].sudo().create(res)
|
||||
payslips += item_payslip
|
||||
# if pays:
|
||||
# for p in pays:
|
||||
|
|
@ -2773,7 +2774,7 @@ class HrPayslipRun(models.Model):
|
|||
'number_of_days': duration,
|
||||
'number_of_hours': hours,
|
||||
'contract_id': emp.contract_id.id}
|
||||
worked_days += self.env['hr.payslip.worked_days'].create(days)
|
||||
worked_days += self.env['hr.payslip.worked_days'].sudo().create(days)
|
||||
else:
|
||||
item_payslip = employee_slip_line
|
||||
payslips += item_payslip
|
||||
|
|
@ -2817,7 +2818,7 @@ class HrPayslipRun(models.Model):
|
|||
'credit_note': self.credit_note,
|
||||
'company_id': emp.company_id.id,
|
||||
'percentage': self.percentage}
|
||||
item_payslip = self.env['hr.payslip'].create(res)
|
||||
item_payslip = self.env['hr.payslip'].sudo().create(res)
|
||||
payslips += item_payslip
|
||||
# if pays:
|
||||
# for p in pays:
|
||||
|
|
@ -2833,7 +2834,7 @@ class HrPayslipRun(models.Model):
|
|||
'number_of_days': duration,
|
||||
'number_of_hours': hours,
|
||||
'contract_id': emp.contract_id.id}
|
||||
worked_days += self.env['hr.payslip.worked_days'].create(days)
|
||||
worked_days += self.env['hr.payslip.worked_days'].sudo().create(days)
|
||||
else:
|
||||
item_payslip = employee_slip_line
|
||||
payslips += item_payslip
|
||||
|
|
@ -2864,7 +2865,7 @@ class HrPayslipRun(models.Model):
|
|||
'credit_note': self.credit_note,
|
||||
'company_id': emp.company_id.id,
|
||||
'percentage': self.percentage}
|
||||
item_payslip = self.env['hr.payslip'].create(res)
|
||||
item_payslip = self.env['hr.payslip'].sudo().create(res)
|
||||
payslips += item_payslip
|
||||
# if pays:
|
||||
# for p in pays:
|
||||
|
|
@ -2880,7 +2881,7 @@ class HrPayslipRun(models.Model):
|
|||
'number_of_days': duration,
|
||||
'number_of_hours': hours,
|
||||
'contract_id': emp.contract_id.id}
|
||||
worked_days += self.env['hr.payslip.worked_days'].create(days)
|
||||
worked_days += self.env['hr.payslip.worked_days'].sudo().create(days)
|
||||
else:
|
||||
item_payslip = employee_slip_line
|
||||
payslips += item_payslip
|
||||
|
|
@ -2914,9 +2915,9 @@ class HrPayslipRun(models.Model):
|
|||
# if pays:
|
||||
# for p in pays:
|
||||
# if p.employee_id != emp and p not in payslips:
|
||||
# payslips += self.env['hr.payslip'].create(res)
|
||||
# payslips += self.env['hr.payslip'].sudo().create(res)
|
||||
# else:
|
||||
payslips += self.env['hr.payslip'].create(res)
|
||||
payslips += self.env['hr.payslip'].sudo().create(res)
|
||||
else:
|
||||
res = {
|
||||
'employee_id': emp.id,
|
||||
|
|
@ -2936,9 +2937,9 @@ class HrPayslipRun(models.Model):
|
|||
# if pays:
|
||||
# for p in pays:
|
||||
# if p.employee_id != emp and p not in payslips:
|
||||
# payslips += self.env['hr.payslip'].create(res)
|
||||
# payslips += self.env['hr.payslip'].sudo().create(res)
|
||||
# else:
|
||||
payslips += self.env['hr.payslip'].create(res)
|
||||
payslips += self.env['hr.payslip'].sudo().create(res)
|
||||
else:
|
||||
if emp.leaving_date and str(emp.first_hiring_date) < from_date:
|
||||
if str(emp.leaving_date) <= from_date:
|
||||
|
|
|
|||
Loading…
Reference in New Issue