Ali Ammar
|
dd54c2c859
|
Merge branch 'dev_odex25_takaful' of https://github.com/expsa/odex25-standard-modules into esterdad_bugs
Conflicts:
odex25_takaful/odex_takaful/wizards/account_payment_register.py
|
2025-12-14 09:55:23 +03:00 |
|
Ali Ammar
|
2aa28c876a
|
[FIX] Solve bugs
|
2025-12-14 09:52:42 +03:00 |
kchyounes19
|
c189ae222e
|
Merge pull request #5703 from expsa/fix_extend_process
[FIX] cancel extantion without payment
|
2025-12-11 11:16:29 +01:00 |
Nossibaelhadi
|
737a3e79be
|
[FIX] cancel extantion without payment
|
2025-12-11 13:05:58 +03:00 |
|
kchyounes19
|
58de5702a0
|
Merge pull request #5657 from expsa/fix_restrict
Fix restrict
|
2025-12-08 15:40:50 +01:00 |
|
Nossibaelhadi
|
830a34ec3d
|
Merge branch 'dev_odex25_takaful' of https://github.com/expsa/odex25-standard-modules into fix_restrict
|
2025-12-08 17:31:34 +03:00 |
|
Nossibaelhadi
|
ca9d955231
|
[FIX] member restrict
|
2025-12-08 17:30:43 +03:00 |
|
kchyounes19
|
d0ff249e94
|
Merge pull request #5655 from expsa/fix_sopnsorship_confirm
Fix sopnsorship confirm
|
2025-12-08 11:44:42 +01:00 |
|
Nossibaelhadi
|
ca7c9bd5c0
|
Merge branch 'dev_odex25_takaful' of https://github.com/expsa/odex25-standard-modules into fix_sopnsorship_confirm
|
2025-12-08 13:33:04 +03:00 |
|
Nossibaelhadi
|
c713d88a17
|
[FIX] sponsorship confirm
|
2025-12-08 13:32:11 +03:00 |
|
kchyounes19
|
e35e1c6244
|
Merge pull request #5654 from expsa/update_donation_line
Update donation line
|
2025-12-08 10:23:17 +01:00 |
|
Nossibaelhadi
|
78338ec0f1
|
Merge branch 'dev_odex25_takaful' of https://github.com/expsa/odex25-standard-modules into update_donation_line
# Conflicts:
# odex25_takaful/odex_takaful/models/donation_details_lines.py
# odex25_takaful/odex_takaful/views/donations_details_lines.xml
|
2025-12-08 12:10:06 +03:00 |
|
Nossibaelhadi
|
fa325d3f46
|
[FIX] donation line column
|
2025-12-08 12:03:52 +03:00 |
|
kchyounes19
|
2b63e1eacd
|
Merge pull request #5648 from expsa/esterdad_task_2
Esterdad task 2
|
2025-12-07 10:22:02 +01:00 |
|
Ali Ammar
|
19df111830
|
[FIX] ESTERDAD views
|
2025-12-07 12:17:03 +03:00 |
|
Ali Ammar
|
d75573a9c5
|
Merge branch 'dev_odex25_takaful' of https://github.com/expsa/odex25-standard-modules into esterdad_task
|
2025-12-07 11:27:52 +03:00 |
|
Ali Ammar
|
fa9f3e2562
|
[ADD] Edit the cron job
|
2025-12-07 11:27:25 +03:00 |
|
kchyounes19
|
f2c2b66ef3
|
Merge pull request #5639 from expsa/esterdad_task
Esterdad task
|
2025-12-04 12:47:15 +01:00 |
|
Ali Ammar
|
6287c459f1
|
[ADD] Esterdad task and refund logic
|
2025-12-04 14:32:53 +03:00 |
|
Ali Ammar
|
c95b988617
|
[ADD] Esterdad task and refund logic
|
2025-12-04 14:28:08 +03:00 |
|
kchyounes19
|
28a3aee701
|
Merge pull request #5584 from expsa/search_res_partner
[FIX] search res partner by phone
|
2025-12-02 12:22:15 +01:00 |
|
Nossibaelhadi
|
7c6194ba94
|
[FIX] search res partner by phone
|
2025-12-02 14:07:56 +03:00 |
|
kchyounes19
|
2caf9282ec
|
Merge pull request #5551 from expsa/extend_donation_payment
Extend donation payment
|
2025-11-27 16:18:58 +01:00 |
|
Nossibaelhadi
|
819c4df9ba
|
Merge branch 'dev_odex25_takaful' of https://github.com/expsa/odex25-standard-modules into extend_donation_payment
|
2025-11-27 17:24:16 +03:00 |
|
Nossibaelhadi
|
192952e8cf
|
[FIX] extend donation with payment
|
2025-11-27 17:22:54 +03:00 |
|
kchyounes19
|
ca5d985802
|
Merge pull request #5548 from expsa/takaful_settings
Takaful settings
|
2025-11-26 17:05:32 +01:00 |
|
Ali Ammar
|
ecbf0de5ee
|
Merge branch 'dev_odex25_takaful' of https://github.com/expsa/odex25-standard-modules into takaful_settings
|
2025-11-26 18:57:23 +03:00 |
|
Ali Ammar
|
21d39a87d0
|
Settings Fields
|
2025-11-26 18:56:33 +03:00 |
شركة خبير المحدودة
|
8e71dab562
|
Update github action file
|
2025-11-26 15:32:28 +02:00 |
|
Ali Ammar
|
2b372cf824
|
Merge branch 'dev_odex25_takaful' of https://github.com/expsa/odex25-standard-modules into dev_odex25_takaful
|
2025-11-26 16:28:19 +03:00 |
|
Ali Ammar
|
a9381e4bf6
|
Test
|
2025-11-26 15:56:51 +03:00 |
|
شركة خبير المحدودة
|
38c843164e
|
Update github action file
|
2025-11-26 14:19:23 +02:00 |
|
شركة خبير المحدودة
|
3375a76919
|
Update github action file
|
2025-11-26 14:18:40 +02:00 |
|
Nossibaelhadi
|
26ada1bddc
|
[FIX] test payment
|
2025-11-26 14:23:58 +03:00 |
|
Nossibaelhadi
|
8a2b0c4bd2
|
[FIX] partial payment in extend process
|
2025-11-26 14:08:19 +03:00 |
|
kchyounes19
|
fa171291eb
|
Merge pull request #5531 from expsa/kch_dev_odex25_tak
[ADD] odex25_takaful: ADD new branch
|
2025-11-25 12:46:56 +01:00 |
|
younes
|
abf10caf31
|
[ADD] odex25_takaful: ADD new branch
|
2025-11-25 12:44:51 +01:00 |
|
kchyounes19
|
0b433f11cb
|
Merge pull request #5526 from expsa/you_dev_odex25_takaful
[ADD] odex25_takaful: ADD new branch
|
2025-11-25 12:20:56 +01:00 |
|
younes
|
54feeb3607
|
[ADD] odex25_takaful: ADD new branch
|
2025-11-25 12:19:33 +01:00 |
|
kchyounes19
|
8d01912064
|
Merge pull request #5521 from expsa/revert-tak
revert branch
|
2025-11-25 10:33:23 +01:00 |
|
younes
|
b352646157
|
revert branch
|
2025-11-25 10:31:48 +01:00 |
|
شركة خبير المحدودة
|
4bd3f2fb63
|
Update github action file
|
2025-11-25 09:43:55 +02:00 |
|
kchyounes19
|
e719062e8e
|
Merge pull request #5507 from expsa/you_dev_odex25_takaful
[ADD] odex25_takaful: Add new branch
|
2025-11-25 08:39:42 +01:00 |
|
شركة خبير المحدودة
|
e4c5e4805c
|
Update github action file
|
2025-11-25 09:38:52 +02:00 |
|
شركة خبير المحدودة
|
b7369da005
|
Update github action file
|
2025-11-25 09:36:37 +02:00 |
|
شركة خبير المحدودة
|
8b5440409f
|
Update github action file
|
2025-11-25 09:36:01 +02:00 |
|
شركة خبير المحدودة
|
6cec84fdcc
|
Update github action file
|
2025-11-25 09:24:58 +02:00 |
|
شركة خبير المحدودة
|
6f7b3788f3
|
Update prevent-invalid-branch-merges.yml
|
2025-11-25 09:18:36 +02:00 |
|
شركة خبير المحدودة
|
762c03f654
|
Update github action file
|
2025-11-25 09:16:55 +02:00 |
|
شركة خبير المحدودة
|
38e3859feb
|
Update github action file
|
2025-11-25 09:12:22 +02:00 |