Commit Graph

1122 Commits

Author SHA1 Message Date
Esraa-Exp ae80f791a6 nomination edits 2025-04-23 12:13:34 +02:00
bakry 8a3695e2a2
Merge pull request #2834 from expsa/bakry_hr3
Bakry hr3
2025-04-22 13:51:51 +03:00
Bakry 148ac10844 fix overtime and mission constrain 2025-04-22 13:50:15 +03:00
FathiaBMExp 7ed10f07fb
Merge pull request #2831 from expsa/task_12230
Task 12230
2025-04-22 10:37:15 +01:00
FathiaBMExp d272f9130a chore(hr_termination): Task 12230
Rollback the leave_price field.

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-04-22 10:35:17 +01:00
FathiaBMExp 963f831b1d fix(hr_termination): Task 12230
Fix empty date bug in xls report .

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-04-22 10:33:50 +01:00
kchyounes19 0238f05756
Merge pull request #2830 from expsa/younes_dev_odex25_hr
Bank Salary Report: Al Rajhi Bank File – Column Reordering
2025-04-22 09:10:35 +01:00
younes 936f05a13b Bank Salary Report: Al Rajhi Bank File – Column Reordering 2025-04-22 09:08:31 +01:00
Bakry 328bb67cf8 fix holidays used for once 2025-04-21 12:45:38 +03:00
SamirLADOUI-sa e31adc56e8
Merge pull request #2803 from expsa/samir-aladawi-update-hr-rules-account-manager
[UPD] hr_base: remove group_account_manager from some rules in hr
2025-04-21 08:45:39 +01:00
Samir Ladoui c19f478029 [UPD] hr_base: remove group_account_manager from some rules in hr 2025-04-21 08:44:47 +01:00
bakry 8feea92bda
Merge pull request #2802 from expsa/bakry_hr3
Bakry hr3
2025-04-20 17:00:49 +03:00
Bakry 0096d3dc08 Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3 2025-04-20 16:56:09 +03:00
Bakry d576ed6eca fix solve Python uses "round half to even" by default in payroll field total 2025-04-20 16:55:42 +03:00
Bakry fd712bcbfd fix solve Python uses "round half to even" by default in payroll field total 2025-04-20 16:54:59 +03:00
Esraa-Exp e4a48e6554
Merge pull request #2801 from expsa/Esraa-Ensan-hr-tasks
readonly
2025-04-20 14:39:36 +02:00
Esraa-Exp 20d73640e4 readonly 2025-04-20 14:38:37 +02:00
Esraa-Exp 56263e9e8a
Merge pull request #2800 from expsa/Esraa-Ensan-hr-tasks
readonly
2025-04-20 14:30:37 +02:00
Esraa-Exp f6ee6a0f69 readonly 2025-04-20 14:29:36 +02:00
Esraa-Exp 12f5191aba
Merge pull request #2799 from expsa/Esraa-Ensan-hr-tasks
fix
2025-04-20 14:05:20 +02:00
Esraa-Exp af786733b0 fix 2025-04-20 14:03:06 +02:00
Esraa-Exp 548b608312
Merge pull request #2798 from expsa/Esraa-Ensan-hr-tasks
fix
2025-04-20 13:54:59 +02:00
Esraa-Exp 060356ad4a fix 2025-04-20 13:52:27 +02:00
Esraa-Exp ed11074ccd
Merge pull request #2796 from expsa/Esraa-Ensan-hr-tasks
Esraa ensan hr tasks
2025-04-20 13:29:59 +02:00
Esraa-Exp 48f2b6ccb5 hr nomination 2025-04-20 13:27:01 +02:00
Esraa-Exp 9b994d6dd1 hr nomination 2025-04-17 20:06:39 +02:00
bakry c84a998308
Merge pull request #2794 from expsa/bakry_hr3
fix
2025-04-17 17:13:18 +03:00
Bakry 04baa81cb8 fix 2025-04-17 17:06:05 +03:00
Esraa-Exp aa9c4c24f5
Merge pull request #2792 from expsa/Esraa-Ensan-hr-tasks
fix employee security issue
2025-04-17 14:27:34 +02:00
Esraa-Exp 2958246cd8 fix employee security issue 2025-04-17 14:26:32 +02:00
Esraa-Exp c8aeba2374
Merge pull request #2790 from expsa/Esraa-Ensan-hr-tasks
attchment page
2025-04-17 14:00:29 +02:00
Esraa-Exp ff9edd1dbd attchment page 2025-04-17 13:59:29 +02:00
Esraa-Exp 783a9a39e5
Merge pull request #2788 from expsa/Esraa-Ensan-hr-tasks
hide days+hours from report
2025-04-17 11:22:33 +02:00
Esraa-Exp 8e7ff312e5 hide days+hours from report 2025-04-17 11:21:29 +02:00
Esraa-Exp ef03a548a4
Merge pull request #2785 from expsa/Esraa-Ensan-hr-tasks
Esraa ensan hr tasks
2025-04-17 10:59:11 +02:00
Esraa-Exp 1c387f35c1 hide hr_nomination 2025-04-17 10:54:07 +02:00
Esraa-Exp 7fa336531a transaltion 2025-04-16 12:03:38 +02:00
Esraa-Exp 8b5bc25cd2
Merge pull request #2778 from expsa/Esraa-Ensan-hr-tasks
mission holiday check
2025-04-16 11:48:40 +02:00
Esraa-Exp 52982de214 mission holiday check 2025-04-16 11:47:17 +02:00
SamirLADOUI-sa 1fa6b47e43
Merge pull request #2773 from expsa/samir-aladawi-fix-appraisal-access
[FIX] exp_hr_appraisal
2025-04-16 08:21:40 +01:00
Samir Ladoui 433827c70d [FIX] exp_hr_appraisal 2025-04-16 08:21:17 +01:00
FathiaBMExp fc3e466e9f
Merge pull request #2766 from expsa/task_12230
fix(hr_termination): Task 12230
2025-04-14 16:58:56 +01:00
FathiaBMExp 2b11b64860 fix(hr_termination): Task 12230
Fix plus et minus five years amount.

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-04-14 16:58:11 +01:00
Esraa-Exp abe3a5d837
Merge pull request #2758 from expsa/Esraa-Ensan-hr-tasks
appraisal check
2025-04-14 12:39:36 +02:00
Esraa-Exp 060cd223d1 appraisal check 2025-04-14 12:37:48 +02:00
Esraa-Exp adfa311a66
Merge pull request #2757 from expsa/Esraa-Ensan-hr-tasks
employee appraisal
2025-04-14 11:38:40 +02:00
Esraa-Exp c30acdcaa7 employee appraisal 2025-04-14 11:37:54 +02:00
FathiaBMExp d5cce077fb
Merge pull request #2755 from expsa/task_12386
chore(odex25_hr): Task 12386
2025-04-14 09:45:12 +01:00
FathiaBMExp fce2fdf99f chore(odex25_hr): Task 12386
Absent report: Menu and days.

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-04-14 09:39:41 +01:00
Esraa-Exp 1d8c1f5e07
Merge pull request #2752 from expsa/Esraa-Ensan-hr-tasks
fix bug
2025-04-14 04:42:15 +02:00