Bakry
|
9385e6af32
|
fix device_id bug
|
2025-07-09 13:03:41 +03:00 |
eslamtalaat744
|
4299ed1d43
|
Merge pull request #3830 from expsa/modify_loan_groups
change groups sequrity on loan
|
2025-07-09 12:20:27 +03:00 |
blackbelts
|
1448ecbba4
|
change groups sequrity on loan
|
2025-07-09 10:50:45 +03:00 |
mohammed-alkhazrji
|
8c33eb9871
|
Merge pull request #3829 from expsa/calc_missing_punch_v2
Calc missing punch v2
|
2025-07-08 20:39:07 +03:00 |
|
mohammed-alkhazrji
|
9c81cefb26
|
calc right missing
|
2025-07-08 20:35:23 +03:00 |
|
mohammed-alkhazrji
|
39fe6f67f6
|
calc right missing
|
2025-07-08 20:31:24 +03:00 |
|
eslamtalaat744
|
1e0e0d64cc
|
Merge pull request #3796 from expsa/fix_hr_att_err
Fix hr att err
|
2025-07-08 10:43:12 +03:00 |
|
blackbelts
|
41f7be68bd
|
modify on contract view
|
2025-07-08 10:41:03 +03:00 |
|
blackbelts
|
5c27143711
|
fix get_speacial_day_timing error
|
2025-07-08 10:24:21 +03:00 |
bakry
|
ef34a3713d
|
Merge pull request #3789 from expsa/bakry_hr
Bakry hr
|
2025-07-07 14:28:09 +03:00 |
|
Bakry
|
f31bdc45ab
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr
|
2025-07-07 14:27:15 +03:00 |
|
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
|
b97e23678f
|
Merge pull request #3788 from expsa/bakry_hr
Bakry hr
|
2025-07-07 14:20:08 +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
|
b54f9b817b
|
Merge pull request #3779 from expsa/bakry_hr
fix termination
|
2025-07-07 11:27:15 +03:00 |
|
Bakry
|
9696efbc2e
|
fix termination
|
2025-07-07 11:26:21 +03:00 |
|
bakry
|
24f63e7768
|
Merge pull request #3778 from expsa/bakry_hr
fix termination
|
2025-07-07 11:11:42 +03:00 |
|
Bakry
|
5a43b1aa2a
|
fix termination
|
2025-07-07 11:10:32 +03:00 |
|
eslamtalaat744
|
1bda852c4b
|
Merge pull request #3735 from expsa/hr_trans_err
fix hr base trans error
|
2025-07-02 13:09:05 +03:00 |
|
blackbelts
|
115b4518e5
|
fix hr base trans error
|
2025-07-02 13:05:49 +03:00 |
|
mohammed-alkhazrji
|
1163365286
|
Merge pull request #3730 from expsa/custody_request_termination
terminate emp there custody requests exceeded
|
2025-07-01 17:08:00 +03:00 |
|
mohammed-alkhazrji
|
cae617b330
|
terminate emp there custody requests exceeded
|
2025-07-01 17:02:51 +03:00 |
|
mohammed-alkhazrji
|
6d1fe6622a
|
terminate emp there custody requests exceeded
|
2025-07-01 17:00:21 +03:00 |
GitHub Actions Bot
|
c385ad766f
|
Add or update prevent-invalid-branch-merges workflow
|
2025-07-01 12:06:24 +03:00 |
|
GitHub Actions Bot
|
994509b9f6
|
Add or update prevent-invalid-branch-merges workflow
|
2025-07-01 12:03:58 +03:00 |
|
GitHub Actions Bot
|
0b37820510
|
Add or update prevent-invalid-branch-merges workflow
|
2025-07-01 11:55:22 +03:00 |
شركة خبير المحدودة
|
6eb36d86a1
|
Update github action file
|
2025-07-01 09:50:34 +03:00 |
|
eslamtalaat744
|
18f040b9fe
|
Merge pull request #3719 from expsa/hr_groups
hr payslip goups
|
2025-06-30 17:48:32 +03:00 |
|
blackbelts
|
8b7539ea23
|
hr payslip goups
|
2025-06-30 17:46:14 +03:00 |
|
GitHub Actions Bot
|
3797310282
|
Add or update prevent-invalid-branch-merges workflow
|
2025-06-30 11:43:36 +03:00 |
|
mohammed-alkhazrji
|
66957d626d
|
Merge pull request #3693 from expsa/punch_missing_report_attendances
add punch mission in report attendances
|
2025-06-29 18:13:15 +03:00 |
|
mohammed-alkhazrji
|
5740c3321c
|
add punch mission in report attendances
|
2025-06-29 18:12:11 +03:00 |
|
mohammed-alkhazrji
|
4929f48e01
|
add punch mission in report attendances
|
2025-06-29 18:08:10 +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 |