Commit Graph

1082 Commits

Author SHA1 Message Date
ahmed-nouri051 f3ec541ebe noupdate for hr 2025-05-11 10:05:10 +02:00
SamirLADOUI-sa 60453c3848
Merge pull request #3015 from expsa/samir-aladawi-fix-computes-hr-base
[FIX] hr_base
2025-05-07 12:10:39 +01:00
Samir Ladoui ef69eddccb [FIX] hr_base 2025-05-07 12:10:05 +01:00
SamirLADOUI-sa 43a63c23fb
Merge pull request #3002 from expsa/samir-aladawi-fix-additional-hours-attedances
[FIX] attendances
2025-05-06 12:33:01 +01:00
Samir Ladoui ea8c0b9bd7 [FIX] attendances 2025-05-06 12:32:23 +01:00
SamirLADOUI-sa cce702b96f
Merge pull request #2999 from expsa/samir-aladawi-fix-additional-hours-attedances
[FIX] attendances
2025-05-06 12:18:08 +01:00
Samir Ladoui 815ba32353 [FIX] attendances 2025-05-06 12:17:43 +01:00
bakry 4d8fb7da13
Merge pull request #2944 from expsa/bakry_hr3
fix remove field
2025-05-01 12:12:21 +03:00
Bakry fb2d1b5fca fix remove field 2025-05-01 12:11:03 +03:00
Mostafa Abdo f98de60ef0
Merge pull request #2942 from expsa/pla-451615-new-report-for-employee-totals
new report for employee attendance
2025-04-29 19:12:56 -07:00
Mostafa 0b0de1f3d9 new report for employee attendance 2025-04-29 19:10:09 -07:00
ahmed-nouri051 44f17a8f52
Merge pull request #2933 from expsa/fixing-error-attendance-report
fix attendence
2025-04-29 14:23:24 +02:00
ahmed-nouri051 4818f7e553 fix attendence 2025-04-29 14:20:14 +02:00
ahmed-nouri051 d0b3a585d3
Merge pull request #2924 from expsa/fixing-error-attendance-report
fixing prod error
2025-04-29 10:54:36 +02:00
ahmed-nouri051 e7a0853044 fixing prod error 2025-04-29 10:51:57 +02:00
SamirLADOUI-sa 90f56658d3
Merge pull request #2911 from expsa/samir-aladawi-fix-complete-registration-portal
[FIX] hr_holidays_public
2025-04-28 00:44:06 +01:00
Samir Ladoui fad9d12f44 [FIX] hr_holidays_public 2025-04-28 00:39:52 +01:00
kchyounes19 4a7e289ddb
Merge pull request #2904 from expsa/younes_dev_odex25_hr
update pyslip logic
2025-04-27 14:46:56 +01:00
younes 3db8da5b9a update pyslip logic 2025-04-27 14:46:00 +01:00
kchyounes19 ca7c75419c
Merge pull request #2903 from expsa/younes_dev_odex25_hr
update pyslip logic
2025-04-27 14:32:25 +01:00
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