@@ -1293,7 +1293,6 @@ class HrAttendance(models.Model):
|
||||
record.shift_name = '休息'
|
||||
else:
|
||||
record.shift_name = '行政班次'
|
||||
|
||||
if record.is_expatriation:
|
||||
record.shift_name = '外派'
|
||||
|
||||
@@ -1314,7 +1313,7 @@ class HrAttendance(models.Model):
|
||||
if current_data > today:
|
||||
return record
|
||||
record.set_shift_name()
|
||||
record.compute_attendance_ids()
|
||||
# record.compute_attendance_ids()
|
||||
return record
|
||||
|
||||
def write(self, vals):
|
||||
@@ -1323,7 +1322,7 @@ class HrAttendance(models.Model):
|
||||
if 'current_data' in vals or 'shift_id' in vals:
|
||||
self.set_shift_name()
|
||||
for record in self:
|
||||
record.compute_attendance_ids()
|
||||
# record.compute_attendance_ids()
|
||||
self._update_vacation_report(record)
|
||||
return result
|
||||
|
||||
|
||||
Reference in New Issue
Block a user