Commit Graph

1930 Commits

Author SHA1 Message Date
شركة خبير المحدودة ecff923198
Merge pull request #3867 from expsa/revert-3866-expsa-patch-1
Revert "Update delete-merged-branches.yml"
2025-07-10 22:23:21 +03:00
شركة خبير المحدودة ab39cdb1fd
Revert "Update delete-merged-branches.yml" 2025-07-10 22:23:07 +03:00
شركة خبير المحدودة a84f065e38
Merge pull request #3866 from expsa/expsa-patch-1
Update delete-merged-branches.yml
2025-07-10 22:19:12 +03:00
شركة خبير المحدودة 54462fe005
Update delete-merged-branches.yml 2025-07-10 22:09:11 +03:00
شركة خبير المحدودة a5a7656208
Update Block_Reserved_Branches.yml 2025-07-10 21:30:58 +03:00
شركة خبير المحدودة a017909234
Create Block_Reserved_Branches.yml 2025-07-10 21:26:44 +03:00
GitHub Actions Bot ded50dc441 Add or update delete-merged-branches workflow 2025-07-10 21:11:16 +03:00
GitHub Actions Bot 79159db482 Add or update delete-merged-branches workflow 2025-07-10 20:58:56 +03:00
GitHub Actions Bot 73d9c9f046 Add or update delete-merged-branches workflow 2025-07-10 20:49:23 +03:00
GitHub Actions Bot 211b0a7acc Add or update prevent-invalid-branch-merges workflow 2025-07-10 19:21:14 +03:00
شركة خبير المحدودة 7de312f616 Update github action file 2025-07-10 18:39:32 +03:00
GitHub Actions Bot c714409e34 Add or update prevent-invalid-branch-merges workflow 2025-07-10 17:14:07 +03:00
GitHub Actions Bot b851c3f5ca Add or update prevent-invalid-branch-merges workflow 2025-07-10 17:12:09 +03:00
GitHub Actions Bot 7a0ab3fb4b Add or update delete-merged-branches workflow 2025-07-10 16:28:46 +03:00
ahmed-nouri051 259e36e139
Merge pull request #3834 from expsa/ahmed-odex-hr
fix it date field
2025-07-09 15:26:28 +02:00
ahmed-nouri051 5c45e6efcd fix it date field 2025-07-09 15:21:21 +02:00
bakry 6cb7d7d957
Merge pull request #3831 from expsa/bakry_hr
Bakry hr
2025-07-09 13:18:02 +03:00
Bakry 7b2d5c18e0 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr 2025-07-09 13:10:27 +03:00
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