Commit Graph

1883 Commits

Author SHA1 Message Date
Bakry dbbc957166 fix new Attendance calculation 2025-07-07 14:24:47 +03:00
Bakry 7c317c4943 fix new Attendance calculation 2025-07-07 14:21:03 +03:00
Bakry fa6c578e07 fix new GOSI calculation 2025-07-07 14:12:41 +03:00
Bakry 7a645ce875 fix 2025-07-07 14:12:04 +03:00
Bakry 9696efbc2e fix termination 2025-07-07 11:26:21 +03:00
Bakry 5a43b1aa2a fix termination 2025-07-07 11:10:32 +03:00
bakry 082e00b718
Merge pull request #3686 from expsa/bakry_hr
Bakry hr
2025-06-29 15:08:15 +03:00
Bakry 5aad3e7f48 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3 2025-06-29 15:02:41 +03:00
Bakry 8c1106aa54 fix 2025-06-29 15:01:07 +03:00
eslamtalaat744 cfd8b8d5eb
Merge pull request #3680 from expsa/hr_groups
Hr groups
2025-06-29 11:22:27 +03:00
blackbelts 3ed037ae2a payroll groups 2025-06-29 11:21:33 +03:00
blackbelts 9bf1194d7f payroll groups 2025-06-29 11:10:59 +03:00
eslamtalaat744 c7fa64b255
Merge pull request #3652 from expsa/hr_payroll_group
HR Advance Payroll ecurity
2025-06-26 14:54:12 +03:00
Bakry 4321905e84 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3 2025-06-26 14:53:19 +03:00
blackbelts 5bfccdd8e6 HR Advance Payroll ecurity 2025-06-26 14:53:16 +03:00
Bakry 2af9f7cbbb fix 2025-06-26 14:52:09 +03:00
eslamtalaat744 1f4c2f4ef2
Merge pull request #3651 from expsa/hr_payroll_group
HR Advance Payroll ecurity
2025-06-26 14:46:44 +03:00
blackbelts a2651808a3 HR Advance Payroll ecurity 2025-06-26 14:45:32 +03:00
eslamtalaat744 da7c88cc90
Merge pull request #3649 from expsa/hr_payroll_group
HR Advance Payroll ecurity
2025-06-26 14:41:10 +03:00
blackbelts 94c9d977e2 HR Advance Payroll ecurity 2025-06-26 14:39:05 +03:00
eslamtalaat744 a13fb22db2
Merge pull request #3645 from expsa/hr_payroll_group
HR Advance Payroll ecurity
2025-06-26 13:23:44 +03:00
blackbelts f1360f9f9b HR Advance Payroll ecurity 2025-06-26 13:20:37 +03:00
eslamtalaat744 2efde76eda
Merge pull request #3644 from expsa/hr_payroll_group
HR Advance Payroll ecurity
2025-06-26 12:36:05 +03:00
blackbelts c25f708fe7 HR Advance Payroll ecurity 2025-06-26 12:34:59 +03:00
eslamtalaat744 2296efce2c
Merge pull request #3643 from expsa/hr_payroll_group
HR Advance Payroll ecurity
2025-06-26 12:31:13 +03:00
blackbelts 666d3ad567 HR Advance Payroll ecurity 2025-06-26 12:27:43 +03:00
eslamtalaat744 306355d801
Merge pull request #3640 from expsa/hr_payroll_group
Hr payroll group
2025-06-26 11:07:12 +03:00
blackbelts 8556a3daf9 make course name store 2025-06-26 11:05:52 +03:00
blackbelts e1594197f6 make course name store 2025-06-26 10:55:08 +03:00
SamirLADOUI-sa 91775aa554
Merge pull request #3633 from expsa/samir-aladawi-fix-translation-exp-official-mission
[FIX] exp_official_mission: translation
2025-06-25 14:40:24 +01:00
Samir Ladoui e9ccfeab01 [FIX] exp_official_mission: translation 2025-06-25 14:39:06 +01:00
eslamtalaat744 ab251320e9
Merge pull request #3622 from expsa/attendence_total_hou
cla
2025-06-24 14:32:45 +03:00
blackbelts b09b1d44e6 cla 2025-06-24 14:31:37 +03:00
eslamtalaat744 a6ae2a16be
Merge pull request #3620 from expsa/attendence_total_hou
cla
2025-06-24 13:23:21 +03:00
blackbelts c3b4227993 cla 2025-06-24 13:22:30 +03:00
eslamtalaat744 7e3514eece
Merge pull request #3617 from expsa/attendence_total_hou
Attendence total hou
2025-06-24 13:03:17 +03:00
blackbelts 62750864b3 cla 2025-06-24 12:58:21 +03:00
eslamtalaat744 8074103079
Merge pull request #3616 from expsa/attendence_total_hou
cla
2025-06-24 12:43:36 +03:00
blackbelts 3e8aa1e4bc cla 2025-06-24 12:42:44 +03:00
blackbelts 3cb98d5a5b cla 2025-06-24 12:34:49 +03:00
eslamtalaat744 1d4d44d9af
Merge pull request #3615 from expsa/attendence_total_hou
Attendence total hou
2025-06-24 12:31:23 +03:00
blackbelts 7ef5f0037a cla 2025-06-24 12:29:42 +03:00
blackbelts dcd8b9e6a0 cla 2025-06-24 12:28:17 +03:00
eslamtalaat744 63fb19eeb0
Merge pull request #3611 from expsa/attendence_total_hou
cla
2025-06-24 10:54:57 +03:00
blackbelts b3ba705d97 cla 2025-06-24 10:51:14 +03:00
eslamtalaat744 862401d8b7
Merge pull request #3608 from expsa/attendence_total_hou
Attendence total hou
2025-06-24 10:12:00 +03:00
blackbelts 5930697b8e appraial fin 2025-06-24 10:10:30 +03:00
blackbelts 385996f5b4 appraial fin 2025-06-24 10:08:26 +03:00
GitHub Actions Bot 916b1187dd Add or update prevent-invalid-branch-merges workflow 2025-06-23 18:18:01 +03:00
bakry 28bf7ce076
Merge pull request #3591 from expsa/bakry_hr3
fix
2025-06-23 16:38:56 +03:00