Commit Graph

812 Commits

Author SHA1 Message Date
kchyounes19 d20b2f1d2e
Merge pull request #5825 from expsa/esterdad_bugs
Esterdad bugs
2025-12-25 12:35:56 +01:00
Ali Ammar 8e73714636 Merge branch 'dev_odex25_takaful' of https://github.com/expsa/odex25-standard-modules into esterdad_bugs 2025-12-25 14:32:38 +03:00
Ali Ammar 93775b8870 [FIX]Solve issues and bugs with refund tamded 2025-12-25 14:32:11 +03:00
kchyounes19 e672707a6e
Merge pull request #5821 from expsa/esterdad_bugs
Esterdad bugs
2025-12-25 10:56:42 +01:00
Ali Ammar cd09d2073c Merge branch 'dev_odex25_takaful' of https://github.com/expsa/odex25-standard-modules into esterdad_bugs 2025-12-25 12:51:13 +03:00
Ali Ammar 9f8ff77310 [FIX]Solve issues and bugs with refund tamded 2025-12-25 12:50:42 +03:00
kchyounes19 c3049319c3
Merge pull request #5814 from expsa/fix_test_note
[FIX] notes on partner bank payment
2025-12-24 19:18:22 +01:00
Nossibaelhadi 2b67fb842a [FIX] notes on partner bank payment 2025-12-24 21:02:22 +03:00
kchyounes19 44330e10fa
Merge pull request #5808 from expsa/fix_test_note
[FIX] replacment benefit action
2025-12-24 09:55:06 +01:00
Nossibaelhadi ffa930c8d1 [FIX] replacment benefit action 2025-12-24 11:46:38 +03:00
kchyounes19 32c6ab16e8
Merge pull request #5792 from expsa/fix_test_note
[FIX] replacment action
2025-12-23 10:18:12 +01:00
Nossibaelhadi f88c7a394b [FIX] replacment action 2025-12-23 11:56:39 +03:00
kchyounes19 d276d68ba0
Merge pull request #5785 from expsa/esterdad_bugs
Esterdad bugs
2025-12-22 09:01:45 +01:00
Ali Ammar 20f6ad7f8b Merge branch 'dev_odex25_takaful' of https://github.com/expsa/odex25-standard-modules into esterdad_bugs
 Conflicts:
	odex25_takaful/odex_takaful/models/donation_details_lines.py
2025-12-22 10:26:10 +03:00
Ali Ammar 4d1c9f4dd1 [FIX]Solve issues and bugs with refund tamded 2025-12-22 10:22:42 +03:00
kchyounes19 decc2a07df
Merge pull request #5767 from expsa/fix_test_note
Fix test note
2025-12-18 14:22:50 +01:00
Nossibaelhadi 2f69348376 Merge branch 'dev_odex25_takaful' of https://github.com/expsa/odex25-standard-modules into fix_test_note 2025-12-18 16:18:05 +03:00
Nossibaelhadi 2449e4155f [FIX] Notes from Test 2025-12-18 16:17:29 +03:00
kchyounes19 4e9c5c177e
Merge pull request #5763 from expsa/fix_test_notes
[FIX] Test Notes
2025-12-18 12:47:00 +01:00
Nossibaelhadi 3a7dff8a7e [FIX] Test Notes 2025-12-18 14:42:21 +03:00
kchyounes19 dcaf10daf9
Merge pull request #5742 from expsa/fix_customer_notes
[FIX] customer notes
2025-12-16 13:02:32 +01:00
Nossibaelhadi 2aec2b3e7e [FIX] customer notes 2025-12-16 14:58:03 +03:00
kchyounes19 1ba0fd76e7
Merge pull request #5714 from expsa/esterdad_bugs
Esterdad bugs
2025-12-14 07:58:37 +01:00
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