Commit Graph

1649 Commits

Author SHA1 Message Date
eslamtalaat744 e57104b8d7
Merge pull request #3345 from expsa/hr_rep_mod
land ,port
2025-05-29 10:03:34 +03:00
blackbelts a429abd969 land ,port 2025-05-29 09:59:56 +03:00
eslamtalaat744 a9bdbe1620
Merge pull request #3343 from expsa/hr_rep_mod
land ,port
2025-05-29 09:40:29 +03:00
blackbelts 6fa8c12645 land ,port 2025-05-29 09:39:07 +03:00
bakry 72e593d5ef
Merge pull request #3340 from expsa/bakry_hr3
fix
2025-05-28 17:40:13 +03:00
Bakry 3eaa38569b fix 2025-05-28 17:34:46 +03:00
شركة خبير المحدودة a7ba177d0d Update github action file 2025-05-28 15:30:46 +03:00
mohammed-alkhazrji af0e2e12f1
Merge pull request #3334 from expsa/missing_punch
fix punch calc
2025-05-28 15:09:51 +03:00
mohammed-alkhazrji 0a81fb1456 fix punch calc 2025-05-28 15:08:45 +03:00
eslamtalaat744 2ad8332b2e
Merge pull request #3330 from expsa/hr_rep_mod
Hr rep mod
2025-05-28 14:45:16 +03:00
blackbelts 55b4855d11 emp reporttt 2025-05-28 14:43:58 +03:00
eslamtalaat744 4c909ce212
Merge pull request #3328 from expsa/hr_rep_mod
Hr rep mod
2025-05-28 13:38:39 +03:00
blackbelts ffbd5f8b2b Merge branch 'hr_rep_mod' of https://github.com/expsa/odex25-standard-modules into hr_rep_mod 2025-05-28 13:37:14 +03:00
blackbelts 10476be506 emp reporttt 2025-05-28 13:37:01 +03:00
eslamtalaat744 b06dfd0685
Merge pull request #3327 from expsa/dev_odex25_hr
Dev odex25 hr
2025-05-28 13:34:51 +03:00
blackbelts b1c3dc566d emp reportف 2025-05-28 13:33:39 +03:00
blackbelts 1550d6d488 emp reportف 2025-05-28 13:10:14 +03:00
blackbelts 7cd0598108 Merge branch 'hr_rep_mod' of https://github.com/expsa/odex25-standard-modules into hr_rep_mod 2025-05-28 12:15:22 +03:00
blackbelts be46e2af49 emp report 2025-05-28 12:14:59 +03:00
eslamtalaat744 1293e673c3
Merge pull request #3325 from expsa/preprod_odex25_hr
Preprod odex25 hr
2025-05-28 11:44:00 +03:00
eslamtalaat744 490a2cbbb5
Merge pull request #3324 from expsa/dev_odex25_hr
Dev odex25 hr
2025-05-28 11:43:08 +03:00
eslamtalaat744 233e78d50c
Merge pull request #3321 from expsa/master_odex25_hr
Master odex25 hr
2025-05-28 10:56:42 +03:00
eslamtalaat744 682d393a34
Merge pull request #3320 from expsa/preprod_odex25_hr
Preprod odex25 hr
2025-05-28 10:54:54 +03:00
eslamtalaat744 0abbe8d406
Merge pull request #3319 from expsa/dev_odex25_hr
Dev odex25 hr
2025-05-28 10:53:46 +03:00
blackbelts 93c47a8481 emp rep 2025-05-27 18:10:20 +03:00
blackbelts 75835d7cf8 emp rep 2025-05-27 18:09:02 +03:00
kchyounes19 7f99bae793
Merge pull request #3317 from expsa/preprod_odex25_hr
Preprod odex25 hr
2025-05-27 15:51:39 +01:00
kchyounes19 321c35940e
Merge pull request #3316 from expsa/dev_odex25_hr
Dev odex25 hr
2025-05-27 15:47:00 +01:00
kchyounes19 50ed46567e
Merge pull request #3315 from expsa/younes_dev_odex25_hr
Fix issue with leave balance calculation in end-of-service report
2025-05-27 15:38:43 +01:00
younes 2cb7bf479b Fix issue with leave balance calculation in end-of-service report 2025-05-27 15:37:36 +01:00
ahmed-nouri051 0e16010b8f
Merge pull request #3264 from expsa/dev_odex25_hr
Dev odex25 hr
2025-05-27 16:21:37 +02:00
ahmed-nouri051 bb246d4b1c
Merge pull request #3314 from expsa/ahmed_odex_hr
modifincation administrative circular
2025-05-27 16:18:37 +02:00
ahmed-nouri051 1a9df050ee modifincation administrative circular 2025-05-27 15:51:50 +02:00
kchyounes19 f8c6bc42ba
Merge pull request #3313 from expsa/younes_dev_odex25_hr
Fix issue with leave balance calculation in end-of-service report
2025-05-27 12:45:50 +01:00
younes 4008c2d3a4 Fix issue with leave balance calculation in end-of-service report 2025-05-27 12:44:51 +01:00
kchyounes19 0c07b8357a
Merge pull request #3312 from expsa/younes_dev_odex25_hr
²Fix issue with leave balance calculation in end-of-service report
2025-05-27 12:40:24 +01:00
younes a22f456d73 Fix issue with leave balance calculation in end-of-service report 2025-05-27 12:38:25 +01:00
mohammed-alkhazrji e95998007e
Merge pull request #3311 from expsa/missing_punch
add missing punch
2025-05-27 14:31:37 +03:00
mohammed-alkhazrji c709f72411 add missing punch 2025-05-27 14:28:34 +03: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