Samir Ladoui
|
d7bb819495
|
[UPD] odex_benefit: sequence should be unique for mother, replacement, family member
|
2025-02-13 11:47:36 +01:00 |
Esraa-Exp
|
40a050cce5
|
Merge pull request #2375 from expsa/Esraa-odex25-ensan-tasks
bank account Info Notes in Benefit
|
2025-02-12 16:18:31 +02:00 |
|
Esraa-Exp
|
345b48f50e
|
bank account Info Notes in Benefit
|
2025-02-12 16:17:09 +02:00 |
SamirLADOUI-sa
|
67cbc9a190
|
Merge pull request #2352 from expsa/samir-aladawi-add-education-status
[UPD] odex_benefit: user can insert multiple educations status now
|
2025-02-11 14:11:16 +01:00 |
|
Samir Ladoui
|
3c8eb3ff5c
|
[UPD] odex_benefit: user can insert multiple educations status now
|
2025-02-11 14:05:40 +01:00 |
enagahh
|
3af518c4e2
|
Merge pull request #2327 from expsa/revert-2324-benefit_education_status
Revert "Education status"
|
2025-02-06 15:50:29 +02:00 |
|
enagahh
|
a5bc2a9870
|
Revert "Education status"
|
2025-02-06 15:50:15 +02:00 |
|
enagahh
|
bf42a8ae43
|
Merge pull request #2324 from expsa/benefit_education_status
Education status
|
2025-02-06 05:11:14 +02:00 |
eman
|
12b0add5ed
|
Education status
|
2025-02-06 05:10:29 +02:00 |
|
SamirLADOUI-sa
|
3b3fe0b605
|
Merge pull request #2312 from expsa/samir-aladawi-improve-benefit-module
[FIX] odex_takaful: takaful system manager could choose any branch
|
2025-02-04 15:05:44 +01:00 |
|
Samir Ladoui
|
f4eb254f46
|
[FIX] odex_takaful: takaful system manager could choose any branch
|
2025-02-04 15:04:20 +01:00 |
|
SamirLADOUI-sa
|
31e3c8a447
|
Merge pull request #2308 from expsa/samir-aladawi-improve-benefit-module
[FIX] odex_benefit: exclude father dead certification attachment requ…
|
2025-02-04 13:58:04 +01:00 |
|
Samir Ladoui
|
f65092ea06
|
[FIX] odex_benefit: exclude father dead certification attachment requirement if creation comes from portal && birth date shouldn't be in future && fix disctrict and city doesn't save
|
2025-02-04 13:57:28 +01:00 |
|
SamirLADOUI-sa
|
d5ef4ce660
|
Merge pull request #2295 from expsa/samir-aladawi-fix-return-takaful
[FIX] odex_takaful: refund feature
|
2025-02-03 09:24:15 +01:00 |
|
Samir Ladoui
|
1e839dde34
|
[FIX] odex_takaful: refund feature
|
2025-02-03 09:22:17 +01:00 |
Tahir Hassan
|
6c3c5824fc
|
Merge pull request #2290 from expsa/dev_ensan_ahidev
refactor (login,signup): apply some changes to improve the code
|
2025-01-30 16:46:52 +04:00 |
AHIDev
|
1e756c85d5
|
refactor (login,signup): apply some changes to improve the code
|
2025-01-30 16:45:16 +04:00 |
|
SamirLADOUI-sa
|
68fd7c75f9
|
Merge pull request #2288 from expsa/samir-aladawi-improve-benefit-module
[UPD] odex_benefit: add cron for expiry salary attachment & add const…
|
2025-01-30 12:51:24 +01:00 |
|
Samir Ladoui
|
63b3052680
|
[UPD] odex_benefit: add cron for expiry salary attachment & add constrains for dates
|
2025-01-30 12:50:49 +01:00 |
|
SamirLADOUI-sa
|
b096862af1
|
Merge pull request #2286 from expsa/samir-aladawi-improve-benefit-module
[FIX] odex_takaful: show replacement mother only when the mother isn'…
|
2025-01-30 09:50:07 +01:00 |
|
Samir Ladoui
|
bb128b65ab
|
[FIX] odex_takaful: show replacement mother only when the mother isn't benefit
|
2025-01-30 09:49:44 +01:00 |
|
enagahh
|
30ad9587ec
|
Merge pull request #2284 from expsa/takaful_29_1
Sponsor with benefit
|
2025-01-29 18:40:07 +02:00 |
|
eman
|
7d7215eb39
|
Sponsor with benefit
|
2025-01-29 18:39:09 +02:00 |
|
enagahh
|
562ba13240
|
Merge pull request #2282 from expsa/fix_issues_28_1
Sponsor with benefit
|
2025-01-29 17:32:58 +02:00 |
|
eman
|
2aafbae4e7
|
Sponsor with benefit
|
2025-01-29 17:32:16 +02:00 |
|
SamirLADOUI-sa
|
b0b4d27f42
|
Merge pull request #2280 from expsa/samir-aladawi-takaful-improvements2
[UPD] odex_takaful: add sponsor name in tree view
|
2025-01-29 15:51:00 +01:00 |
|
Samir Ladoui
|
93ed7b8626
|
[UPD] odex_takaful: add sponsor name in tree view
|
2025-01-29 15:50:30 +01:00 |
|
SamirLADOUI-sa
|
5e1cd48cc6
|
Merge pull request #2278 from expsa/samir-aladawi-takaful-improvements2
[FIX] odex_takaful: access rights and add analytic account in payment…
|
2025-01-29 15:05:29 +01:00 |
|
Samir Ladoui
|
6f77a461d6
|
[FIX] odex_takaful: access rights and add analytic account in payment when there no sponsor
|
2025-01-29 15:04:58 +01:00 |
|
SamirLADOUI-sa
|
0e3f891478
|
Merge pull request #2276 from expsa/samir-aladawi-takaful-improvements2
[FIX] odex_takaful: access rights and add restriction to not confirm …
|
2025-01-29 14:09:52 +01:00 |
|
Samir Ladoui
|
42ab33884d
|
[FIX] odex_takaful: access rights and add restriction to not confirm when donations is empty
|
2025-01-29 14:09:13 +01:00 |
|
enagahh
|
af1832e554
|
Merge pull request #2274 from expsa/fix_issues_28_1
REfund
|
2025-01-29 15:00:19 +02:00 |
|
eman
|
6b360f8285
|
REfund
|
2025-01-29 14:59:27 +02:00 |
|
SamirLADOUI-sa
|
8ed787aebb
|
Merge pull request #2272 from expsa/samir-aladawi-improve-benefit-module
[FIX] odex_benefit: styling grant benefit views
|
2025-01-29 13:02:28 +01:00 |
|
Samir Ladoui
|
f8135e868b
|
[FIX] odex_benefit: styling grant benefit views
|
2025-01-29 13:01:56 +01:00 |
|
SamirLADOUI-sa
|
f0e78ff9b6
|
Merge pull request #2270 from expsa/samir-aladawi-takaful-improvements2
[FIX] odex_takaful: access rights and restrictions on tajaful.sponsor…
|
2025-01-29 11:59:38 +01:00 |
|
Samir Ladoui
|
4af87f4dac
|
[FIX] odex_takaful: access rights and restrictions on tajaful.sponsorship
|
2025-01-29 11:59:06 +01:00 |
|
SamirLADOUI-sa
|
e5adc3aafb
|
Merge pull request #2268 from expsa/samir-aladawi-takaful-improvements2
[FIX] odex_takaful: access rights
|
2025-01-29 11:28:56 +01:00 |
|
Samir Ladoui
|
85801cb432
|
[FIX] odex_takaful: access rights
|
2025-01-29 11:28:24 +01:00 |
|
SamirLADOUI-sa
|
ad3ec25771
|
Merge pull request #2266 from expsa/samir-aladawi-improve-benefit-module
[UPD] odex_benefit: add restrictions on some fields to be visible or not
|
2025-01-29 10:45:13 +01:00 |
|
Samir Ladoui
|
fd39912ac3
|
[UPD] odex_benefit: add restrictions on some fields to be visible or not
|
2025-01-29 10:44:41 +01:00 |
|
SamirLADOUI-sa
|
1818cbc032
|
Merge pull request #2264 from expsa/samir-aladawi-takaful-improvements2
[UPD] odex_benefit: add fields and edit design
|
2025-01-29 10:26:57 +01:00 |
|
Samir Ladoui
|
2bddac8c37
|
[UPD] odex_benefit: add fields and edit design
|
2025-01-29 10:26:24 +01:00 |
|
enagahh
|
f2fa3f98fc
|
Merge pull request #2262 from expsa/fix_issues_28_1
REfund
|
2025-01-29 10:25:11 +02:00 |
|
eman
|
49db4f5106
|
REfund
|
2025-01-29 10:24:11 +02:00 |
|
SamirLADOUI-sa
|
5fac90f076
|
Merge pull request #2260 from expsa/samir-aladawi-takaful-improvements2
[UPD] odex_takaful: remove bank informations from sponsor views
|
2025-01-28 15:38:50 +01:00 |
|
Samir Ladoui
|
dff40b6c3a
|
[UPD] odex_takaful: remove bank informations from sponsor views
|
2025-01-28 15:38:21 +01:00 |
|
SamirLADOUI-sa
|
c3ac684837
|
Merge pull request #2258 from expsa/samir-aladawi-takaful-improvements2
[UPD] odex_takaful: update groups and rules
|
2025-01-28 15:26:13 +01:00 |
|
Samir Ladoui
|
bd586436e7
|
[UPD] odex_takaful: update groups and rules
|
2025-01-28 15:25:34 +01:00 |
|
enagahh
|
d32714b671
|
Merge pull request #2256 from expsa/fix_issues_28_1
REfund
|
2025-01-28 14:45:06 +02:00 |