pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!12750 !12749 添加功能

Browse Source 
Merge pull request !12750 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-08-31 09:16:22 +00:00
committed by Gitee
parent 0b381509de 314a0b9019
commit 94de65f315
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/yuthon_vacation_reports.py
+6 -2
View File
@@ -422,8 +422,7 @@ class YuthonVacationReports(models.Model):
def update_line(self): def update_line(self):
if self.vacation_date == fields.Date.from_string('2026-01-01'): if self.vacation_date == fields.Date.from_string('2026-01-01'):
return return
# 更新育儿假
self.employee_id.update_parental_leave()
self.manage_reject() self.manage_reject()
# ========== 第一步：处理年假逻辑 ========== # ========== 第一步：处理年假逻辑 ==========
for rec in self: for rec in self:
@@ -433,6 +432,11 @@ class YuthonVacationReports(models.Model):
self_overtime = rec.overtime_ids.filtered(lambda o: not o.workflow_record_id and o.text == '上月额度继承') self_overtime = rec.overtime_ids.filtered(lambda o: not o.workflow_record_id and o.text == '上月额度继承')
self_overtime.workday = (rec.dynamic_previous_year1 + rec.this_year1) * 8 self_overtime.workday = (rec.dynamic_previous_year1 + rec.this_year1) * 8
self_parenting = rec.parenting_line_ids.filtered(lambda o:o.text == '上月额度继承')
if not self_parenting:
# 更新育儿假
self.employee_id.update_parental_leave()
# 如果上个月加班是0 删除明细 # 如果上个月加班是0 删除明细
if self_overtime.workday == 0: if self_overtime.workday == 0:
self_overtime.unlink() self_overtime.unlink()