From ff70fd1d35831041de3f438f76b8514ad5020945 Mon Sep 17 00:00:00 2001 From: Nossibaelhadi Date: Sat, 3 Jan 2026 18:18:36 +0300 Subject: [PATCH] [FIX] solve bugs from test3 --- .../data/takaful_notification_mail_template.xml | 4 ++-- odex25_takaful/odex_takaful/i18n/ar_001.po | 16 ++++++++++------ .../models/donation_details_lines.py | 10 +++++++--- .../models/takaful_sponorship_model.py | 6 ++++++ .../odex_takaful/views/takaful_menus_actions.xml | 4 ++-- .../views/takaful_sponorship_view.xml | 4 +++- odex25_takaful/odex_takaful/wizards/esterdad.py | 6 +++++- 7 files changed, 35 insertions(+), 15 deletions(-) diff --git a/odex25_takaful/odex_takaful/data/takaful_notification_mail_template.xml b/odex25_takaful/odex_takaful/data/takaful_notification_mail_template.xml index 6d593569d..96b835a6c 100644 --- a/odex25_takaful/odex_takaful/data/takaful_notification_mail_template.xml +++ b/odex25_takaful/odex_takaful/data/takaful_notification_mail_template.xml @@ -73,8 +73,8 @@

Dear ${ctx.get('partner_name')},

- -

+ +

${ctx.get('body')}

diff --git a/odex25_takaful/odex_takaful/i18n/ar_001.po b/odex25_takaful/odex_takaful/i18n/ar_001.po index c45694209..b25686607 100644 --- a/odex25_takaful/odex_takaful/i18n/ar_001.po +++ b/odex25_takaful/odex_takaful/i18n/ar_001.po @@ -1168,7 +1168,7 @@ msgstr "نوع الإلغاء" #: model:ir.model.fields.selection,name:odex_takaful.selection__takaful_sponsorship__state__canceled #: model_terms:ir.ui.view,arch_db:odex_takaful.takaful_sponsorship_view_search msgid "Canceled" -msgstr "ملغاة" +msgstr "مستردة" #. module: odex_takaful #: model_terms:ir.ui.view,arch_db:odex_takaful.kafalat_cancel_report_pdf @@ -1206,7 +1206,7 @@ msgstr "نوع الإلغاء" #. module: odex_takaful #: model:ir.model.fields.selection,name:odex_takaful.selection__sponsorship_cancellation__state__cancel msgid "Cancelled" -msgstr "ملغي" +msgstr "مستردة" #. module: odex_takaful #: model:ir.model.fields,field_description:odex_takaful.field_sponsorship_cancellation__cancel_user_id @@ -4369,9 +4369,6 @@ msgstr "متأخر في سداد الكفالة بنسبة إجمالية %s" #: model:ir.model.fields.selection,name:odex_takaful.selection__month_payment__state__paid #: model:ir.model.fields.selection,name:odex_takaful.selection__sponsorship_payment__state__paid #: model:ir.model.fields.selection,name:odex_takaful.selection__sponsorship_scheduling_line__status__paid -#: model:ir.model.fields.selection,name:odex_takaful.selection__sponsorship_states__name__paid -#: model:ir.model.fields.selection,name:odex_takaful.selection__takaful_sponsorship__state__paid -#: model_terms:ir.ui.view,arch_db:odex_takaful.takaful_sponsorship_view_search #: model_terms:ir.ui.view,arch_db:odex_takaful.view_sponsorship_scheduling_line_search #: model:ir.model.fields.selection,name:odex_takaful.selection__donations_details_lines__state__paid #, fuzzy @@ -7653,4 +7650,11 @@ msgstr "مساهمة مالية لصالح:" #: code:addons/odex_takaful/models/takaful_contribution_model.py:0 #, python-format msgid "Financial contribution by order %s" -msgstr "مساهمة مالية بالأمر %s" \ No newline at end of file +msgstr "مساهمة مالية بالأمر %s" + +#. module: odex_takaful +#: model:ir.model.fields.selection,name:odex_takaful.selection__sponsorship_states__name__paid +#: model:ir.model.fields.selection,name:odex_takaful.selection__takaful_sponsorship__state__paid +#: model_terms:ir.ui.view,arch_db:odex_takaful.takaful_sponsorship_view_search +msgid "Paid" +msgstr "تم الدفع" \ No newline at end of file diff --git a/odex25_takaful/odex_takaful/models/donation_details_lines.py b/odex25_takaful/odex_takaful/models/donation_details_lines.py index 616f7ac10..7d332f16d 100644 --- a/odex25_takaful/odex_takaful/models/donation_details_lines.py +++ b/odex25_takaful/odex_takaful/models/donation_details_lines.py @@ -165,7 +165,7 @@ class DonationsDetailsLines(models.Model): user.has_group('odex_takaful.branch_manager_group')) print('is_manager >>>> ' , is_manager) print('rec.create_uid >>>> ' , rec.create_uid) - rec.can_edit_benefit = (rec.create_uid == user or is_manager) + rec.can_edit_benefit = (rec.create_uid == user or is_manager) and rec.state == 'waiting' and not rec.benefit_id @api.depends('sponsorship_duration', 'payment_month_count', 'direct_debit') def _compute_age_category(self): for rec in self: @@ -317,7 +317,7 @@ class DonationsDetailsLines(models.Model): @api.depends('sponsorship_duration', 'direct_debit', 'record_type', 'start_date') def _compute_hide_beneficiary_group(self): for rec in self: - if rec.sponsorship_duration == 'temporary' and rec.direct_debit and rec.record_type == 'sponsorship' and rec.start_date != fields.Date.context_today( + if rec.sponsorship_duration == 'temporary' and rec.direct_debit and rec.record_type == 'sponsorship' and rec.start_date > fields.Date.context_today( rec): rec.hide_beneficiary_group = True else: @@ -362,6 +362,7 @@ class DonationsDetailsLines(models.Model): rec.state = 'paid' else: rec.state = 'active' + rec.start_date = fields.Date.today() sponsor_id = rec.sponsorship_mechanism_id.sponsor_id.id if rec.sponsorship_mechanism_id else rec.sponsorship_id.sponsor_id.id (rec.benefit_id | rec.benefit_ids).write( @@ -1235,7 +1236,10 @@ class DonationsDetailsLines(models.Model): }) all_beneficiaries = ended_lines.benefit_ids | ended_lines.benefit_id all_beneficiaries.write({ - 'sponsor_related_id': False + 'sponsor_related_id': False, + 'kafala_status':'have_not_kafala', + 'sponsorship_end_date': fields.Date.today(), + }) for line in ended_lines: line._message_sms_with_template( diff --git a/odex25_takaful/odex_takaful/models/takaful_sponorship_model.py b/odex25_takaful/odex_takaful/models/takaful_sponorship_model.py index 2478ffec7..7deabb7f3 100644 --- a/odex25_takaful/odex_takaful/models/takaful_sponorship_model.py +++ b/odex25_takaful/odex_takaful/models/takaful_sponorship_model.py @@ -1313,6 +1313,12 @@ class TakafulSponsorship(models.Model): def action_set_close(self): self.ensure_one() self.state = 'closed' + all_line = self.donations_details_lines + self.donations_details_lines_mechanism_ids + for line in all_line: + line.state = 'closed' + line.benefit_id.kafala_status = 'have_not_kafala' + line.benefit_id.sponsor_related_id = False + line.benefit_id.sponsorship_end_date = fields.Date.today() # @api.multi def action_make_payement(self): diff --git a/odex25_takaful/odex_takaful/views/takaful_menus_actions.xml b/odex25_takaful/odex_takaful/views/takaful_menus_actions.xml index 23d84d1df..2493c9787 100644 --- a/odex25_takaful/odex_takaful/views/takaful_menus_actions.xml +++ b/odex25_takaful/odex_takaful/views/takaful_menus_actions.xml @@ -9,7 +9,7 @@ + parent="takaful_kufula_app_top_menu" groups="odex_takaful.group_kufula_user"/> @@ -18,7 +18,7 @@ name="Donations Details Lines" action="donations_details_lines_action" sequence="2"/> + name="Donations Details Lines To Replace Benefit" action="donations_details_lines_replace_action" sequence="3" groups="odex_takaful.group_orphan_replacement"/> diff --git a/odex25_takaful/odex_takaful/views/takaful_sponorship_view.xml b/odex25_takaful/odex_takaful/views/takaful_sponorship_view.xml index 7733208d7..e87eee8c1 100644 --- a/odex25_takaful/odex_takaful/views/takaful_sponorship_view.xml +++ b/odex25_takaful/odex_takaful/views/takaful_sponorship_view.xml @@ -46,7 +46,9 @@