Commit Graph

1142 Commits

Author SHA1 Message Date
kchyounes19 16e2cd9e88
Merge pull request #4744 from expsa/ky_dev_odex25_hr
Leave Balance Report Notes*
2025-09-25 08:03:59 +01:00
younes 33758553df Leave Balance Report Notes* 2025-09-25 08:01:57 +01:00
kchyounes19 032db372c6
Merge pull request #4742 from expsa/yk_dev_odex25_hr
Leave Balance Report Notes*
2025-09-24 15:52:33 +01:00
younes 60eab0a398 Leave Balance Report Notes* 2025-09-24 15:51:33 +01:00
bakry 5238889679
Merge pull request #4741 from expsa/bakry_hr
fix report payroll
2025-09-24 17:40:30 +03:00
Bakry b42942e613 fix report payroll 2025-09-24 17:39:46 +03:00
younes 759b30cbd6 Leave Balance Report Notes 2025-09-24 15:30:16 +01:00
younes d706c9a700 Payroll report notes 2025-09-24 12:58:32 +01:00
abdurrahman-saber e65ade6ac2
Revert "[IMP] hr_holidays_public: handle multi company configuration" 2025-09-22 15:56:20 +03:00
bakry 7e04b99088
Merge pull request #4722 from expsa/bakry_hr
Bakry hr
2025-09-21 11:33:00 +03:00
Bakry 748ca90a72 fix 2025-09-21 10:27:42 +03:00
Bakry 9cc92a0c56 fix payroll if duration 0 in month 31 days 2025-09-21 10:27:14 +03:00
Abdurrahman Saber 5b173949e6 [IMP] hr_holidays_public: handle multi company configuration 2025-09-20 01:42:17 +03:00
Abdurrahman Saber f8f1923a9f [IMP] hr_base, *: activate multi-company for various custom models 2025-09-17 05:02:24 +03:00
Samir Ladoui 95017c2504 [FIX] hr_base 2025-09-16 19:07:08 +01:00
SamirLADOUI-sa 1b21dec94c
Merge pull request #4684 from expsa/samir-aladawi-logging-user-login-value3
[UPD] hr_base
2025-09-16 11:09:38 +01:00
Samir Ladoui aca3b4bc39 [UPD] hr_base 2025-09-16 11:00:13 +01:00
younes b6a2175f61 Update payroll workflow 2025-09-15 12:51:50 +01:00
younes 2a0f5b8e3c Update payroll workflow 2025-09-15 12:23:13 +01:00
younes 29428b07e6 Update payroll workflow 2025-09-15 11:25:02 +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 7086a8feb7 [FIX] exp_official_mission: indentation error 2025-09-07 16:06:32 +03:00
younes 2f43fdf27e ADD hr_attendance_excel_report module 2025-09-03 14:37:44 +01:00
Bakry ced9cc456e fix 2025-09-03 15:13:43 +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 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 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 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
Mazen Abdo 8ffa23bc25 fix 2025-09-01 16:48:52 +03: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 e244ebac49 make it dynamic ip finger 2025-08-27 23:27:03 +03:00
mohammed-alkhazrji 2d3f51d7ba fix 45284 2025-08-25 11:25:48 +03:00
Samir Ladoui 5799c5fd6e [FIX] hr_holidays_community 2025-08-25 08:58:32 +01:00
Samir Ladoui b773691e55 [FIX] hr_holidays_community 2025-08-25 08:51:23 +01:00
younes 7ab957ff51 Fix bug 2025-08-25 08:40:23 +01:00
Samir Ladoui 51edee675c [FIX] hr_holidays_community 2025-08-24 14:30:24 +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