diff --git a/yuthon_salary/wizard/salary_compute_wizard.py b/yuthon_salary/wizard/salary_compute_wizard.py index 590c902ce..c4be3f9a1 100644 --- a/yuthon_salary/wizard/salary_compute_wizard.py +++ b/yuthon_salary/wizard/salary_compute_wizard.py @@ -167,7 +167,8 @@ class SalaryComputeWizard(models.Model): contract_start_date = internship_id.date_from contract_end_date = is_turnover else: - continue + internship_id.compute_sheet() + if is_turnover or is_probation: days = self._process_shift_days(original_start_date, original_end_date) # 总工作日 @@ -281,8 +282,8 @@ class SalaryComputeWizard(models.Model): setattr(internship_id, field_name, result) line.write({'total': result}) - # for rec in self.env['hr.payslip'].search([('is_push', '=', False), ('employee_id.name', '!=', '王鸿怡')]): - # rec.compute_sheet() + for rec in self.env['hr.payslip'].search([('is_push', '=', False), ('salary_group_id.name', '=', '天河物管领导')]): + rec.compute_sheet() # # for rec2 in self.env['hr.payslip'].search([('employee_id.name', 'in', ['黄昱皓', '谭铭浩', '朱文浩'])]): # rec2.compute_sheet()