[FIX] solve bugs from test3

This commit is contained in:
Nossibaelhadi 2026-01-03 18:18:36 +03:00
parent 5c7c5ec6a3
commit ff70fd1d35
7 changed files with 35 additions and 15 deletions

View File

@ -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
@ -7654,3 +7651,10 @@ msgstr "مساهمة مالية لصالح:"
#, python-format
msgid "Financial contribution by order %s"
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 "تم الدفع"

View File

@ -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(

View File

@ -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):

View File

@ -9,7 +9,7 @@
<!-- Kafala Processes (moved from replacement_process_views.xml) -->
<menuitem id="menu_replacement_root" name="Kafala Processes" sequence="11"
parent="takaful_kufula_app_top_menu" groups="odex_takaful.group_orphan_replacement"/>
parent="takaful_kufula_app_top_menu" groups="odex_takaful.group_kufula_user"/>
<menuitem id="takaful_sponsorship_app_menu" parent="kafalat_main_menu"
name="Sponsorships" action="takaful_sponsorship_action" sequence="1"/>
@ -18,7 +18,7 @@
name="Donations Details Lines" action="donations_details_lines_action" sequence="2"/>
<menuitem id="donations_details_lines_to_replace_app_menu" parent="menu_replacement_root"
name="Donations Details Lines To Replace Benefit" action="donations_details_lines_replace_action" sequence="3"/>
name="Donations Details Lines To Replace Benefit" action="donations_details_lines_replace_action" sequence="3" groups="odex_takaful.group_orphan_replacement"/>
<menuitem id="donations_details_lines_waiting_app_menu" parent="menu_replacement_root"
name="Donations Details Lines Waiting Benefit" action="donations_details_lines_waiting_action" sequence="4"/>

View File

@ -46,7 +46,9 @@
<button name="action_set_cancel" type="object"
string="To Cancel" class="oe_highlight"
attrs="{'invisible': [('state','not in',['confirmed'])]}"/>
attrs="{'invisible': True}"/>
<!-- attrs="{'invisible': [('state','not in',['confirmed'])]}"-->
<button name="action_reset_to_draft" type="object"
string="Reset to Draft" class="btn-link"
attrs="{'invisible': [('state','!=','confirmed')]}"/>

View File

@ -190,7 +190,11 @@ class OTPWizard(models.TransientModel):
# Set state to 'cancel' for all donation lines
if all_donation_lines:
all_donation_lines.write({'state': 'cancel'})
all_donation_lines.write({'state': 'cancel',
'benefit_id.kafala_status':'have_not_kafala',
'benefit_id.sponsor_related_id':False,
'benefit_id.sponsorship_end_date': fields.Date.today(),
})
# Process extension history for each donation line
for donation_line in all_donation_lines: