Commit Graph

2505 Commits

Author SHA1 Message Date
kchyounes19 71d998322e
Merge pull request #4653 from expsa/ky_dev_odex25_hr
Update payroll workflow
2025-09-15 12:24:32 +01:00
younes 2a0f5b8e3c Update payroll workflow 2025-09-15 12:23:13 +01:00
kchyounes19 1c4def482f
Merge pull request #4649 from expsa/kchyounes_dev_odex25_hr
Update payroll workflow
2025-09-15 11:26:47 +01:00
younes 29428b07e6 Update payroll workflow 2025-09-15 11:25:02 +01:00
شركة خبير المحدودة bd13e958c4 Update github action file 2025-09-14 10:45:10 +03:00
kchyounes19 384fcd1f91
Merge pull request #4632 from expsa/younes_dev_odex25_hr
Update payroll workflow
2025-09-11 15:53:35 +01:00
younes 0f76c02aad Update payroll workflow 2025-09-11 15:52:26 +01:00
Bakry 67583cd8a3 fix loan 2025-09-09 16:46:04 +03:00
bakry 7ccd341e76
Merge pull request #4616 from expsa/bakry_hr
fix noupdate="1"
2025-09-09 15:31:34 +03:00
Bakry f5d20fe9e3 fix noupdate="1" 2025-09-09 15:30:33 +03:00
abdurrahman-saber aa54234751
Merge pull request #4585 from expsa/fix_indentation_error
Fix indentation error
2025-09-07 16:07:31 +03:00
Abdurrahman Saber 7086a8feb7 [FIX] exp_official_mission: indentation error 2025-09-07 16:06:32 +03:00
kchyounes19 35ead8b006
Merge pull request #4555 from expsa/dev_odex25_hr
Dev odex25 hr
2025-09-03 14:56:59 +01:00
kchyounes19 fc4e6e2466
Merge pull request #4554 from expsa/ykchy_dev_odex25_hr
Ykchy dev odex25 hr
2025-09-03 14:54:05 +01:00
younes bc13bd2335 ADD hr_attendance_excel_report module 2025-09-03 14:52:51 +01:00
younes 2f43fdf27e ADD hr_attendance_excel_report module 2025-09-03 14:37:44 +01:00
bakry d86b96d0a6
Merge pull request #4551 from expsa/bakry_hr
fix
2025-09-03 15:55:48 +03:00
Bakry ced9cc456e fix 2025-09-03 15:13:43 +03:00
bakry 07ffd41bf0
Merge pull request #4532 from expsa/bakry_hr
fix balance take with year balance and refuse
2025-09-02 16:40:14 +03:00
Bakry 0ea7c85462 fix balance take with year balance and refuse 2025-09-02 16:39:05 +03:00
bakry 4cfb79c65d
Merge pull request #4525 from expsa/bakry_hr
Bakry hr
2025-09-02 14:54:47 +03:00
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