Commit Graph

2484 Commits

Author SHA1 Message Date
Bakry d73e991e0b fix 2025-09-02 14:54:21 +03:00
Bakry 00c8630189 fix balance take with year balance and refuse 2025-09-02 14:52:13 +03:00
SamirLADOUI-sa ad0cff9dbd
Merge pull request #4506 from expsa/dev_odex25_hr
Dev odex25 hr
2025-09-01 16:27:27 +01:00
SamirLADOUI-sa df0ffab3f0
Merge pull request #4505 from expsa/samir-aladawi-fix-insurance-payslip-computation
[FIX] exp_payroll_custom
2025-09-01 16:27:06 +01:00
Samir Ladoui d780e591b3 [FIX] exp_payroll_custom 2025-09-01 16:26:25 +01:00
SamirLADOUI-sa 5ecd7318ea
Merge pull request #4503 from expsa/dev_odex25_hr
Dev odex25 hr
2025-09-01 16:19:29 +01:00
SamirLADOUI-sa d763f4301b
Merge pull request #4502 from expsa/samir-aladawi-fix-insurance-payslip-computation
[FIX] exp_payroll_custom
2025-09-01 16:19:08 +01:00
Samir Ladoui f8bfa70ace [FIX] exp_payroll_custom 2025-09-01 16:18:34 +01:00
SamirLADOUI-sa c83c1417ab
Merge pull request #4500 from expsa/dev_odex25_hr
Dev odex25 hr
2025-09-01 14:59:55 +01:00
SamirLADOUI-sa 6d7fe43405
Merge pull request #4499 from expsa/samir-aladawi-fix-insurance-payslip-computation
[FIX] exp_payroll_custom
2025-09-01 14:59:20 +01:00
Samir Ladoui 2d223b670f [FIX] exp_payroll_custom 2025-09-01 14:58:40 +01:00
mazenmuhamad ac7b37225c
Merge pull request #4497 from expsa/dev_odex25_hr
Dev odex25 hr
2025-09-01 16:55:05 +03:00
mazenmuhamad 67e3711ead
Merge pull request #4496 from expsa/maz_base_emp
fix
2025-09-01 16:50:24 +03:00
Mazen Abdo 8ffa23bc25 fix 2025-09-01 16:48:52 +03:00
kchyounes19 44690c58ce
Merge pull request #4487 from expsa/dev_odex25_hr
Dev odex25 hr
2025-09-01 08:43:06 +01:00
kchyounes19 9d5314aeaf
Merge pull request #4486 from expsa/kch_dev_odex25_hr
FIX bug
2025-09-01 08:42:09 +01:00
younes c59917735d FIX bug 2025-09-01 08:41:05 +01:00
Bakry 4b1398b71c Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr 2025-08-31 10:28:20 +03:00
mohammed-alkhazrji 124fb63a45
Merge pull request #4362 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-27 23:35:00 +03:00
mohammed-alkhazrji 0cd55af071
Merge pull request #4361 from expsa/dynamic_ip_finger
make it dynamic ip finger
2025-08-27 23:31:31 +03:00
mohammed-alkhazrji e244ebac49 make it dynamic ip finger 2025-08-27 23:27:03 +03:00
mohammed-alkhazrji b7ea3ea232
Merge pull request #4324 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-25 11:33:37 +03:00
mohammed-alkhazrji 7cbf73be31
Merge pull request #4323 from expsa/fix-depends-attendence
fix 45284
2025-08-25 11:26:38 +03:00
mohammed-alkhazrji 2d3f51d7ba fix 45284 2025-08-25 11:25:48 +03:00
SamirLADOUI-sa a5705b2a5b
Merge pull request #4322 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-25 09:00:08 +01:00
SamirLADOUI-sa 5a8929a3d2
Merge pull request #4321 from expsa/samir-aladawi-fix-compute-method-hr-leave-status
[FIX] hr_holidays_community
2025-08-25 08:59:08 +01:00
Samir Ladoui 5799c5fd6e [FIX] hr_holidays_community 2025-08-25 08:58:32 +01:00
SamirLADOUI-sa 596ece8e40
Merge pull request #4320 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-25 08:54:20 +01:00
SamirLADOUI-sa 090a353948
Merge pull request #4319 from expsa/samir-aladawi-fix-compute-method-hr-leave-status
[FIX] hr_holidays_community
2025-08-25 08:53:27 +01:00
SamirLADOUI-sa f1bf3e3726
Merge branch 'dev_odex25_hr' into samir-aladawi-fix-compute-method-hr-leave-status 2025-08-25 08:53:16 +01:00
Samir Ladoui b773691e55 [FIX] hr_holidays_community 2025-08-25 08:51:23 +01:00
kchyounes19 c6a5b6e9d8
Merge pull request #4318 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-25 08:41:51 +01:00
kchyounes19 ed7a9d732b
Merge pull request #4317 from expsa/younes_dev_odex25_hr
Fix bug
2025-08-25 08:41:17 +01:00
younes 7ab957ff51 Fix bug 2025-08-25 08:40:23 +01:00
mazenmuhamad be15cf9640
Merge pull request #4314 from expsa/dev_odex25_hr
Dev odex25 hr
2025-08-24 16:41:13 +03:00
SamirLADOUI-sa ba7dcb1ac7
Merge pull request #4313 from expsa/samir-aladawi-fix-compute-method-hr-leave-status
[FIX] hr_holidays_community
2025-08-24 14:30:57 +01:00
Samir Ladoui 51edee675c [FIX] hr_holidays_community 2025-08-24 14:30:24 +01:00
kchyounes19 1169f90575
Merge pull request #4312 from expsa/younes_dev_odex25_hr
Fix bug
2025-08-24 14:05:51 +01:00
younes c14feae4d3 Fix bug 2025-08-24 14:04:06 +01:00
younes 252146ba2e Fix bug 2025-08-24 14:01:48 +01:00
younes 785f1f6680 Fix bug 2025-08-24 13:58:44 +01:00
mazenmuhamad 5eaada3d74
Merge pull request #4311 from expsa/maz_ba_ox
fix
2025-08-24 14:31:30 +03:00
Mazen Abdo 1729e51206 fix 2025-08-24 14:28:18 +03:00
mazenmuhamad ac84b279a2
Merge pull request #4310 from expsa/maz_ba_ox
fix
2025-08-24 14:03:39 +03:00
Mazen Abdo b54cd33a13 fix 2025-08-24 14:02:33 +03:00
mazenmuhamad adbfcada54
Merge pull request #4309 from expsa/maz_ba_ox
fix
2025-08-24 13:58:47 +03:00
Mazen Abdo 2da6b1ff8e fix 2025-08-24 13:57:25 +03:00
mazenmuhamad 93fa965e14
Merge pull request #4308 from expsa/maz_ba_ox
fix
2025-08-24 13:39:04 +03:00
Mazen Abdo 77bf081f17 fix 2025-08-24 13:37:30 +03:00
mazenmuhamad 1fda0648c0
Merge pull request #4307 from expsa/maz_ba_ox
fix
2025-08-24 13:36:41 +03:00