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

!7945 添加功能

Browse Source 
Merge pull request !7945 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2026-01-14 02:27:06 +00:00
committed by Gitee
parent 6b3c5aaae0 f8bbcf9724
commit 8124a323e2
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/overtime_approval.py
+14 -8
View File
@@ -254,6 +254,18 @@ class OvertimeApprovals(models.Model):
def put_hr_employee(self):
for record in self:
for employee_id in record.employee_ids:
start_year = record.start_time.date().year
if record.company_id.name == "天河物管":
start_date = datetime(start_year, 3, 1).date()
valid_date = datetime(start_year + 1, 2, 1).date() + relativedelta(months=1) - relativedelta(days=1)
elif record.company_id.name == "天河粮储":
start_date = datetime(start_year, 7, 1).date()
valid_date = datetime(start_year + 1, 6, 30).date()
else:
start_date = datetime(start_year, 1, 1).date()
valid_date = False
meal_number = employee_id.meal_number
if self.meal == 'yes':
meal_number += 1
@@ -263,6 +275,8 @@ class OvertimeApprovals(models.Model):
allocation = self.env['hr.leave.allocation'].create({
'employee_id': employee_id.id,
'name': '补休',
'date_from': start_date,
'date_to': valid_date,
'number_of_days': self.duration / 8,
'holiday_status_id': holiday_status_id.id,
'allocation_type': 'regular',
@@ -292,14 +306,6 @@ class OvertimeApprovals(models.Model):
elif record.type_overtime == 'holiday':
legal_day = record.duration
start_year = record.start_time.date().year
if record.company_id.name == "天河物管":
valid_date = datetime(start_year + 1, 2, 1).date() + relativedelta(months=1) - relativedelta(days=1)
elif record.company_id.name == "天河粮储":
valid_date = datetime(start_year + 1, 6, 30).date()
else:
valid_date = False
overtime_data = {
'vacation_id': reports_id.id,
'update_type': 'add',