Bakry
|
e10813728c
|
fix
|
2025-06-01 13:29:11 +03:00 |
|
Bakry
|
9d28e30cae
|
fix transfer account
|
2025-05-29 14:21:58 +03:00 |
|
Bakry
|
3eaa38569b
|
fix
|
2025-05-28 17:34:46 +03:00 |
|
Bakry
|
988a85b652
|
fix
|
2025-05-21 11:25:49 +03:00 |
|
Bakry
|
1d617b9688
|
fix
|
2025-05-21 10:25:05 +03:00 |
|
Bakry
|
599383019f
|
fix
|
2025-05-20 16:45:55 +03:00 |
|
Bakry
|
fd9797b5c7
|
fix cron atten
|
2025-05-20 15:20:10 +03:00 |
|
Bakry
|
b9fc3be225
|
fix cron atten
|
2025-05-20 14:50:42 +03:00 |
|
Bakry
|
6bcde7aeea
|
fix term
|
2025-05-20 12:22:24 +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 |
Mostafa
|
0b0de1f3d9
|
new report for employee attendance
|
2025-04-29 19:10:09 -07:00 |
|
ahmed-nouri051
|
44f17a8f52
|
Merge pull request #2933 from expsa/fixing-error-attendance-report
fix attendence
|
2025-04-29 14:23:24 +02:00 |
|
ahmed-nouri051
|
4818f7e553
|
fix attendence
|
2025-04-29 14:20:14 +02:00 |
|
ahmed-nouri051
|
d0b3a585d3
|
Merge pull request #2924 from expsa/fixing-error-attendance-report
fixing prod error
|
2025-04-29 10:54:36 +02:00 |
|
ahmed-nouri051
|
e7a0853044
|
fixing prod error
|
2025-04-29 10:51:57 +02:00 |
|
SamirLADOUI-sa
|
90f56658d3
|
Merge pull request #2911 from expsa/samir-aladawi-fix-complete-registration-portal
[FIX] hr_holidays_public
|
2025-04-28 00:44:06 +01:00 |
|
Samir Ladoui
|
fad9d12f44
|
[FIX] hr_holidays_public
|
2025-04-28 00:39:52 +01:00 |
kchyounes19
|
4a7e289ddb
|
Merge pull request #2904 from expsa/younes_dev_odex25_hr
update pyslip logic
|
2025-04-27 14:46:56 +01:00 |
|
younes
|
3db8da5b9a
|
update pyslip logic
|
2025-04-27 14:46:00 +01:00 |
|
kchyounes19
|
ca7c75419c
|
Merge pull request #2903 from expsa/younes_dev_odex25_hr
update pyslip logic
|
2025-04-27 14:32:25 +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 |