Commit Graph

2293 Commits

Author SHA1 Message Date
kchyounes19 33f6fe4ad8
Merge pull request #4166 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-10 13:04:14 +01:00
kchyounes19 4e36f45cf0
Merge pull request #4162 from expsa/younes_dev_odex25_hr
Younes dev odex25 hr
2025-08-07 13:07:40 +01:00
younes 05694dc473 Payroll Notes 2025-08-07 13:06:40 +01:00
younes e2cef96cf6 Payroll Notes 2025-08-07 13:04:47 +01:00
kchyounes19 4b938c5372
Merge pull request #4161 from expsa/younes_dev_odex25_hr
Fix bug
2025-08-07 12:30:26 +01:00
younes c70e2e05e2 Fix bug 2025-08-07 12:29:23 +01:00
mazenmuhamad eb56b8605e
Merge pull request #4153 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-07 10:08:59 +03:00
mazenmuhamad dae114b999
Merge pull request #4152 from expsa/Jaz-3621
fix Cannot Create Employee from users
2025-08-07 10:02:04 +03:00
Mazen Abdo 139630ab7c fix Cannot Create Employee from users 2025-08-07 10:01:16 +03:00
kchyounes19 16c870a3bb
Merge pull request #4147 from expsa/younes_dev_odex25_hr
Fix bug
2025-08-06 15:24:33 +01:00
younes a3f4926a44 Fix bug 2025-08-06 15:23:07 +01:00
Bakry e164f8be85 fix 2025-08-06 15:34:43 +03:00
kchyounes19 1c3d29852b
Merge pull request #4143 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-06 11:23:10 +01:00
kchyounes19 3f1ea07275
Merge pull request #4142 from expsa/younes_dev_odex25_hr
FIX bug
2025-08-06 11:21:55 +01:00
younes fcc619568a FIX bug 2025-08-06 11:18:06 +01:00
SamirLADOUI-sa 38f5b5604f
Merge pull request #4121 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-04 14:35:22 +01:00
SamirLADOUI-sa d8455bbdcf
Merge pull request #4120 from expsa/samir-aladawi-fix-hr-modules
[FIX] attendances
2025-08-04 14:33:14 +01:00
Samir Ladoui 5993413a0f [FIX] attendances 2025-08-04 14:32:19 +01:00
SamirLADOUI-sa a1f8550c2f
Merge pull request #4107 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-04 10:48:27 +01:00
SamirLADOUI-sa 3a0e373cfc
Merge pull request #4106 from expsa/samir-aladawi-fix-hr-modules
[UPD] attendances
2025-08-04 10:48:01 +01:00
Samir Ladoui c486f1ab19 [FIX] attendances: translation 2025-08-04 10:47:18 +01:00
Samir Ladoui 3b05568d3c [UPD] attendances 2025-08-04 10:45:40 +01:00
SamirLADOUI-sa 242d177915
Merge pull request #4093 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-04 09:08:58 +01:00
SamirLADOUI-sa 60a9fa56ad
Merge pull request #4092 from expsa/samir-aladawi-fix-hr-modules
[FIX] exp_official_mission
2025-08-04 09:08:35 +01:00
Samir Ladoui 8897a601e8 [FIX] exp_official_mission 2025-08-04 09:06:57 +01:00
SamirLADOUI-sa 7de1ea5cd0
Merge pull request #4091 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-04 08:13:40 +01:00
SamirLADOUI-sa ea306da5fa
Merge pull request #4090 from expsa/samir-aladawi-fix-hr-modules
[FIX] hr_holidays_public
2025-08-04 08:13:12 +01:00
Samir Ladoui 7fae61bbad [FIX] hr_holidays_public 2025-08-04 08:12:43 +01:00
bakry 49f9850112
Merge pull request #4077 from expsa/bakry_hr
add employee type
2025-07-31 16:49:17 +03:00
Bakry 83c263e8b8 add employee type 2025-07-31 16:38:12 +03:00
bakry 698dfd18d5
Merge pull request #4076 from expsa/bakry_hr
Bakry hr
2025-07-31 15:38:46 +03:00
Bakry a5dfc769bd add employee type 2025-07-31 15:35:04 +03:00
kchyounes19 c267e5754e
Merge pull request #4075 from expsa/dev_odex25_hr
Dev odex25 hr
2025-07-31 10:07:41 +01:00
kchyounes19 6b0ea49f1d
Merge pull request #4074 from expsa/younes_dev_odex25_hr
Updated menu structure
2025-07-31 10:06:58 +01:00
younes ee4e08f258 Updated menu structure 2025-07-31 10:05:36 +01:00
SamirLADOUI-sa fd7cc71661
Merge pull request #4056 from expsa/dev_odex25_hr
Dev odex25 hr
2025-07-30 11:03:07 +01:00
SamirLADOUI-sa e72b64e511
Merge pull request #4055 from expsa/samir-aladawi-improve-leave-reports
[UPD] hr_holidays_public
2025-07-30 11:02:17 +01:00
Samir Ladoui 6dac0b064c [UPD] hr_holidays_public 2025-07-30 11:00:36 +01:00
bakry e045c0ed1c
Merge pull request #4044 from expsa/bakry_hr
fix like Effective Form with contrat
2025-07-29 14:06:42 +03:00
Bakry cc233000ae Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr 2025-07-29 14:01:24 +03:00
Bakry 62a28bd9cc fix like Effective Form with contrat 2025-07-29 13:17:11 +03:00
SamirLADOUI-sa a7f5b6af94
Merge pull request #4025 from expsa/dev_odex25_hr
Dev odex25 hr
2025-07-27 09:24:29 +01:00
SamirLADOUI-sa ab3ce444ad
Merge pull request #4024 from expsa/samir-aladawi-sequence-employee
[UPD] hr_base
2025-07-27 09:24:04 +01:00
Samir Ladoui a3378e19a9 [UPD] hr_base 2025-07-27 09:23:24 +01:00
SamirLADOUI-sa d0eec99f56
Merge pull request #4015 from expsa/dev_odex25_hr
Dev odex25 hr
2025-07-24 09:59:45 +01:00
SamirLADOUI-sa 4d51a19a62
Merge pull request #4014 from expsa/samir-aladawi-improves-hr-reports
[FIX] hr_holidays_public
2025-07-24 09:59:23 +01:00
Samir Ladoui e8c02293a5 [FIX] hr_holidays_public 2025-07-24 09:58:37 +01:00
SamirLADOUI-sa 09b42e7bbe
Merge pull request #4013 from expsa/dev_odex25_hr
Dev odex25 hr
2025-07-24 01:17:24 +01:00
SamirLADOUI-sa 07c1f08b2d
Merge pull request #4012 from expsa/samir-aladawi-improves-hr-reports
Samir aladawi improves hr reports
2025-07-24 01:16:41 +01:00
Samir Ladoui ad82eaa838 [UPD] hr_holidays_public 2025-07-24 01:15:51 +01:00