Merge pull request !2525 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-04-21 06:26:55 +00:00
committed by Gitee
@@ -116,12 +116,12 @@ class SalaryComputeWizard(models.Model):
leave_days.unlink()
days = self._process_shift_days(days, start_date, end_date) # 总工作日
leave_internship = self._create_leave_record(start_date, contract_end_date)
leave_internship.unlink()
internship_days = leave_internship.number_of_days
leave_internship.unlink()
internship_days = self._process_shift_days(internship_days, start_date, contract_end_date) # 实习期工作日
leave_work = self._create_leave_record(contract_end_date, end_date)
leave_work.unlink()
work_days = leave_work.number_of_days
leave_work.unlink()
work_days = self._process_shift_days(work_days, contract_end_date, end_date) # 转正工作日
if internship_id.line_ids:
target_names = ['基本工资', '职级工资', '岗位工资', '预发绩效奖金', '通讯补贴', '工龄工资']