Commit Graph

1062 Commits

Author SHA1 Message Date
younes 2ec0c082b5 update pyslip logic 2025-04-27 14:31:34 +01:00
Esraa-Exp 63dcfeae1f
Merge pull request #2901 from expsa/Esraa-Ensan-hr-tasks
comment
2025-04-27 09:02:34 +02:00
Esraa-Exp 6c6f0c1cad comment 2025-04-27 08:59:26 +02:00
Esraa-Exp 6f9a0b6b7d
Merge pull request #2900 from expsa/Esraa-Ensan-hr-tasks
user login
2025-04-27 08:49:16 +02:00
Esraa-Exp 40fb7208e5 user login 2025-04-27 08:47:46 +02:00
Esraa-Exp bae731da2d
Merge pull request #2899 from expsa/Esraa-Ensan-hr-tasks
comment
2025-04-25 17:24:31 +02:00
Esraa-Exp 05e8688a5c comment 2025-04-25 17:23:40 +02:00
Esraa-Exp 8b82bd4804
Merge pull request #2898 from expsa/Esraa-Ensan-hr-tasks
comment
2025-04-25 17:16:47 +02:00
Esraa-Exp fb0710d4f4 comment 2025-04-25 17:15:43 +02:00
Esraa-Exp bb427de7d6
Merge pull request #2897 from expsa/Esraa-Ensan-hr-tasks
comment login
2025-04-25 17:05:23 +02:00
Esraa-Exp 38427bb65f comment login 2025-04-25 17:04:30 +02:00
Esraa-Exp bcbddb2393
Merge pull request #2896 from expsa/Esraa-Ensan-hr-tasks
login-label
2025-04-25 09:40:45 +02:00
Esraa-Exp 8e8a03e58e login-label 2025-04-25 09:39:15 +02:00
Esraa-Exp 528b39ac56
Merge pull request #2895 from expsa/Esraa-Ensan-hr-tasks
comment login-label
2025-04-25 09:34:53 +02:00
Esraa-Exp 8f7e4e0c81 comment login-label 2025-04-25 09:32:40 +02:00
Esraa-Exp 99b54eb067
Merge pull request #2894 from expsa/Esraa-Ensan-hr-tasks
attendance report + login by identity edits
2025-04-24 22:51:18 +02:00
Esraa-Exp 9572ea4313 attendance report + login by identity edits 2025-04-24 22:48:20 +02:00
Esraa-Exp 3ac77ffab8
Merge pull request #2892 from expsa/Esraa-Ensan-hr-tasks
comment
2025-04-24 20:05:25 +02:00
Esraa-Exp b40be89585 comment 2025-04-24 19:57:38 +02:00
Esraa-Exp 22ba05f058
Merge pull request #2891 from expsa/Esraa-Ensan-hr-tasks
hr transaltion
2025-04-24 19:45:24 +02:00
Esraa-Exp 845082a2ec hr transaltion 2025-04-24 18:57:03 +02:00
Esraa-Exp 394a3a1ed3
Merge pull request #2890 from expsa/Esraa-Ensan-hr-tasks
hr edits
2025-04-24 18:10:38 +02:00
Esraa-Exp fc9dcc4cdf hr edits 2025-04-24 18:04:08 +02:00
Esraa-Exp a87df024e5
Merge pull request #2888 from expsa/Esraa-Ensan-hr-tasks
payslips edits
2025-04-24 15:08:32 +02:00
Esraa-Exp 01b97f3d84 payslips edits 2025-04-24 15:07:34 +02:00
Esraa-Exp b926cc8dd7
Merge pull request #2883 from expsa/Esraa-Ensan-hr-tasks
payslips edits
2025-04-24 14:15:40 +02:00
Esraa-Exp b60e54304b payslips edits 2025-04-24 14:14:57 +02:00
bakry 1e9c63a84c
Merge pull request #2882 from expsa/bakry_hr3
fix mission constrain
2025-04-24 13:39:38 +03:00
Bakry 72341be9a2 fix mission constrain 2025-04-24 13:38:13 +03:00
Esraa-Exp d9dcff46bd
Merge pull request #2870 from expsa/Esraa-Ensan-hr-tasks
fix
2025-04-23 17:25:35 +02:00
Esraa-Exp e87715e5b5 fix 2025-04-23 17:24:20 +02:00
Esraa-Exp 65092d8c6d
Merge pull request #2869 from expsa/Esraa-Ensan-hr-tasks
login by identity + attendance zone +  date required
2025-04-23 17:05:41 +02:00
Esraa-Exp e8c12d7635 login by identity + attendance zone + date required 2025-04-23 17:04:43 +02:00
Esraa-Exp ff75113586
Merge pull request #2861 from expsa/Esraa-Ensan-hr-tasks
department in attendance report + create_uid in holiday
2025-04-23 15:30:34 +02:00
Esraa-Exp 923c4293a2 department in attendance report + create_uid in holiday 2025-04-23 15:29:04 +02:00
Esraa-Exp 8bcb9e143a
Merge pull request #2860 from expsa/Esraa-Ensan-hr-tasks
department in attendance report + create_uid in holiday
2025-04-23 15:10:45 +02:00
Esraa-Exp 9ad2d896b5 department in attendance report + create_uid in holiday 2025-04-23 15:04:50 +02:00
Esraa-Exp 00f4e06043
Merge pull request #2858 from expsa/Esraa-Ensan-hr-tasks
div by zero
2025-04-23 13:12:36 +02:00
Esraa-Exp 074395ea8f div by zero 2025-04-23 13:11:06 +02:00
Esraa-Exp 1e074a2e41
Merge pull request #2854 from expsa/Esraa-Ensan-hr-tasks
nomination edits
2025-04-23 12:18:12 +02:00
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