Commit Graph

1730 Commits

Author SHA1 Message Date
eslamtalaat744 9c1c408e6c
Merge pull request #3471 from expsa/hr_traning_table
delete can delete ,edite false from balance view
2025-06-17 10:14:15 +03:00
blackbelts ee5b55a361 delete can delete ,edite false from balance view 2025-06-17 10:11:50 +03:00
شركة خبير المحدودة 1862f3e41d Update github action file 2025-06-17 07:14:30 +03:00
شركة خبير المحدودة f367ddc443
Update production_pull_code.yml 2025-06-16 22:22:48 +03:00
bakry 58e886ca5c
Merge pull request #3468 from expsa/bakry_hr3
fix termination report
2025-06-16 21:58:53 +03:00
Bakry 5494b4cc8c fix termination report 2025-06-16 21:57:38 +03:00
bakry be4ce92d05
Merge pull request #3467 from expsa/bakry_hr3
fix termination report
2025-06-16 17:24:08 +03:00
Bakry 5636dd6b83 fix termination report 2025-06-16 17:23:22 +03:00
bakry 37e271ce58
Merge pull request #3466 from expsa/bakry_hr3
Bakry hr3
2025-06-16 17:19:31 +03:00
Bakry a06ee93538 fix termination report 2025-06-16 17:18:47 +03:00
eslamtalaat744 0301e02e2f
Merge pull request #3465 from expsa/hr_traning_table
add ne tab on hr.official.mission ,tran, date duration on the end
2025-06-16 16:08:15 +03:00
blackbelts af4399b4ef add ne tab on hr.official.mission ,tran, date duration on the end 2025-06-16 16:07:23 +03:00
eslamtalaat744 e67b535cfa
Merge pull request #3464 from expsa/hr_traning_table
Hr traning table
2025-06-16 15:20:31 +03:00
blackbelts 7f0298f1ca fix merge error 2025-06-16 15:18:53 +03:00
blackbelts 51844ef15e fix merge error 2025-06-16 15:17:18 +03:00
eslamtalaat744 0b5d28d4bb
Merge pull request #3463 from expsa/hr_change_title
add ne tab on hr.official.mission ,tran
2025-06-16 15:00:06 +03:00
eslamtalaat744 fe1558461c
Merge branch 'dev_odex25_hr' into hr_change_title 2025-06-16 14:59:57 +03:00
blackbelts 1e52369fbc add ne tab on hr.official.mission ,tran 2025-06-16 14:47:46 +03:00
Bakry 5eb594b508 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3 2025-06-16 13:10:57 +03:00
bakry addf1e8790
Merge pull request #3459 from expsa/bakry_hr3
fix
2025-06-16 12:54:09 +03:00
eslamtalaat744 743dce6278
Merge pull request #3457 from expsa/hr_change_title
add field on public hr
2025-06-16 11:29:35 +03:00
blackbelts 6a19fb1a76 add field on public hr 2025-06-16 11:20:49 +03:00
شركة خبير المحدودة 5c465b43ac Update github action file 2025-06-16 10:48:57 +03:00
kchyounes19 2f62e17add
Merge pull request #3442 from expsa/kch_dev_odex25_hr
fix bug
2025-06-12 14:26:24 +01:00
younes 1eb7b63bf7 fix bug 2025-06-12 14:25:32 +01:00
kchyounes19 951159c544
Merge pull request #3440 from expsa/kch_dev_odex25_hr
fix bug
2025-06-12 14:10:46 +01:00
younes b5a1ad4c1f fix bug 2025-06-12 14:08:59 +01:00
kchyounes19 20d209cede
Merge pull request #3438 from expsa/kch_dev_odex25_hr
fix bug
2025-06-12 14:03:57 +01:00
younes b639a9fd66 fix bug 2025-06-12 14:02:43 +01:00
ahmed-nouri051 fbcf6d10d7
Merge pull request #3436 from expsa/changement-in-hr
apply changement on respartner
2025-06-12 09:24:15 +02:00
ahmed-nouri051 fffe872d83 apply changement on respartner 2025-06-12 09:21:22 +02:00
eslamtalaat744 d1a9460d5f
Merge pull request #3431 from expsa/hr_change_title
add dep field
2025-06-04 16:31:31 +03:00
blackbelts 751078d6d5 add dep field 2025-06-04 16:30:33 +03:00
eslamtalaat744 6adff93171
Merge pull request #3430 from expsa/hr_change_title
delete calende
2025-06-04 15:21:03 +03:00
blackbelts 22dd19657d delete calende 2025-06-04 15:19:11 +03:00
eslamtalaat744 ffcccb72f3
Merge pull request #3429 from expsa/hr_change_title
delete calende
2025-06-04 14:45:14 +03:00
blackbelts 7fccd99d60 delete calende 2025-06-04 14:15:02 +03:00
Bakry 07e04c1e28 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3 2025-06-04 13:52:34 +03:00
Bakry f4184fac2a fix 2025-06-04 13:52:02 +03:00
kchyounes19 ae51ec9121
Merge pull request #3426 from expsa/younes_dev_odex25_hr
Implement working days-only calculation for training missions
2025-06-04 09:25:04 +01:00
younes e1918e1864 Implement working days-only calculation for training missions 2025-06-04 09:23:05 +01:00
eslamtalaat744 af504d676b
Merge pull request #3418 from expsa/hr_change_title
modify on fields and report
2025-06-03 16:46:50 +03:00
blackbelts 8a76b628ce modify on fields and report 2025-06-03 16:44:21 +03:00
ahmed-nouri051 095b2a8862
Merge pull request #3416 from expsa/ahmed_odex_hr
ahmed odex hr
2025-06-03 14:03:44 +02:00
ahmed-nouri051 dce828f1d7 ahmed odex hr 2025-06-03 13:59:46 +02:00
mohammed-alkhazrji ca72115bae
Merge pull request #3415 from expsa/absent_calc
fix templaate email
2025-06-03 14:53:40 +03:00
mohammed-alkhazrji f45262c52f fix templaate email 2025-06-03 14:46:25 +03:00
eslamtalaat744 d9d9c5fc19
Merge pull request #3409 from expsa/hr_change_title
modify on fields and report
2025-06-03 10:33:05 +03:00
blackbelts c37f11712b modify on fields and report 2025-06-03 10:30:53 +03:00
mazenmuhamad a1201f10e1
Merge pull request #3397 from expsa/zen_ht_contact
fix error
2025-06-02 16:14:14 +03:00