Commit Graph

1122 Commits

Author SHA1 Message Date
ahmed-nouri051 1a9df050ee modifincation administrative circular 2025-05-27 15:51:50 +02:00
mohammed-alkhazrji 244be12d90
Merge pull request #3284 from expsa/change_translate_open_emp
Change translate open emp
2025-05-22 00:16:49 +03:00
mohammed-alkhazrji b35003aff3 change sum edit 2025-05-22 00:16:30 +03:00
mohammed-alkhazrji 6a50a820a9 change sum edit 2025-05-22 00:14:19 +03:00
bakry a54b3ceb4b
Merge pull request #3268 from expsa/bakry_hr3
fix
2025-05-21 11:27:25 +03:00
Bakry 988a85b652 fix 2025-05-21 11:25:49 +03:00
bakry d845e03fa3
Merge pull request #3267 from expsa/bakry_hr3
fix
2025-05-21 10:26:20 +03:00
Bakry 1d617b9688 fix 2025-05-21 10:25:05 +03:00
Mostafa Abdo b5dd8363ea
Merge pull request #3263 from expsa/pla-15166-fix-attendance-report
fix report attendance
2025-05-20 19:07:58 -07:00
Mostafa 9c48738390 fix report attendance 2025-05-20 19:07:28 -07:00
mohammed-alkhazrji 53f6838db0
Merge pull request #3260 from expsa/attendance_certification
Attendance certification
2025-05-20 17:21:22 +03:00
mohammed-alkhazrji dc16fd67ea make absent hours and temp email 2025-05-20 17:20:49 +03:00
mohammed-alkhazrji ab09479003 make absent hours and temp email 2025-05-20 17:19:17 +03:00
bakry 8755faded5
Merge pull request #3257 from expsa/bakry_hr3
fix
2025-05-20 16:47:15 +03:00
Bakry 599383019f fix 2025-05-20 16:45:55 +03:00
bakry 58b9c4bc1e
Merge pull request #3252 from expsa/bakry_hr3
fix cron atten
2025-05-20 15:36:07 +03:00
Bakry fd9797b5c7 fix cron atten 2025-05-20 15:20:10 +03:00
bakry 823b32850e
Merge pull request #3251 from expsa/bakry_hr3
fix cron atten
2025-05-20 14:51:37 +03:00
Bakry b9fc3be225 fix cron atten 2025-05-20 14:50:42 +03:00
bakry 22fc3bc300
Merge pull request #3243 from expsa/bakry_hr3
fix term
2025-05-20 12:24:28 +03:00
Bakry 6bcde7aeea fix term 2025-05-20 12:22:24 +03:00
mohammed-alkhazrji 6a82bc6999
Merge pull request #3242 from expsa/attendance_certification
make absent hours and temp email
2025-05-20 12:10:33 +03:00
mohammed-alkhazrji e4cb1d88ff make absent hours and temp email 2025-05-20 12:09:50 +03:00
mohammed-alkhazrji 4e01df01fa
Merge pull request #3241 from expsa/attendance_certification
make absent hours and temp email
2025-05-20 11:57:44 +03:00
mohammed-alkhazrji 3a6ea88dcf make absent hours and temp email 2025-05-20 11:56:01 +03:00
mohammed-alkhazrji 6a5cb3b1ad
Merge pull request #3236 from expsa/attendance_certification
make absent hours and temp email
2025-05-20 10:40:48 +03:00
mohammed-alkhazrji 8c48bbc83a make absent hours and temp email 2025-05-20 10:38:23 +03:00
bakry ba9e0044ea
Merge pull request #3221 from expsa/bakry_hr3
Bakry hr3
2025-05-18 17:14:59 +03:00
Bakry f0332f2ab2 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3 2025-05-18 17:14:24 +03:00
Bakry 2604bd548d fix term 2025-05-18 17:13:03 +03:00
bakry 9bdc52517f
Merge pull request #3218 from expsa/bakry_hr3
Bakry hr3
2025-05-18 16:52:12 +03:00
bakry 353698f545
Merge branch 'dev_odex25_hr' into bakry_hr3 2025-05-18 16:51:25 +03:00
Bakry 88be5d0bbc fix 2025-05-18 16:48:07 +03:00
Bakry 2734b1104f fix overtime to transfer multi accounts base on emp type 2025-05-18 16:43:07 +03:00
Bakry 7eec8f9e7a fix Mission to transfer multi accounts base on emp type 2025-05-13 10:10:33 +03:00
SamirLADOUI-sa 5c64336756
Merge pull request #3172 from expsa/samir-aladawi-change-hr-mission-workflow
[FIX] exp_official_mission
2025-05-12 13:28:24 +01:00
Samir Ladoui d003b586a1 [FIX] exp_official_mission 2025-05-12 13:27:43 +01:00
SamirLADOUI-sa 3720733fce
Merge pull request #3168 from expsa/samir-aladawi-change-hr-mission-workflow
[UPD] exp_official_mission
2025-05-12 12:41:57 +01:00
Samir Ladoui fcbb178b17 [UPD] exp_official_mission 2025-05-12 12:41:22 +01:00
ahmed-nouri051 25fe007db3
Merge pull request #3110 from expsa/fix-template-for-hr
noupdate for hr
2025-05-11 10:06:01 +02:00
ahmed-nouri051 f3ec541ebe noupdate for hr 2025-05-11 10:05:10 +02:00
SamirLADOUI-sa 60453c3848
Merge pull request #3015 from expsa/samir-aladawi-fix-computes-hr-base
[FIX] hr_base
2025-05-07 12:10:39 +01:00
Samir Ladoui ef69eddccb [FIX] hr_base 2025-05-07 12:10:05 +01:00
SamirLADOUI-sa 43a63c23fb
Merge pull request #3002 from expsa/samir-aladawi-fix-additional-hours-attedances
[FIX] attendances
2025-05-06 12:33:01 +01:00
Samir Ladoui ea8c0b9bd7 [FIX] attendances 2025-05-06 12:32:23 +01:00
SamirLADOUI-sa cce702b96f
Merge pull request #2999 from expsa/samir-aladawi-fix-additional-hours-attedances
[FIX] attendances
2025-05-06 12:18:08 +01:00
Samir Ladoui 815ba32353 [FIX] attendances 2025-05-06 12:17:43 +01:00
bakry 4d8fb7da13
Merge pull request #2944 from expsa/bakry_hr3
fix remove field
2025-05-01 12:12:21 +03:00
Bakry fb2d1b5fca fix remove field 2025-05-01 12:11:03 +03:00
Mostafa Abdo f98de60ef0
Merge pull request #2942 from expsa/pla-451615-new-report-for-employee-totals
new report for employee attendance
2025-04-29 19:12:56 -07:00