devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #511 from expsa/bakry_hr 

fix
This commit is contained in:
bakry 2024-08-05 10:36:45 +03:00 committed by GitHub
parent 64c17d0e5b 15263bb617
commit 9601729376
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
odex25_hr/attendances/models/hr_attendance_transactions.py
View File

@ -824,7 +824,7 @@ class HrAttendanceTransactions(models.Model):
one_in_dt, one_out_dt = shift_one['sign_in_dt'], shift_one['sign_out_dt']
del shift_one['sign_in_dt']
del shift_one['sign_out_dt']
if one_out_dt: signs_out = signs_out.filtered(lambda s: s.name > str(one_out_dt))
if one_out_dt: signs_out = signs_out.filtered(lambda s: str(s.name) > str(one_out_dt))
force_create = False
if shift_one.get('attending_type') == 'out_cal':
shift_one_extra = {'sign_in': 0.0, 'sign_out': 0.0, 'date': day_item, 'sequence': 1,
@ -843,7 +843,7 @@ class HrAttendanceTransactions(models.Model):
two_max_in_dt, two_min_out_dt, two_max_out_dt, base_dict)
if two_signs_in:
signs_out = signs_out.filtered(
lambda s: s.name > str(two_signs_in[0].name)) or attendance_pool
lambda s: s.name > two_signs_in[0].name) or attendance_pool
if two_dict:
shift_two = two_dict['shift']
shift_two['sequence'] = 2