Commit Graph

776 Commits

Author SHA1 Message Date
ahmed-nouri051 1a9df050ee modifincation administrative circular 2025-05-27 15:51:50 +02: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 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 e4cb1d88ff make absent hours and temp email 2025-05-20 12:09:50 +03:00
mohammed-alkhazrji 3a6ea88dcf make absent hours and temp email 2025-05-20 11:56:01 +03:00
mohammed-alkhazrji 8c48bbc83a make absent hours and temp email 2025-05-20 10:38:23 +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 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
Samir Ladoui d003b586a1 [FIX] exp_official_mission 2025-05-12 13:27:43 +01:00
Samir Ladoui fcbb178b17 [UPD] exp_official_mission 2025-05-12 12:41:22 +01:00
ahmed-nouri051 f3ec541ebe noupdate for hr 2025-05-11 10:05:10 +02:00
Samir Ladoui ef69eddccb [FIX] hr_base 2025-05-07 12:10:05 +01:00
Samir Ladoui ea8c0b9bd7 [FIX] attendances 2025-05-06 12:32:23 +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 0b0de1f3d9 new report for employee attendance 2025-04-29 19:10:09 -07:00
ahmed-nouri051 4818f7e553 fix attendence 2025-04-29 14:20:14 +02:00
ahmed-nouri051 e7a0853044 fixing prod error 2025-04-29 10:51:57 +02:00
Samir Ladoui fad9d12f44 [FIX] hr_holidays_public 2025-04-28 00:39:52 +01:00
younes 3db8da5b9a update pyslip logic 2025-04-27 14:46:00 +01:00
younes 2ec0c082b5 update pyslip logic 2025-04-27 14:31:34 +01:00
Esraa-Exp 63dcfeae1f
Merge pull request #2901 from expsa/Esraa-Ensan-hr-tasks
comment
2025-04-27 09:02:34 +02:00
Esraa-Exp 6c6f0c1cad comment 2025-04-27 08:59:26 +02:00
Esraa-Exp 6f9a0b6b7d
Merge pull request #2900 from expsa/Esraa-Ensan-hr-tasks
user login
2025-04-27 08:49:16 +02:00
Esraa-Exp 40fb7208e5 user login 2025-04-27 08:47:46 +02:00
Esraa-Exp bae731da2d
Merge pull request #2899 from expsa/Esraa-Ensan-hr-tasks
comment
2025-04-25 17:24:31 +02:00
Esraa-Exp 05e8688a5c comment 2025-04-25 17:23:40 +02:00
Esraa-Exp 8b82bd4804
Merge pull request #2898 from expsa/Esraa-Ensan-hr-tasks
comment
2025-04-25 17:16:47 +02:00
Esraa-Exp fb0710d4f4 comment 2025-04-25 17:15:43 +02:00