Esraa-Exp
|
74a735d3f4
|
new module hr_training_payment
|
2025-02-09 10:32:50 +02:00 |
|
Esraa-Exp
|
c5927bef3d
|
Revert "new module hr_training_payment + training module notes"
This reverts commit 3f9b54384a.
|
2025-02-09 10:11:38 +02:00 |
|
Esraa-Exp
|
3f9b54384a
|
new module hr_training_payment + training module notes
|
2025-02-09 10:04:43 +02:00 |
|
Esraa-Exp
|
daa9122131
|
exp_official_mission edits on training
|
2025-02-06 15:34:31 +02:00 |
bakry
|
19228b6100
|
Merge pull request #2231 from expsa/bakry_hr3
fix alternative days holiday
|
2025-01-27 12:38:12 +03:00 |
Bakry
|
13471b6400
|
fix alternative days holiday
|
2025-01-27 12:37:38 +03:00 |
Manar416
|
bec24d7c0c
|
Merge pull request #2214 from expsa/manar_dev_hr_26_1
UPDATE hr_holidays_public
|
2025-01-25 23:53:28 +02:00 |
manar
|
660d621ca6
|
UPDATE hr_holidays_public
|
2025-01-25 23:52:07 +02:00 |
|
Manar416
|
0f0a4f5a6f
|
Merge pull request #2211 from expsa/manar_dev_hr_23_1
UPDATE exp_payroll_custom & exp_hr_payroll
|
2025-01-23 15:49:44 +02:00 |
|
manar
|
719ddd6b19
|
UPDATE exp_payroll_custom & exp_hr_payroll
|
2025-01-23 15:48:33 +02:00 |
|
bakry
|
89b36dc358
|
Merge pull request #2185 from expsa/bakry_hr3
Bakry hr3
|
2025-01-22 12:44:02 +03:00 |
|
Bakry
|
7d6f9f4fe2
|
fix payroll round , 2
|
2025-01-22 11:15:00 +03:00 |
|
Manar416
|
0e0c199717
|
Merge pull request #2180 from expsa/manar_dev_hr_21_1
UPDATE hr_holidays_public
|
2025-01-21 14:35:47 +02:00 |
|
manar
|
6027957c6b
|
UPDATE hr_holidays_public
|
2025-01-21 14:35:00 +02:00 |
|
Bakry
|
e79e68fc99
|
fix payroll
|
2025-01-21 15:00:21 +03:00 |
|
Manar416
|
85c8a51efe
|
Merge pull request #2170 from expsa/manar_dev_hr_21_1
UPDATE exp_payroll_custom
|
2025-01-21 11:36:56 +02:00 |
|
manar
|
535828cdf6
|
UPDATE exp_payroll_custom
|
2025-01-21 11:36:13 +02:00 |
|
Manar416
|
a2aea7248d
|
Merge pull request #2159 from expsa/manar_dev_hr_20_1
UPDATE hr_holidays_public
|
2025-01-20 13:35:39 +02:00 |
|
manar
|
10f4c2977e
|
UPDATE hr_holidays_public
|
2025-01-20 13:31:01 +02:00 |
|
Manar416
|
889f0d9321
|
Merge pull request #2157 from expsa/manar_dev_hr_20_1
UPDATE exp_payroll_custom
|
2025-01-20 10:58:26 +02:00 |
|
manar
|
54ff050032
|
UPDATE exp_payroll_custom
|
2025-01-20 10:55:55 +02:00 |
|
bakry
|
d4dbd6cbbd
|
Merge pull request #2152 from expsa/bakry_hr3
edit attendance more one in day
|
2025-01-20 11:22:27 +03:00 |
|
Bakry
|
c4306943a3
|
edit attendance more one in day
|
2025-01-20 11:21:01 +03:00 |
|
Manar416
|
ecad23f38d
|
Merge pull request #2148 from expsa/manar_dev_hr_19_1
UPDATE exp_payroll_custom
|
2025-01-19 16:46:15 +02:00 |
|
manar
|
5fc7d673f9
|
UPDATE exp_payroll_custom
|
2025-01-19 16:43:12 +02:00 |
|
bakry
|
29040f3aa9
|
Merge pull request #2147 from expsa/bakry_hr3
Bakry hr3
|
2025-01-19 17:10:36 +03:00 |
|
Bakry
|
e84ea5d131
|
fix payroll transfer per analytic account
|
2025-01-19 17:09:31 +03:00 |
|
Bakry
|
ee20161a84
|
fix payroll transfer per analytic account
|
2025-01-19 17:05:40 +03:00 |
|
Bakry
|
561e20fa0d
|
fix mission
|
2025-01-19 16:52:19 +03:00 |
|
bakry
|
0b97a255dd
|
Merge pull request #2146 from expsa/bakry_hr3
fix
|
2025-01-16 15:03:00 +03:00 |
|
Bakry
|
8efb6dccba
|
fix
|
2025-01-16 14:52:32 +03:00 |
|
bakry
|
15d03a3256
|
Merge pull request #2138 from expsa/bakry_hr3
Bakry hr3
|
2025-01-15 16:20:36 +03:00 |
|
Bakry
|
cfb174802a
|
Merge branch 'dev_odex25_hr' of https://github.com/expsa/odex25-standard-modules into bakry_hr3
# Conflicts:
# odex25_hr/exp_payroll_custom/models/hr_advance_payslip.py
|
2025-01-15 16:20:04 +03:00 |
SamirLADOUI-sa
|
8e7cca7a7c
|
Merge pull request #2135 from expsa/samir-aladawi-fix-date-hr
[FIX] exp_payroll_custom: use date instead of datetime
|
2025-01-15 13:13:06 +01:00 |
Samir Ladoui
|
eb967b9eb4
|
[FIX] exp_payroll_custom: use date instead of datetime
|
2025-01-15 13:12:26 +01:00 |
|
Bakry
|
6ef03fb757
|
fix
|
2025-01-15 13:02:09 +03:00 |
|
Bakry
|
5c2eccbbb1
|
fix payroll str holiday percentage
|
2025-01-14 17:59:58 +03:00 |
|
bakry
|
35b346ab1d
|
Merge pull request #2132 from expsa/bakry_hr3
Bakry hr3
|
2025-01-14 17:19:02 +03:00 |
|
Bakry
|
4ce0455f31
|
fix payroll str holiday percentage
|
2025-01-14 17:18:08 +03:00 |
|
Bakry
|
a6ed1f3df5
|
fix
|
2025-01-14 16:58:59 +03:00 |
|
bakry
|
31fb9630c6
|
Merge pull request #2121 from expsa/bakry_hr3
fix
|
2025-01-13 14:25:43 +03:00 |
|
Bakry
|
4ec2409584
|
fix
|
2025-01-13 14:25:13 +03:00 |
|
bakry
|
69cb331b45
|
Merge pull request #2102 from expsa/bakry_hr3
Bakry hr3
|
2025-01-12 11:53:14 +03:00 |
|
Bakry
|
da94b6c667
|
fix
|
2025-01-12 11:52:02 +03:00 |
|
Bakry
|
1d1bcd7911
|
fix
|
2025-01-09 15:23:20 +03:00 |
|
bakry
|
9b16147447
|
Merge pull request #2084 from expsa/bakry_hr3
fix
|
2025-01-08 10:52:19 +03:00 |
|
Bakry
|
3b073b2a4f
|
fix
|
2025-01-08 10:51:28 +03:00 |
|
bakry
|
e992c04c4a
|
Merge pull request #2082 from expsa/bakry_hr3
Bakry hr3
|
2025-01-07 17:00:39 +03:00 |
|
Bakry
|
fbf2ddc7b6
|
fix
|
2025-01-07 16:08:57 +03:00 |
|
Bakry
|
fe7f50824b
|
fix
|
2025-01-07 15:26:35 +03:00 |