Commit Graph

2507 Commits

Author SHA1 Message Date
شركة خبير المحدودة ca88c0271a Update github action file 2024-07-29 13:20:58 +03:00
شركة خبير المحدودة 9fc5d92d73 Update github action file 2024-07-29 13:20:48 +03:00
شركة خبير المحدودة d570fe38cf Update github action file 2024-07-29 13:20:39 +03:00
شركة خبير المحدودة 7b896da659 Update github action file 2024-07-29 13:20:29 +03:00
bakry 50d55c7afc
Merge pull request #417 from expsa/bakry_edit
fix
2024-07-29 13:00:18 +03:00
Bakry f08c82ef16 fix 2024-07-29 12:09:04 +03:00
bakry 36e216ddda
Merge pull request #413 from expsa/bakry_edit
fix
2024-07-29 11:57:48 +03:00
Bakry 22391d8a53 fix 2024-07-29 11:07:31 +03:00
شركة خبير المحدودة c41d6de16e Update github action file 2024-07-28 15:17:19 +03:00
شركة خبير المحدودة 942e3dd448 Update github action file 2024-07-28 15:17:00 +03:00
شركة خبير المحدودة 1f580a1f8f Update github action file 2024-07-28 15:16:40 +03:00
AbuzarExp 9b319a2341
Merge pull request #345 from expsa/preprod_odex25_hr
Preprod odex25 hr
2024-07-21 15:46:19 +03:00
bakry 60d6d7ca6d
Merge pull request #344 from expsa/dev_odex25_hr
Dev odex25 hr
2024-07-21 15:27:04 +03:00
bakry 893b6bf10e
Merge pull request #343 from expsa/bakry_edit
Bakry edit
2024-07-21 15:15:04 +03:00
Bakry fcd69c6888 fix 2024-07-21 14:59:32 +03:00
Bakry 509bf02555 fix 2024-07-21 14:45:29 +03:00
Bakry 05a232caa8 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_edit
# Conflicts:
#	odex25_hr/employee_requests/views/hr_personal_permission.xml
2024-07-21 14:14:16 +03:00
Bakry ab964b31d7 fix 2024-07-21 14:11:56 +03:00
bakry cc261b0982
Merge pull request #329 from expsa/preprod_odex25_hr
Preprod odex25 hr
2024-07-21 11:51:57 +03:00
bakry ba1165cbea
Merge pull request #326 from expsa/dev_odex25_hr
Dev odex25 hr
2024-07-21 10:47:43 +03:00
bakry 34bb79bc89
Merge pull request #325 from expsa/bakry_edit
fix trans
2024-07-21 10:43:02 +03:00
Bakry 154eed0b1d fix trans 2024-07-21 10:41:48 +03:00
AbuzarExp 40dbfc426d
Merge pull request #323 from expsa/preprod_odex25_hr
Preprod odex25 hr
2024-07-21 09:13:45 +03:00
AbuzarExp 37886283e1
Merge pull request #295 from expsa/dev_odex25_hr
fix bug
2024-07-20 14:54:31 +03:00
AbuzarExp 5cbc46a211
Merge pull request #294 from expsa/abuzar_fix_hr
fix bug
2024-07-20 14:53:51 +03:00
Elyageen add21cd942 fix bug 2024-07-20 14:52:27 +03:00
AbuzarExp bbbb6a09b8
Merge pull request #288 from expsa/dev_odex25_hr
fix bug
2024-07-20 13:45:54 +03:00
AbuzarExp 949a97ee56
Merge pull request #287 from expsa/abuzar_fix_hr
fix bug
2024-07-20 13:44:27 +03:00
Elyageen 24b0dd0dce fix bug 2024-07-20 12:54:15 +03:00
AbuzarExp ee757b10d9
Merge pull request #286 from expsa/preprod_odex25_hr
Preprod odex25 hr
2024-07-19 18:27:49 +03:00
bakry 8f7b380770
Merge pull request #285 from expsa/dev_odex25_hr
Dev odex25 hr
2024-07-19 18:07:00 +03:00
bakry da63d6cac1
Merge pull request #284 from expsa/bakry_edit
fix
2024-07-19 18:05:52 +03:00
Bakry 5ebc52ab1e fix 2024-07-19 18:04:18 +03:00
AbuzarExp 9179775d80
Merge pull request #282 from expsa/dev_odex25_hr
add task permation and fix holiday
2024-07-18 18:16:04 +03:00
AbuzarExp 7c93206e0e
Merge pull request #281 from expsa/abuzar_task_hr
add task permation and fix holiday
2024-07-18 18:15:24 +03:00
odex a90acb0a7a add task permation and fix holiday 2024-07-18 18:14:23 +03:00
AbuzarExp 27f95ccfff
Merge pull request #280 from expsa/dev_odex25_hr
add task permation and fix holiday
2024-07-18 18:11:10 +03:00
AbuzarExp 4bfcabd148
Merge pull request #279 from expsa/abuzar_task_hr
add task permation and fix holiday
2024-07-18 18:10:23 +03:00
odex 4fd15ea5f5 add task permation and fix holiday 2024-07-18 18:08:47 +03:00
AbuzarExp bd945f5050
Merge pull request #274 from expsa/preprod_odex25_hr
Preprod odex25 hr
2024-07-18 16:44:21 +03:00
AbuzarExp 1c0dcbda7b
Merge pull request #273 from expsa/dev_odex25_hr
Dev odex25 hr
2024-07-18 16:39:33 +03:00
bakry 71dd454fb7
Merge pull request #272 from expsa/bakry_edit
Bakry edit
2024-07-18 16:38:49 +03:00
Bakry 3f3e167028 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_edit
# Conflicts:
#	odex25_hr/employee_requests/views/hr_personal_permission.xml
2024-07-18 16:37:29 +03:00
Bakry bed3d96bed fix 2024-07-18 16:34:49 +03:00
AbuzarExp 1f1a618ce0
Merge pull request #271 from expsa/dev_odex25_hr
fix attendance
2024-07-18 16:30:48 +03:00
AbuzarExp f7770af315
Merge pull request #270 from expsa/abuzar_task_hr
add task permation and fix holiday
2024-07-18 16:29:47 +03:00
odex cb654769c7 add task permation and fix holiday 2024-07-18 16:28:41 +03:00
bakry c75bb26e15
Merge pull request #266 from expsa/bakry_edit
Bakry edit
2024-07-18 15:18:51 +03:00
Bakry 4852a9806d fix sort 2024-07-18 15:09:22 +03:00
Bakry e1fa684406 fix Approval For The Direct Manager Only 2024-07-18 15:04:07 +03:00