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 |
|
Mazen Abdo
|
1729e51206
|
fix
|
2025-08-24 14:28:18 +03:00 |
|
Mazen Abdo
|
b54cd33a13
|
fix
|
2025-08-24 14:02:33 +03:00 |
|
Mazen Abdo
|
2da6b1ff8e
|
fix
|
2025-08-24 13:57:25 +03:00 |
|
Mazen Abdo
|
77bf081f17
|
fix
|
2025-08-24 13:37:30 +03:00 |
|
Mazen Abdo
|
7d92fe3ea8
|
fix
|
2025-08-24 13:35:21 +03:00 |
|
Mazen Abdo
|
350474daaf
|
fix
|
2025-08-24 13:32:22 +03:00 |
|
Mazen Abdo
|
ffffa29edd
|
fix
|
2025-08-24 13:28:36 +03:00 |
|
Mazen Abdo
|
91a9faf2fd
|
fix
|
2025-08-24 12:49:01 +03:00 |
|
Mazen Abdo
|
d2e2c74e68
|
fix
|
2025-08-24 12:42:55 +03:00 |
|
Mazen Abdo
|
a95ec2205d
|
fix
|
2025-08-24 12:38:11 +03:00 |
|
Mazen Abdo
|
1acae09813
|
fix
|
2025-08-24 12:22:22 +03:00 |
|
Mazen Abdo
|
531ef4e180
|
fix
|
2025-08-24 12:16:39 +03:00 |
|
Mazen Abdo
|
75a2837a12
|
fix
|
2025-08-24 11:57:04 +03:00 |
|
Mazen Abdo
|
c30ff7831e
|
fix
|
2025-08-24 11:53:29 +03:00 |
|
Mazen Abdo
|
1a60dc2fbd
|
fix
|
2025-08-24 11:47:25 +03:00 |
|
Mazen Abdo
|
33f2d68c1e
|
fix
|
2025-08-24 11:40:28 +03:00 |
|
Mazen Abdo
|
d4d1f268dc
|
fix
|
2025-08-24 11:37:22 +03:00 |
|
Mazen Abdo
|
6d4ef56de5
|
fix
|
2025-08-24 11:21:12 +03:00 |
|
younes
|
6e4d557ed7
|
Fix bug
|
2025-08-21 08:19:33 +01:00 |
|
younes
|
63443a14d2
|
Fix bug
|
2025-08-21 08:08:50 +01:00 |
|
younes
|
db6915cb7d
|
Fix bug
|
2025-08-20 16:02:31 +01:00 |
|
younes
|
b502bd8bc0
|
Fix bug
|
2025-08-20 14:38:10 +01:00 |
|
younes
|
cda392d5a0
|
Fix bug
|
2025-08-20 13:58:39 +01:00 |
|
younes
|
2824e94097
|
IMP reasons lateness
|
2025-08-20 10:49:41 +01:00 |
|
younes
|
9783abc8c5
|
IMP reasons lateness
|
2025-08-19 16:00:22 +01:00 |
ahmed-nouri051
|
9cd950bf88
|
Merge pull request #4250 from expsa/ahmed-odex-hr
fixing
|
2025-08-18 17:33:58 +02:00 |
|
ahmed-nouri051
|
69ca55a03a
|
fixing
|
2025-08-18 17:30:07 +02:00 |
|
kchyounes19
|
d1fd10c776
|
Merge pull request #4169 from expsa/younes_dev_odex25_hr
Fix bug
|
2025-08-10 15:29:20 +01:00 |
|
younes
|
2791d87e86
|
Fix bug
|
2025-08-10 15:21:06 +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 |
|
Mazen Abdo
|
139630ab7c
|
fix Cannot Create Employee from users
|
2025-08-07 10:01:16 +03:00 |
|
younes
|
a3f4926a44
|
Fix bug
|
2025-08-06 15:23:07 +01:00 |
|
Bakry
|
e164f8be85
|
fix
|
2025-08-06 15:34:43 +03:00 |
|
younes
|
fcc619568a
|
FIX bug
|
2025-08-06 11:18:06 +01:00 |
|
Samir Ladoui
|
5993413a0f
|
[FIX] attendances
|
2025-08-04 14:32:19 +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 |
|
Samir Ladoui
|
8897a601e8
|
[FIX] exp_official_mission
|
2025-08-04 09:06:57 +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 |
|
younes
|
ee4e08f258
|
Updated menu structure
|
2025-07-31 10:05:36 +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 |
|
Samir Ladoui
|
a3378e19a9
|
[UPD] hr_base
|
2025-07-27 09:23:24 +01:00 |
|
Samir Ladoui
|
e8c02293a5
|
[FIX] hr_holidays_public
|
2025-07-24 09:58:37 +01:00 |
|
Samir Ladoui
|
ad82eaa838
|
[UPD] hr_holidays_public
|
2025-07-24 01:15:51 +01:00 |
|
Samir Ladoui
|
84cff45c65
|
[FIX] hr_holidays_community
|
2025-07-24 01:15:32 +01:00 |
|
Samir Ladoui
|
4aa5391a6b
|
[FIX] hr_base
|
2025-07-24 01:14:54 +01:00 |
|
Samir Ladoui
|
b87d3cb933
|
[FIX] hr_base_reports
|
2025-07-23 15:59:49 +01:00 |
|
Samir Ladoui
|
a86570a175
|
[UPD] hr_holidays_public
|
2025-07-23 15:53:46 +01:00 |
|
Samir Ladoui
|
f8bfc11d42
|
[UPD] hr_holidays_community
|
2025-07-23 15:53:05 +01:00 |
|
Samir Ladoui
|
0492a80270
|
[UPD] hr_base
|
2025-07-23 15:52:33 +01:00 |
|
Samir Ladoui
|
9f203995db
|
[FIX] hr_base_reports
|
2025-07-23 15:08:12 +01:00 |
|
Samir Ladoui
|
32633353d8
|
[FIX] hr_base_reports
|
2025-07-23 14:32:47 +01:00 |
|
Samir Ladoui
|
49d8dc64cf
|
[UPD] hr_base_reports
|
2025-07-23 13:45:57 +01:00 |
|
Samir Ladoui
|
6e11bd77ec
|
[FIX] employee_requests
|
2025-07-23 08:57:24 +01:00 |
|
Samir Ladoui
|
01725b321b
|
[FIX] hr_loans_salary_advance
|
2025-07-22 11:11:46 +01:00 |
|
Samir Ladoui
|
c7abaa35d3
|
[FIX] employee_requests
|
2025-07-22 11:11:29 +01:00 |
eslamtalaat744
|
c3a083a2c7
|
Merge pull request #3961 from expsa/loan_security
loan type menu groups
|
2025-07-20 11:03:13 +03:00 |
blackbelts
|
ceefd63371
|
loan type menu groups
|
2025-07-20 09:59:26 +03:00 |
|
Mazen Abdo
|
3697455a09
|
fix report report_employee_identify
|
2025-07-17 16:06:54 +03:00 |
|
Mazen Abdo
|
923d71a25b
|
fix report report_employee_identify
|
2025-07-17 12:23:55 +03:00 |
|
Mazen Abdo
|
00394b3768
|
fix report report_employee_identify
|
2025-07-17 10:33:50 +03:00 |
|
Mazen Abdo
|
dab911c02d
|
fix report report_employee_identify
|
2025-07-17 10:32:41 +03:00 |
|
bakry
|
cb81125e5f
|
Merge pull request #3934 from expsa/bakry_hr
fix Gosi calculation
|
2025-07-16 12:20:08 +03:00 |
|
Bakry
|
5b17bc2a29
|
fix Gosi calculation
|
2025-07-16 12:18:40 +03:00 |
|
kchyounes19
|
f730368062
|
Merge pull request #3917 from expsa/ky_dev_odex25_hr
restrict check-in outside allowed working hours
|
2025-07-15 11:45:18 +01:00 |
|
younes
|
1691056468
|
restrict check-in outside allowed working hours
|
2025-07-15 11:44:21 +01:00 |
|
Bakry
|
ee01c1f141
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr
|
2025-07-15 11:15:02 +03:00 |
|
Bakry
|
e34e8b06a1
|
fix report Termination
|
2025-07-15 11:00:12 +03:00 |
|
mohammed-alkhazrji
|
4c97837d5b
|
fix install
|
2025-07-14 16:15:42 +03:00 |
|
kchyounes19
|
8c844bb44c
|
Merge pull request #3892 from expsa/ky_dev_odex25_hr
restrict check-in outside allowed working hours
|
2025-07-14 07:52:19 +01:00 |
|
younes
|
291815c1b1
|
restrict check-in outside allowed working hours
|
2025-07-14 07:50:36 +01:00 |
|
kchyounes19
|
7d10b06476
|
Merge pull request #3888 from expsa/ky_dev_odex25_hr
restrict check-in outside allowed working hours
|
2025-07-13 15:08:58 +01:00 |
|
younes
|
a1a3f24382
|
restrict check-in outside allowed working hours
|
2025-07-13 15:06:38 +01:00 |
|
kchyounes19
|
f152841d07
|
Merge pull request #3881 from expsa/ky_dev_odex25_hr
Ky dev odex25 hr
|
2025-07-13 14:32:37 +01:00 |
|
younes
|
20eb2d292d
|
restrict check-in outside allowed working hours
|
2025-07-13 14:30:46 +01:00 |
|
younes
|
c5063c3b98
|
restrict check-in outside allowed working hours
|
2025-07-13 14:29:35 +01:00 |
|
ahmed-nouri051
|
259e36e139
|
Merge pull request #3834 from expsa/ahmed-odex-hr
fix it date field
|
2025-07-09 15:26:28 +02:00 |
|
ahmed-nouri051
|
5c45e6efcd
|
fix it date field
|
2025-07-09 15:21:21 +02:00 |
|
Bakry
|
7b2d5c18e0
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr
|
2025-07-09 13:10:27 +03:00 |
|
Bakry
|
9385e6af32
|
fix device_id bug
|
2025-07-09 13:03:41 +03:00 |
|
eslamtalaat744
|
4299ed1d43
|
Merge pull request #3830 from expsa/modify_loan_groups
change groups sequrity on loan
|
2025-07-09 12:20:27 +03:00 |
|
blackbelts
|
1448ecbba4
|
change groups sequrity on loan
|
2025-07-09 10:50:45 +03:00 |
|
mohammed-alkhazrji
|
9c81cefb26
|
calc right missing
|
2025-07-08 20:35:23 +03:00 |
|
mohammed-alkhazrji
|
39fe6f67f6
|
calc right missing
|
2025-07-08 20:31:24 +03:00 |
|
blackbelts
|
41f7be68bd
|
modify on contract view
|
2025-07-08 10:41:03 +03:00 |
|
blackbelts
|
5c27143711
|
fix get_speacial_day_timing error
|
2025-07-08 10:24:21 +03:00 |
|
bakry
|
ef34a3713d
|
Merge pull request #3789 from expsa/bakry_hr
Bakry hr
|
2025-07-07 14:28:09 +03:00 |
|
Bakry
|
f31bdc45ab
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr
|
2025-07-07 14:27:15 +03:00 |
|
Bakry
|
dbbc957166
|
fix new Attendance calculation
|
2025-07-07 14:24:47 +03:00 |