Commit Graph

966 Commits

Author SHA1 Message Date
Esraa-Exp 5c2461755a report paper format 2025-04-13 15:24:18 +02:00
Esraa-Exp a84228f2f3 training hours compute 2025-04-13 14:48:49 +02:00
Esraa-Exp b07cc412f5 training report 2025-04-13 13:48:18 +02:00
bakry d09d2b22e1
Merge pull request #2732 from expsa/bakry_hr3
fix
2025-04-10 15:23:03 +03:00
Bakry a4a7d95933 fix 2025-04-10 12:51:39 +03:00
شركة خبير المحدودة 99d414433e Update github action file 2025-04-09 06:07:54 +02:00
شركة خبير المحدودة 6bc9a6996c
Update dev-preprod-servers.yml 2025-04-08 11:56:04 +02:00
FathiaBMExp caa316bb50
Merge pull request #2721 from expsa/task_12230
fix(hr_termination): Task 12230
2025-04-07 09:23:23 +01:00
FathiaBMExp 50dd57e443 fix(hr_termination): Task 12230
Fix division by zero bug.

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-04-07 09:19:12 +01:00
شركة خبير المحدودة 27773370ba Update github action file 2025-04-06 15:49:49 +02:00
bakry 5bdb30ded7
Merge pull request #2720 from expsa/bakry_hr3
Bakry hr3
2025-04-06 13:39:27 +03:00
Bakry c6c5ad5535 fix domain 2025-04-06 13:38:37 +03:00
FathiaBMExp c039ee4c21
Merge pull request #2718 from expsa/task_12230
fix(hr_termination): Task 12230
2025-04-06 09:53:53 +01:00
FathiaBMExp fcc8db91da
fix(hr_termination): Task 12230
Correct invalid import
2025-04-06 09:52:37 +01:00
FathiaBMExp d708e889ff
Merge pull request #2716 from expsa/task_12230
fix(hr_termination): Task 12230
2025-03-28 15:01:54 +01:00
FathiaBMExp aea2a93b60 fix(hr_termination): Task 12230
Fix pdf report data.

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-03-28 14:56:45 +01:00
Bakry 70419c7661 fix 2025-03-25 14:34:13 +03:00
FathiaBMExp 8294d37cd8
Merge pull request #2691 from expsa/task_12338
fix(hr_administrative_circular): Task 12338
2025-03-17 12:19:42 +01:00
FathiaBMExp 876a838ed3 fix(hr_administrative_circular): Task 12338
Fix body and subject of the email "Administrative circulars and decisions publication e-mail.".

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-03-17 12:18:17 +01:00
bakry ee19e9f7ad
Merge pull request #2685 from expsa/bakry_hr3
fix
2025-03-17 12:57:41 +03:00
Bakry 0770065f20 fix 2025-03-17 12:56:55 +03:00
mazenmuhamad 3da285c8f8
Merge pull request #2677 from expsa/ZEN_hr_trmination
updata code
2025-03-16 16:10:34 +02:00
mazenmuhamad a31361348d updata code 2025-03-16 16:08:56 +02:00
mazenmuhamad 9af8b1dcf5
Merge pull request #2673 from expsa/ZEN_hr_trmination
updata project Ekraam
2025-03-16 16:06:09 +02:00
mazenmuhamad 0a9727c630 updata project Ekraam 2025-03-16 16:04:52 +02:00
شركة خبير المحدودة 4c7170168b Update github action file 2025-03-16 14:18:12 +03:00
mazenmuhamad c7ee401877
Merge pull request #2643 from expsa/zen_hr_termination
updata code
2025-03-13 12:21:08 +02:00
mazenmuhamad 46778d5105 updata code 2025-03-13 12:20:03 +02:00
mazenmuhamad 823931ed5c
Merge pull request #2642 from expsa/zen_hr_termination
fix code
2025-03-13 12:17:41 +02:00
mazenmuhamad 26eaba550c fix code 2025-03-13 12:16:56 +02:00
SamirLADOUI-sa 46ba3870d0
Merge pull request #2629 from expsa/samir-aladawi-fix-report-attendences
[FIX] hr_base_reports: attendances report take long time for excel
2025-03-12 13:35:25 +01:00
Samir Ladoui 9a2c53a8af [FIX] hr_base_reports: attendances report take long time for excel 2025-03-12 13:34:50 +01:00
mazenmuhamad fb2c5d7924
Merge pull request #2628 from expsa/zen_hr_termination
revert code
2025-03-12 14:11:02 +02:00
mazenmuhamad 32ec3ba09a revert code 2025-03-12 14:10:15 +02:00
mazenmuhamad 2f77ac7cf3
Merge pull request #2625 from expsa/zen_hr_termination
code
2025-03-12 13:45:10 +02:00
mazenmuhamad 15f78dfcfd code 2025-03-12 13:44:28 +02:00
mazenmuhamad 22f1acd332
Merge pull request #2624 from expsa/zen_hr_termination
zen updata code
2025-03-12 13:41:58 +02:00
mazenmuhamad e6b68e217a zen updata code 2025-03-12 13:41:25 +02:00
Esraa-Exp c503e54ab4
Merge pull request #2621 from expsa/Esraa-Ensan-hr-tasks
Employees widget
2025-03-11 15:29:03 +02:00
Esraa-Exp ef6d79c0a6 Employees widget 2025-03-11 15:27:53 +02:00
SamirLADOUI-sa 67af6bcaae
Merge pull request #2584 from expsa/samir-aladawi-fix-dvice-biometric
[FIX] attendances: check module existence before using field device_id
2025-03-05 12:44:32 +01:00
Samir Ladoui e49bdc715b [FIX] attendances: check module existence before using field device_id 2025-03-05 12:44:03 +01:00
SamirLADOUI-sa 41cf9c7a29
Merge pull request #2571 from expsa/samir-aladawi-fix-fleet-permissions
[FIX] employee_requests: vehicle.delegation permission
2025-03-04 13:59:23 +01:00
Samir Ladoui 65170c7e93 [FIX] employee_requests: vehicle.delegation permission 2025-03-04 13:58:58 +01:00
bakry 7974b95aaf
Merge pull request #2566 from expsa/bakry_hr3
fix termination cal
2025-03-04 15:17:46 +03:00
Bakry b359886ace fix termination cal 2025-03-04 15:16:25 +03:00
Esraa-Exp a04ece14cb
Merge pull request #2565 from expsa/Esraa-Ensan-hr-tasks
termination transfer by emp type
2025-03-04 11:27:59 +02:00
Esraa-Exp 87192ac07c termination transfer by emp type 2025-03-04 11:27:15 +02:00
Esraa-Exp 4b68329556
Merge pull request #2562 from expsa/Esraa-Ensan-hr-tasks
new notes
2025-03-04 08:56:23 +02:00
Esraa-Exp 55578d72f3 new notes 2025-03-04 08:54:42 +02:00