From cf082e3988a2184c1bed0f25f4345df385240657 Mon Sep 17 00:00:00 2001
From: Abdurrahman Saber <a.saber@odex.sa>
Date: Mon, 3 Nov 2025 17:18:20 +0200
Subject: [PATCH 01/16] [IMP] odex_takaful: reset to draft, multiple line
 extension

---
 .../odex_takaful/data/server_actions.xml      |   8 +
 .../odex_takaful/models/account_move.py       |  13 +-
 .../models/donation_details_lines.py          |   5 +-
 .../odex_takaful/models/res_partner.py        |  15 +-
 .../models/takaful_sponorship_model.py        |  94 +-------
 .../odex_takaful/security/ir.model.access.csv |   1 +
 .../views/takaful_sponorship_view.xml         |   5 +-
 .../wizards/account_payment_register.py       |   5 +-
 .../wizards/donation_extension_wizard.py      | 227 +++++++++++-------
 .../wizards/donation_extension_wizard.xml     |  34 ++-
 10 files changed, 213 insertions(+), 194 deletions(-)

diff --git a/odex25_ensan/odex_takaful/data/server_actions.xml b/odex25_ensan/odex_takaful/data/server_actions.xml
index c4bdf4c4c..ee01e5634 100644
--- a/odex25_ensan/odex_takaful/data/server_actions.xml
+++ b/odex25_ensan/odex_takaful/data/server_actions.xml
@@ -10,5 +10,13 @@
                 action = records.action_unlink_sponsor_and_related()
             </field>
         </record>
+        
+        <record id="action_extend_donation" model="ir.actions.server">
+            <field name="name">Extend Donation</field>
+            <field name="model_id" ref="odex_takaful.model_donations_details_lines"/>
+            <field name="binding_model_id" ref="odex_takaful.model_donations_details_lines"/>
+            <field name="state">code</field>
+            <field name="code">action = records.action_extend_sponsorship()</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/odex25_ensan/odex_takaful/models/account_move.py b/odex25_ensan/odex_takaful/models/account_move.py
index b67c5434f..eaaebd7ec 100644
--- a/odex25_ensan/odex_takaful/models/account_move.py
+++ b/odex25_ensan/odex_takaful/models/account_move.py
@@ -7,13 +7,22 @@ from collections import defaultdict
 class AccountMove(models.Model):
     _inherit = 'account.move'
 
-    takaful_sponsorship_id = fields.Many2one('takaful.sponsorship')
+    takaful_sponsorship_id = fields.Many2one('takaful.sponsorship', compute='_compute_takaful_sponsorship_id', store=True)
     is_refund_sponsorship = fields.Boolean(string='Is Refund Sponsorship', default=False)
     sponsorship_scheduling_line = fields.Many2one('sponsorship.scheduling.line')
     payment_details_line = fields.Many2one('payment.details.lines')
     sponsorship_id = fields.Many2one('takaful.sponsorship', string='Sponsorship', readonly=True, )
     payment_id = fields.Many2one('account.payment', string='Payment', copy=False)
 
+    @api.depends('state')
+    def _compute_takaful_sponsorship_id(self):
+        for move in self:
+            if not move.takaful_sponsorship_id:
+                partials = move.line_ids.matched_debit_ids | move.line_ids.matched_credit_ids
+                takaful_sponsorship_ids = (partials.debit_move_id.move_id.takaful_sponsorship_id | partials.credit_move_id.move_id.takaful_sponsorship_id)
+                move.takaful_sponsorship_id = takaful_sponsorship_ids[-1] if takaful_sponsorship_ids else False
+            else:
+                move.takaful_sponsorship_id = move.takaful_sponsorship_id
     def action_move_line_create(self):
         '''
         Confirm the vouchers given in ids and create the journal entries for each of them
@@ -239,5 +248,5 @@ class AccountMove(models.Model):
 class AccountMoveLines(models.Model):
     _inherit = 'account.move.line'
 
-    takaful_sponsorship_id = fields.Many2one('takaful.sponsorship')
+    takaful_sponsorship_id = fields.Many2one('takaful.sponsorship', related='move_id.takaful_sponsorship_id', store=True)
 
diff --git a/odex25_ensan/odex_takaful/models/donation_details_lines.py b/odex25_ensan/odex_takaful/models/donation_details_lines.py
index a44af72f0..b6145bfe9 100644
--- a/odex25_ensan/odex_takaful/models/donation_details_lines.py
+++ b/odex25_ensan/odex_takaful/models/donation_details_lines.py
@@ -934,7 +934,6 @@ class DonationsDetailsLines(models.Model):
         """
         Open wizard to extend donation detail line
         """
-        self.ensure_one()
 
         return {
             'type': 'ir.actions.act_window',
@@ -943,9 +942,7 @@ class DonationsDetailsLines(models.Model):
             'view_mode': 'form',
             'target': 'new',
             'context': {
-                'default_donation_detail_id': self.id,
-                'default_current_end_date': self.end_date,
-                'default_amount': self.product_template_id.list_price,
+                'donation_detail_ids': self.ids,
             },
         }
 
diff --git a/odex25_ensan/odex_takaful/models/res_partner.py b/odex25_ensan/odex_takaful/models/res_partner.py
index 4390bf9cd..8c54daa2e 100644
--- a/odex25_ensan/odex_takaful/models/res_partner.py
+++ b/odex25_ensan/odex_takaful/models/res_partner.py
@@ -5,8 +5,7 @@ from odoo.exceptions import UserError, ValidationError, Warning
 from dateutil.parser import parse
 import re
 from odoo.osv import expression
-SAUDI_MOBILE_PATTERN = r"^(05|5)(5|0|3|6|4|9|1|8|7)([0-9]{7})$"
-
+SAUDI_MOBILE_PATTERN = r"^(\+?966)?0?5[013456789][0-9]{7}$"
 
 class IrActionsServer(models.Model):
     _inherit = 'ir.actions.server'
@@ -407,3 +406,15 @@ class ResPartner(models.Model):
             else:
                 rec.name = " "
     
+class ResPartnerBank(models.Model):
+    _inherit = 'res.partner.bank'
+
+    def name_get(self):
+        result = []
+        for bank in self:
+            if bank.bank_id:
+                name = f"{bank.acc_number} - {bank.bank_id.name}"
+            else:
+                name = f"{bank.acc_number}"
+            result.append((bank.id, name))
+        return result
\ No newline at end of file
diff --git a/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py b/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
index 63336a5a3..6b0724671 100644
--- a/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
+++ b/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
@@ -15,7 +15,7 @@ import requests
 from odoo.osv import expression
 import logging
 
-SAUDI_MOBILE_PATTERN = r"^(05|5)(5|0|3|6|4|9|1|8|7)([0-9]{7})$"
+SAUDI_MOBILE_PATTERN = r"^(\+?966)?0?5[013456789][0-9]{7}$"
 
 
 def trunc_datetime(someDate):
@@ -755,6 +755,7 @@ class TakafulSponsorship(models.Model):
                         taxes = line.move_id.fiscal_position_id.map_tax(taxes, partner=line.partner_id)
                     line.tax_ids = taxes
                     line.product_uom_id = line._get_computed_uom()
+                bill_id.action_post()
             else:
                 sponsorship.state = sponsorship.state
 
@@ -1068,90 +1069,11 @@ class TakafulSponsorship(models.Model):
                 rec.expected_cancel_date = None
                 rec.due_days = 0
 
-    # On Change
-    # @api.onchange('sponsorship_class', 'sponsorship_type', 'benefit_id', 'benefit_ids')
-    # def sponsorship_fully_value(self):
-    #     if self.sponsorship_class == 'fully' and self.benefit_ids and self.sponsorship_type == 'group':
-    #         self.update({'contribution_value': sum(
-    #             self.benefit_ids.mapped('benefit_needs_value'))})
-    #     elif self.sponsorship_class == 'fully' and self.benefit_id and self.sponsorship_type == 'person':
-    #         self.update(
-    #             {'contribution_value': self.benefit_id.benefit_needs_value})
-    #     else:
-    #         self.update({'contribution_value': 0})
-
-    # @api.constrains('contribution_value')
-    # def check_contribution_value(self):
-    #     if not self.sponsor_id:
-    #         raise ValidationError(
-    #             _(u'Please Select The Sponsor'))
-
-        # if not self.sponsorship_type:
-        #     raise ValidationError(
-        #         _(u'Please Select Sponsorship Type'))
-        #
-        # if not self.benefit_type:
-        #     raise ValidationError(
-        #         _(u'Please Select Sponsorship Beneficiary Type'))
-        #
-        # if not self.sponsorship_class:
-        #     raise ValidationError(
-        #         _(u'Please Select Sponsorship Class'))
-        #
-        # if not self.sponsorship_duration:
-        #     raise ValidationError(
-        #         _(u'Please Select Sponsorship Duration'))
-        #
-        # if not self.benefit_id and self.sponsorship_type == 'person':
-        #     raise ValidationError(
-        #         _(u'Please Select a Beneficiary For Sponsorship Person'))
-        #
-        # if len(self.benefit_ids) < 2 and self.sponsorship_type == 'group':
-        #     raise ValidationError(
-        #         _(u'Please Select At least Two Beneficiaries For Sponsorship Group'))
-        #
-        # if self.sponsorship_class == 'partial':
-        #     default_sponsorship = int(
-        #         self.env['ir.config_parameter'].sudo().get_param('odex_takaful_base.min_kafala', 0))
-        #
-        #     if self.benefit_ids and self.sponsorship_type == 'group':
-        #         benefit_count = len(self.benefit_ids)
-        #     else:
-        #         benefit_count = 1
-        #
-        #     if default_sponsorship <= 0:
-        #         raise ValidationError(
-        #             _(u'Min kafala value should be defined by administration'))
-        #
-        #     total_sponsorship = default_sponsorship * benefit_count
-        #     if self.contribution_value < total_sponsorship:
-        #         raise ValidationError(
-        #             _(u'Kafala value should be equal or greater than') + ' ' + str(total_sponsorship))
-
-    # Model Operations
     @api.model
     def create(self, vals):
         if vals.get('code', 'New') == 'New':
             vals['code'] = self.env['ir.sequence'].sudo().next_by_code('sponsorship.sequence')
-            # if vals.get('benefit_type') == 'orphan':
-            #     main_code = self.env['ir.sequence'].sudo(
-            #     ).next_by_code('sponsorship.sequence')
-            #     sub_code = self.env['ir.sequence'].sudo().next_by_code(
-            #         'sponsorship.orphan.sequence')
-            #     if main_code and sub_code:
-            #         defualt_code = 'OR/' + str(main_code) + '/' + sub_code
-            #         vals.update({"code": defualt_code})
-
-            # elif vals.get('benefit_type') == 'widow':
-            #     main_code = self.env['ir.sequence'].sudo(
-            #     ).next_by_code('sponsorship.sequence')
-            #     sub_code = self.env['ir.sequence'].sudo().next_by_code(
-            #         'sponsorship.widow.sequence')
-            #     if main_code and sub_code:
-            #         defualt_code = 'WI/' + str(main_code) + '/' + sub_code
-            #         vals.update({"code": defualt_code})
-
-        # Valid Sponsor Mobile
+        
         sponsor_phone = vals.get('sponsor_phone', False)
         if sponsor_phone:
             self._check_phone_numbers(sponsor_phone)
@@ -1730,6 +1652,7 @@ class TakafulSponsorship(models.Model):
                 'dont_redirect_to_payments': True,
                 'sponsorship_line_ids': sponsorship_line_ids.ids,
                 'sponsorship_payment': True,
+                'sponsorship_payment_skip_compute_amount': True,
                 'default_sponsorship_payment': True,
                 'force_sponsorship_line_partner_id': self.sponsor_id.id,
             },
@@ -1743,6 +1666,15 @@ class TakafulSponsorship(models.Model):
             sponsorship_line_ids = (rec.donations_details_lines | rec.donations_details_lines_mechanism_ids).filtered(lambda l: not l.direct_debit)
             rec.show_register_payment = rec.with_context(exclude_direct_debit=True).amount_paid < sum(sponsorship_line_ids.mapped('total_donation_amount'))
 
+    def action_reset_to_draft(self):
+        for rec in self:
+            if rec.state != 'confirmed':
+                raise ValidationError(_("You can only reset to draft a confirmed sponsorship."))
+            move_ids = rec.journal_entry_ids.filtered(lambda l: l.move_type == 'out_invoice')
+            move_ids.button_draft()
+            move_ids.button_cancel()
+        self.write({'state': 'draft'})
+
 class AnotherSponsors(models.Model):
     _name = "donate.for.another.person"
 
diff --git a/odex25_ensan/odex_takaful/security/ir.model.access.csv b/odex25_ensan/odex_takaful/security/ir.model.access.csv
index 25899b728..7c34b0b99 100644
--- a/odex25_ensan/odex_takaful/security/ir.model.access.csv
+++ b/odex25_ensan/odex_takaful/security/ir.model.access.csv
@@ -45,6 +45,7 @@ access_group_kufula_user_account_partial_reconcile,access_group_kufula_user_acco
 access_group_kufula_user_account_full_reconcile,access_group_kufula_user_account_full_reconcile,account.model_account_full_reconcile,odex_takaful.group_kufula_user,1,1,1,0
 access_donation_extension_wizard,donation.extension.wizard.access,model_donation_extension_wizard,base.group_user,1,1,1,1
 access_donation_extension_history,donation.extension.history.access,model_donation_extension_history,odex_takaful.group_kufula_user,1,1,1,0
+access_donation_extension_wizard_line,donation.extension.wizard.line.access,model_donation_extension_wizard_line,odex_takaful.group_kufula_user,1,1,1,0
 
 access_replace_sponsor_wizard,replace.sponsor.wizard.access,model_replace_sponsor_wizard,odex_takaful.group_replace_sponsor,1,1,1,1
 
diff --git a/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml b/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
index b5ddf7845..d13a75436 100644
--- a/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
+++ b/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
@@ -39,6 +39,9 @@
                     <button name="action_confirm_data" type="object"
                             string="Confirm Data" class="oe_highlight"
                             attrs="{'invisible': ['|','|', ('state','!=','draft'), ('id','=',False), '&amp;',('sponsor_or_donor_type','=','new_sponsor'),('sponsor_id','=',False)]}"/>
+                    <button name="action_reset_to_draft" type="object"
+                            string="Reset to Draft" class="oe_highlight"
+                            attrs="{'invisible': [('state','!=','confirmed')]}"/>
                     <button string="Pay All Sponsorships" name="action_register_payment" type="object"
                             class="oe_highlight"
                             attrs="{'invisible': ['|', ('state', 'not in', ['confirmed', 'wait_pay','under_replacement','replacement_done']), ('show_register_payment', '=', False)]}"/>
@@ -181,7 +184,7 @@
                             </page>
                             <page string="Donation Details">
                                 <field name="donations_details_lines"
-                                       context="{'default_active_id': active_id,'default_donation_mechanism': donation_mechanism,'default_start_date': sponsorship_creation_date}"
+                                       context="{'default_active_id': active_id,'default_donation_mechanism': 'without_conditions','default_start_date': sponsorship_creation_date}"
                                        widget="section_and_note_one2many"
                                        attrs="{'invisible': ['|',('donation_mechanism', '=', 'with_conditions'),('record_type', '!=', 'donation')], 'readonly': [('state','!=','draft')]}">
                                     <tree editable="bottom" class="fix_overflow">
diff --git a/odex25_ensan/odex_takaful/wizards/account_payment_register.py b/odex25_ensan/odex_takaful/wizards/account_payment_register.py
index 5815dc491..f04d0698c 100644
--- a/odex25_ensan/odex_takaful/wizards/account_payment_register.py
+++ b/odex25_ensan/odex_takaful/wizards/account_payment_register.py
@@ -43,7 +43,7 @@ class AccountRegisterPayment(models.TransientModel):
                 
     @api.depends('source_amount', 'source_amount_currency', 'source_currency_id', 'company_id', 'currency_id', 'payment_date')
     def _compute_amount(self):
-        if self.env.context.get('sponsorship_payment'):
+        if self.env.context.get('sponsorship_payment_skip_compute_amount'):
             self.amount = self.amount
         else:
             super(AccountRegisterPayment, self)._compute_amount()
@@ -65,7 +65,6 @@ class AccountRegisterPayment(models.TransientModel):
         
         payments = super(AccountRegisterPayment, self)._create_payments()
         if sponsorship_lines:
-            sponsorship = sponsorship_lines.sponsorship_id or sponsorship_lines.sponsorship_mechanism_id
             
             for line in sponsorship_lines:
                 state = ''
@@ -119,6 +118,7 @@ class AccountRegisterPayment(models.TransientModel):
                         taxes = line.move_id.fiscal_position_id.map_tax(taxes, partner=line.partner_id)
                     line.tax_ids = taxes
                     line.product_uom_id = line._get_computed_uom()
+                bill_id.action_post()
             for line in sponsorship_lines:
                 if line.record_type != 'sponsorship':
                     continue
@@ -138,7 +138,6 @@ class AccountRegisterPayment(models.TransientModel):
 
             if self.env.context.get('is_direct_debit'):
                 payments.write({'direct_debit': True})
-            payments.move_id.write({'takaful_sponsorship_id': sponsorship.id})
 
         if self.transaction_file_attachment:
             self.env['ir.attachment'].sudo().create({
diff --git a/odex25_ensan/odex_takaful/wizards/donation_extension_wizard.py b/odex25_ensan/odex_takaful/wizards/donation_extension_wizard.py
index 926560e32..87093ea7f 100644
--- a/odex25_ensan/odex_takaful/wizards/donation_extension_wizard.py
+++ b/odex25_ensan/odex_takaful/wizards/donation_extension_wizard.py
@@ -10,29 +10,15 @@ class DonationExtensionWizard(models.TransientModel):
     _name = 'donation.extension.wizard'
     _description = "Donation Extension Wizard"
 
-    donation_detail_id = fields.Many2one(
-        'donations.details.lines',
-        string='Donation Detail',
+    line_ids = fields.One2many(
+        'donation.extension.wizard.line',
+        'wizard_id',
+        string='Lines',
         required=True,
-        readonly=True
+        default=lambda self: self._compute_line_ids(),
     )
     
-    amount = fields.Float(
-        string='Monthly Extension Amount',
-        required=True,
-        help='Amount per month for the extension period'
-    )
-    fixed_value = fields.Boolean(
-        string='Is Fixed Value?',
-        related='donation_detail_id.product_template_id.fixed_value'
-    )
-    total_months_amount = fields.Float(
-        string='Total Months Amount',
-        compute='_compute_total_months_amount',
-        store=True,
-        readonly=True,
-        help='Total amount for the extension period'
-    )
+    direct_debit = fields.Boolean(string='Direct Debit', required=True)
 
     months = fields.Integer(
         string='Extension Months',
@@ -40,6 +26,97 @@ class DonationExtensionWizard(models.TransientModel):
         default=1,
         help='Number of months to extend'
     )
+
+    def _compute_line_ids(self):
+        extension_line_ids = [(5,)]
+        donation_detail_ids = self.env['donations.details.lines'].browse(self.env.context.get('donation_detail_ids'))
+        for line in donation_detail_ids:
+            if not (line.record_type == 'donation' and line.direct_debit) and line.record_type != 'sponsorship':
+                raise ValidationError(_("Only donation with direct debit or sponsorship can be extended. Line: %s") % line.name)
+            if line.end_date and line.end_date < fields.Date.context_today(line):
+                raise ValidationError(_("Only active donations with end date in the future can be extended. Line: %s") % line.name)
+            if line.state != 'active':
+                raise ValidationError(_("Only active donations can be extended. Line: %s") % line.name)
+            extension_line_ids.append((0, 0, {
+                'donation_line_id': line.id,
+                'current_end_date': line.end_date,
+            }))
+        return extension_line_ids
+
+    @api.constrains('months')
+    def _check_months(self):
+        for rec in self:
+            if rec.months <= 0:
+                raise ValidationError(_("Extension months must be greater than 0."))
+    
+    @api.onchange('direct_debit')
+    def _onchange_direct_debit(self):
+        self.line_ids.direct_debit = self.direct_debit
+            
+    def action_extend(self):
+        """
+        Extend the donation detail line with new amount and months
+        """
+        invoice_ids = self.env['account.move']
+        donation_line_ids = self.env['donations.details.lines']
+        for line in self.line_ids:
+            result = line._extend()
+            if result:
+                invoice_ids += result[0]
+                donation_line_ids += result[1]
+        
+        if invoice_ids:
+            return {
+                'name': _('Register Payment'),
+                'res_model': 'account.payment.register',
+                'view_mode': 'form',
+                'context': {
+                    'active_model': 'account.move',
+                    'active_ids': invoice_ids.ids,
+                    'dont_redirect_to_payments': True,
+                    'sponsorship_line_ids': donation_line_ids.ids,
+                    'sponsorship_payment': True,
+                    'default_sponsorship_payment': True,
+                },
+                'target': 'new',
+                'type': 'ir.actions.act_window',
+            }
+            
+        return {
+                'type': 'ir.actions.client',
+                'tag': 'display_notification',
+                'params': {
+                    'title': _('Success'),
+                    'message': _('Donation has been extended for %s month(s).') % (
+                        self.months,
+                    ),
+                    'type': 'success',
+                    'sticky': False,
+                    'next': {'type': 'ir.actions.act_window_close'}
+                }
+            }
+
+    def action_cancel(self):
+        """
+        Cancel the wizard
+        """
+        return {'type': 'ir.actions.act_window_close'}
+
+class DonationExtensionWizardLine(models.TransientModel):
+    _name = 'donation.extension.wizard.line'
+    _description = "Donation Extension Wizard Line"
+
+    wizard_id = fields.Many2one('donation.extension.wizard', string='Wizard', required=True)
+    donation_line_id = fields.Many2one('donations.details.lines', string='Donation Detail', required=True, readonly=True)
+    donation_qty = fields.Float(compute='_compute_donation_qty', store=True)
+    direct_debit = fields.Boolean()
+    total_months_amount = fields.Float(
+        string='Total Months Amount',
+        compute='_compute_total_months_amount',
+        store=True,
+        readonly=True,
+        help='Total amount for the extension period'
+    )
     
     total_donation_amount = fields.Float(
         string='Total Extension Amount',
@@ -60,20 +137,31 @@ class DonationExtensionWizard(models.TransientModel):
         readonly=True
     )
 
-    direct_debit = fields.Boolean(string='Direct Debit', required=True)
+    # related 
+    record_type = fields.Selection(related='donation_line_id.record_type')
+    sponsorship_type = fields.Selection(related='donation_line_id.sponsorship_type')
+    donation_amount = fields.Float(related='donation_line_id.donation_amount', store=True)
+    benefits_count = fields.Integer(related='donation_line_id.benefits_count')
+    sponsorship_id = fields.Many2one(related='donation_line_id.sponsorship_id')
+    fixed_value = fields.Boolean(related='donation_line_id.fixed_value')
+    donation_mechanism = fields.Selection(related='donation_line_id.donation_mechanism')
+    months = fields.Integer(related='wizard_id.months')
     
-    @api.depends('amount', 'months')
+    @api.depends('benefits_count', 'donation_amount', 'months', 'donation_qty', 'record_type', 'sponsorship_type')
     def _compute_total_donation_amount(self):
         for rec in self:
-           if rec.donation_detail_id.sponsorship_type == 'group':
-              rec.total_donation_amount = rec.donation_detail_id.benefits_count * rec.total_months_amount
-           else :
-               rec.total_donation_amount = rec.total_months_amount
+            if rec.record_type == 'donation':
+                    if rec.sponsorship_id.donation_mechanism == 'without_conditions':
+                        rec.total_donation_amount = rec.donation_amount * rec.donation_qty
+                    else:
+                        rec.total_donation_amount = rec.total_months_amount
+            else:
+                rec.total_donation_amount = rec.total_months_amount * rec.benefits_count
     
-    @api.depends('amount', 'months')
+    @api.depends('donation_amount', 'months')
     def _compute_total_months_amount(self):
         for rec in self:
-            rec.total_months_amount = rec.amount * rec.months
+            rec.total_months_amount = rec.donation_amount * rec.months
     
     @api.depends('current_end_date', 'months')
     def _compute_new_end_date(self):
@@ -83,25 +171,15 @@ class DonationExtensionWizard(models.TransientModel):
             else:
                 rec.new_end_date = False
     
-    @api.constrains('months')
-    def _check_months(self):
+    @api.depends('donation_line_id')
+    def _compute_donation_qty(self):
         for rec in self:
-            if rec.months <= 0:
-                raise ValidationError(_("Extension months must be greater than 0."))
-    
-    @api.constrains('amount')
-    def _check_amount(self):
-        for rec in self:
-            if rec.amount <= 0:
-                raise ValidationError(_("Extension amount must be greater than 0."))
-    
-    def action_extend(self):
-        """
-        Extend the donation detail line with new amount and months
-        """
+            rec.donation_qty = rec.donation_line_id.donation_qty
+
+    def _extend(self):
         self.ensure_one()
         
-        if not self.donation_detail_id:
+        if not self.donation_line_id:
             raise ValidationError(_("No donation detail line selected."))
         
         # Update the donation detail line
@@ -109,14 +187,14 @@ class DonationExtensionWizard(models.TransientModel):
         old_end_date = self.current_end_date
         
         # Update end date
-        self.donation_detail_id.write({
+        self.donation_line_id.write({
             'end_date': new_end_date,
             'donation_amount': self.total_months_amount,
-            'payment_month_count': self.donation_detail_id.payment_month_count + self.months,
+            'payment_month_count': self.donation_line_id.payment_month_count + self.months,
             # 'state': 'extended',
         })
 
-        benefit_ids = self.donation_detail_id.benefit_ids | self.donation_detail_id.benefit_id
+        benefit_ids = self.donation_line_id.benefit_ids | self.donation_line_id.benefit_id
         benefit_ids.write({
             'sponsorship_end_date': new_end_date,
         })
@@ -130,52 +208,23 @@ class DonationExtensionWizard(models.TransientModel):
         
         # Create extension history record
         self.env['donation.extension.history'].create({
-            'donation_detail_id': self.donation_detail_id.id,
-            'sponsorship_id': self.donation_detail_id.sponsorship_id.id or self.donation_detail_id.sponsorship_mechanism_id.id,
+            'donation_detail_id': self.donation_line_id.id,
+            'sponsorship_id': self.donation_line_id.sponsorship_id.id or self.donation_line_id.sponsorship_mechanism_id.id,
             'extension_amount': self.total_donation_amount,
             'extension_months': self.months,
             'old_end_date': old_end_date,
             'new_end_date': new_end_date,
             'invoice_id': invoice_id.id if invoice_id else False,
-            'old_direct_debit': self.donation_detail_id.direct_debit,
+            'old_direct_debit': self.donation_line_id.direct_debit,
             'new_direct_debit': self.direct_debit,
         })
 
         if not self.direct_debit:
-            result = {
-                'name': _('Register Payment'),
-                'res_model': 'account.payment.register',
-                'view_mode': 'form',
-                'context': {
-                    'active_model': 'account.move',
-                    'active_ids': invoice_id.ids,
-                    'default_amount': self.total_donation_amount,
-                    'dont_redirect_to_payments': True,
-                    'sponsorship_line_ids': self.donation_detail_id.ids,
-                    'sponsorship_payment': True,
-                    'default_sponsorship_payment': True,
-                    'force_sponsorship_line_partner_id': self.donation_detail_id.sponsor_id.id,
-                },
-                'target': 'new',
-                'type': 'ir.actions.act_window',
-            }
-        else:
-            result = {
-                'type': 'ir.actions.client',
-                'tag': 'display_notification',
-                'params': {
-                    'title': _('Success'),
-                    'message': _('Donation has been extended for %s month(s) until %s') % (
-                        self.months,
-                        new_end_date.strftime('%Y-%m-%d')
-                    ),
-                    'type': 'success',
-                    'sticky': False,
-                    'next': {'type': 'ir.actions.act_window_close'}
-                }
-            }
+            return invoice_id, self.donation_line_id
+            
 
-        return result
+        return False
+    
     
     def _create_extension_scheduling_lines(self):
         """
@@ -183,7 +232,7 @@ class DonationExtensionWizard(models.TransientModel):
         """
         self.ensure_one()
         
-        donation_line = self.donation_detail_id
+        donation_line = self.donation_line_id
         start_date = self.current_end_date + relativedelta(months=1)
         
         # Distribute total amount across months
@@ -214,7 +263,7 @@ class DonationExtensionWizard(models.TransientModel):
         """
         self.ensure_one()
         
-        donation_line = self.donation_detail_id
+        donation_line = self.donation_line_id
         sponsorship = donation_line.sponsorship_id or donation_line.sponsorship_mechanism_id
         
         # Get journal from settings
@@ -258,10 +307,4 @@ class DonationExtensionWizard(models.TransientModel):
         invoice_id.action_post()
         
         return invoice_id
-    
-    def action_cancel(self):
-        """
-        Cancel the wizard
-        """
-        return {'type': 'ir.actions.act_window_close'}
-
+    
\ No newline at end of file
diff --git a/odex25_ensan/odex_takaful/wizards/donation_extension_wizard.xml b/odex25_ensan/odex_takaful/wizards/donation_extension_wizard.xml
index 97b22bcf7..e49c14a2e 100644
--- a/odex25_ensan/odex_takaful/wizards/donation_extension_wizard.xml
+++ b/odex25_ensan/odex_takaful/wizards/donation_extension_wizard.xml
@@ -7,21 +7,37 @@
             <field name="arch" type="xml">
                 <form>
                     <sheet>
-                        <field name="donation_detail_id" invisible="1"/>
                         <group>
                             <group string="Extension Details">
                                 <field name="months"/>
                                 <field name="direct_debit"/>
-                                <field name="fixed_value" invisible="1"/>
-                                <field name="amount"
-                                    attrs="{'readonly':[('fixed_value','=',True)]}"/>
-                                <field name="total_donation_amount"/>
-                            </group>
-                            <group string="Date Information">
-                                <field name="current_end_date" readonly="1"/>
-                                <field name="new_end_date"/>
+                                
                             </group>
                         </group>
+                        <notebook>
+                            <page string="Lines">
+                                <field name="line_ids" nolabel="1">
+                                    <tree create="0" editable="bottom">
+                                        <field name="wizard_id" invisible="1" force_save="1"/>
+                                        <field name="months" invisible="1" force_save="1"/>
+                                        <field name="record_type" invisible="1" force_save="1"/>
+                                        <field name="sponsorship_type" invisible="1" force_save="1"/>
+                                        <field name="benefits_count" invisible="1" force_save="1"/>
+                                        <field name="sponsorship_id" invisible="1" force_save="1"/>
+                                        <field name="donation_mechanism" invisible="1" force_save="1"/>
+                                        <field name="fixed_value" invisible="1" force_save="1"/>
+                                        <field name="donation_line_id" force_save="1"/>
+                                        <field name="current_end_date" force_save="1"/>
+                                        <field name="new_end_date" force_save="1"/>
+                                        <field name="direct_debit" force_save="1"/>
+                                        <field name="donation_amount" string="Amount" attrs="{'readonly':[('fixed_value','=',True)]}" />
+                                        <field name="donation_qty" string="Qty" attrs="{'invisible':[('donation_mechanism','!=','without_conditions')]}"/>
+                                        <field name="total_months_amount" string="Months Amount" force_save="1"/>
+                                        <field name="total_donation_amount" string="Total Amount" force_save="1"/>
+                                    </tree>
+                                </field>
+                            </page>
+                        </notebook>
                     </sheet>
                     <footer>
                         <button name="action_extend" type="object" string="Extend" class="oe_highlight"/>

From 0ac855dbdb92c10efb7a690007ce05bdcdbc1a98 Mon Sep 17 00:00:00 2001
From: Nossibaelhadi <N.Alhadi@exp-sa.com>
Date: Mon, 3 Nov 2025 19:07:55 +0300
Subject: [PATCH 02/16] change on app icon journal and sequ

---
 .../odex_takaful/static/description/icon5.png    | Bin 0 -> 1687 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 odex25_ensan/odex_takaful/static/description/icon5.png

diff --git a/odex25_ensan/odex_takaful/static/description/icon5.png b/odex25_ensan/odex_takaful/static/description/icon5.png
new file mode 100644
index 0000000000000000000000000000000000000000..d18f5bcd47b851ccaf3fb2522f2f177a0dd3c530
GIT binary patch
literal 1687
zcmV;I259+-P)<h;3K|Lk000e1NJLTq002Y)002Y?1^@s6I1`hy00009a7bBm000XU
z000XU0RWnu7ytkUNl8RORCt{2n|ZKSV;sj%i_n4$sVq~BWsorqB}2y6PUR|Tl#FG@
zXyhOAmt`0lOR|n+ge(yyGwvuvR9bGg#-42$LJZQRvUES@*ZH1$yq$C2b9>+W-lsF~
zcjnC8d*5@P<@^4g-~I$a6;)JGMUDXM33LQH0j)|L>mc9}U@1`NJhebg;46UBfCqsO
zfd+P96R-k!7&s4T*N8FOXuLG|MG9~#u)ta1zrZKJ+rT2=>w*nz0p0+v0}d}T_URNy
zZQuid{eY>CG?++_2KI@0_dsA2@D%V<!G=Bn?gB0ZdKyVUFJK%nKLa84&BK5LU<B}k
z7W5-<G0-B&0H7ss5^$?+Cc}pPB?LGWcvTBA$(Ux!v&1nE1I7UN0WSmdfER$<fhk@R
zLinv-1#HkFz5vdykR<v=2+#v~Uz7h0Oak_*(A@qI0_+Xk0{o?k7X!ytWOCmK0r~=;
zX~Olu1UoiOKCy3v00#h1I;Qj`plizetz<6eNw0jB;kjwIAOyGs_*s*D2MkSlw>5An
z@Fk6d5k1*!LV$zy4I8$~{qB$=5o3YRodtbw76;g)tP5)nLI{Jfk2J8w45y?JVG^{)
zSxBU8hnH<Z9uP7_gT8B4CBgqNcl=Xl0rM5Vyr<v0m2E*D5OReEy&;B(Q3}!`ylD}w
z^Ul-y`<SvV$OA%pYtWTIdmW9D&M`8)Wl?9$|DLJOf7Nm7tQ<((lPS*efshtTv_$@f
zZ7za^^nHu`|IK8BDeG?}RW)(P(+ffj7OpEJ^`{i25p+h75t5W=fn^05E%&jU$Un{|
zEGC*E9o8mgU3XNRkV-*E@_gVqV5764^*WZ10e1sW0PiS~lm&HxPasSQjF5XjK|dc-
z<bT@9!+i$$En%bUfH@fmnGyH^!u;s6g8XTO24&C&XBfx4-lKqiBJ*7RzD*GW(^JU!
z#on#RhKq=PmTxYCC4Jflr78Xa<{AJKo##qRO$Hv2u`*%fizP8}s4ImOZ$Y|b4A-+c
z;qzHRp1=+_zYvdGfLP$=_9}4qBMc1k0zxHOh`ElX=?)yP4Ezbel9>0G1bF~qiXhIK
zY>Q)nwZKJk;nUENmT=l_K<IAA;c|UGNlsTWLYg#PP%!}G6E<fl!OqTm-Bn*P?=uP4
z1UV+e@Vg|WYeDJKO&#QpkQ$0(q>jx!a;D4#=k~~SO;D;^oFHtZbjT(-aAzf?0lEZv
z0P$vYur_bfa3pYaRLlY%jd_1jkQV?0V>W1g9{t^fk4*IB1c~Yw<O#s61ifHKVW^Hx
z5@rT@17RLx`7Q)^_V>2Uz4$J`)iR0EV@)c9b~Wkikn&=RB<v&^K9F&2N+!xMUGJHB
zJVuqb5lYfn`$Ovta}1DF*l{VuR`r+pp)&}RzQr(CX}UO=>3l^+s`eQqahRO9@zN#R
zy;m<ln2^bWO|leIb)=>!>%O7jotfHnhbCNen^KN)vBB#zka1hmw{L}Ol^3QJkYlBU
zZ&S(*rf{EcOuLmFxcTZ%+ARNN-{v6Xf{bIeRfc@J>MOSJEJ*DG5#bA+_t!akuePkx
zLKz83=~0a<S$0x_D5?PNRQa<anCdPOR>{+CDGL@I_mfK|qEdtugPLi!TQjFk%k6ls
zmjeEuBmg(+^Kn6r2suJ?EL0D?RpuhpDJpJ}a6HYF8~W#okWre$)i*0t+=|r=Kp&^;
zU{w}h$a_KvP3IuBd%L~t!%~Q_qV_|MgZG+U2`Tr&>dQ%pl0I?KYZ}%_!6vqIiYV(*
zi>%D(vXRilgj}Do<<dxaU1qvvk%ZH1t)oE||NYBGfNwe^35uP@I%e70I?oB38hA*E
zGHMGPkN5t@+^)(EA%tPTL?`!Z#qyq&nA<x-2z`*K9I;WvlyoVvDG8aP7N*&XcrDz2
z0JzL9^^`b&M+JtFWt!s_#48TUb9L)u;9gUDNsVzSjlPi|vet__4A}^&)zz*Ob@8u<
zVv9TFDZ2PWX~VH`#cK7aj&nTCt?FznZy3L;U`Ow18u}C&qZ@FoE(UCl>FrvfxWv5(
zfN~qLJ@Y=79#=Q!_JV@0A-XBCTs^Hg(y&@OsdwNj2uZ0e$Y?E9+)z@pnsh~!1F5{#
hsG^E0stB46{{b~`%_gV8$(jHF002ovPDHLkV1kX74DbK|

literal 0
HcmV?d00001


From d8a17bbbe75b5257afd9423dcd6684785be72608 Mon Sep 17 00:00:00 2001
From: Nossibaelhadi <N.Alhadi@exp-sa.com>
Date: Mon, 3 Nov 2025 19:11:28 +0300
Subject: [PATCH 03/16] change on app icon journal and sequn

---
 odex25_ensan/odex_takaful/__manifest__.py     |  1 +
 odex25_ensan/odex_takaful/i18n/ar_001.po      |  9 ++++--
 .../models/donation_details_lines.py          |  9 ++++++
 .../models/takaful_sponorship_model.py        | 28 ++++++++++---------
 .../views/takaful_menus_actions.xml           |  2 +-
 .../views/takaful_sponorship_view.xml         |  6 ++++
 6 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/odex25_ensan/odex_takaful/__manifest__.py b/odex25_ensan/odex_takaful/__manifest__.py
index 789d833c4..24c17b987 100644
--- a/odex25_ensan/odex_takaful/__manifest__.py
+++ b/odex25_ensan/odex_takaful/__manifest__.py
@@ -74,6 +74,7 @@
         'reports/transfer_deduction_report.xml',
         'reports/transfer_deduction_report_templates.xml',
     ],
+    'images': ['static/description/icon5.png'],
     # 'installable': True,
     # 'application': True,
     # 'auto_install': False,
diff --git a/odex25_ensan/odex_takaful/i18n/ar_001.po b/odex25_ensan/odex_takaful/i18n/ar_001.po
index 8cd3708ec..5f24eae9d 100644
--- a/odex25_ensan/odex_takaful/i18n/ar_001.po
+++ b/odex25_ensan/odex_takaful/i18n/ar_001.po
@@ -3226,7 +3226,7 @@ msgstr "عمليات الكفالة"
 #: model:ir.ui.menu,name:odex_takaful.kafalat_main_menu
 #: model_terms:ir.ui.view,arch_db:odex_takaful.view_takaful_sponsor_form
 msgid "Kafalat"
-msgstr "الكفالات ونقاط البيع"
+msgstr "كفالة ونقاط بيع"
 
 #. module: odex_takaful
 #: model:ir.model,name:odex_takaful.model_takaful_wizard_report_kafalat_cancel
@@ -7055,6 +7055,11 @@ msgstr ""
 msgid "report.odex_takaful.benefit_month_payment_report_pdf"
 msgstr ""
 
+#. module: odex_takaful
+#: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__journal_id
+msgid "Journal"
+msgstr "بنك الجمعية"
+
 #. module: odex_takaful
 #: model:ir.model,name:odex_takaful.model_report_odex_takaful_benefit_month_payment_report_xlsx
 msgid "report.odex_takaful.benefit_month_payment_report_xlsx"
@@ -7243,7 +7248,7 @@ msgstr "اسم الكافل/المتبرع"
 #. module: odex_takaful
 #: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__direct_debit_partner_bank_id
 msgid "Direct Debit Partner Bank"
-msgstr "البنك المستلم"
+msgstr "البنك المتبرع"
 
 #. module: odex_takaful
 #: code:addons/odex_takaful/models/takaful_sponorship_model.py:0
diff --git a/odex25_ensan/odex_takaful/models/donation_details_lines.py b/odex25_ensan/odex_takaful/models/donation_details_lines.py
index b08b7728f..dbb248d60 100644
--- a/odex25_ensan/odex_takaful/models/donation_details_lines.py
+++ b/odex25_ensan/odex_takaful/models/donation_details_lines.py
@@ -16,6 +16,11 @@ class DonationsDetailsLines(models.Model):
     _inherit = ['mail.thread']
     _rec_name = 'sequence_no'
 
+    @api.model
+    def _default_journal_id(self):
+        journal_id = self.env.company.sponsorship_direct_debit_journal_id.id
+        return journal_id if journal_id else False
+
     name = fields.Text(string="Note")
     display_type = fields.Selection([
         ('line_section', "Section"),
@@ -82,6 +87,7 @@ class DonationsDetailsLines(models.Model):
     hide_beneficiary_group = fields.Boolean(compute='_compute_hide_beneficiary_group')
     debit_payment_file_attachment = fields.Binary(string='Debit Payment Attachment', attachment=True)
     debit_payment_attachment_file_name = fields.Char('Debit Payment File Name', required=False)
+    journal_id = fields.Many2one('account.journal', string="Journal",domain="[('type','=','bank')]",default=_default_journal_id)
     # cheque_number = fields.Integer(string="Cheque Number")
     # cheque_due_date = fields.Date(string="Cheque Due Date")
     # cheque_file_attachment = fields.Binary(string='Cheque Attachment', attachment=True)
@@ -89,6 +95,7 @@ class DonationsDetailsLines(models.Model):
     # bank_transfer_file_attachment = fields.Binary(string='Bank Transfer Attachment', attachment=True)
     # bank_transfer_attachment_file_name = fields.Char('Bank Transfer File Name', required=False)
 
+
     @api.depends('extension_history_ids')
     def _compute_extension_count(self):
         for rec in self:
@@ -422,6 +429,8 @@ class DonationsDetailsLines(models.Model):
             if rec.sponsorship_duration == 'temporary' and not rec.direct_debit:
                 rec.start_date = fields.Date.context_today(rec)
 
+
+
     @api.model
     def default_get(self, fields):
         res = super(DonationsDetailsLines, self).default_get(fields)
diff --git a/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py b/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
index 1d2ea1bb2..6b69d7b20 100644
--- a/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
+++ b/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
@@ -1130,8 +1130,8 @@ class TakafulSponsorship(models.Model):
     # Model Operations
     @api.model
     def create(self, vals):
-        if vals.get('code', 'New') == 'New':
-            vals['code'] = self.env['ir.sequence'].sudo().next_by_code('sponsorship.sequence')
+        # if vals.get('code', 'New') == 'New':
+        #     vals['code'] = self.env['ir.sequence'].sudo().next_by_code('sponsorship.sequence')
             # if vals.get('benefit_type') == 'orphan':
             #     main_code = self.env['ir.sequence'].sudo(
             #     ).next_by_code('sponsorship.sequence')
@@ -1258,17 +1258,20 @@ class TakafulSponsorship(models.Model):
             raise ValidationError(
                 _("Please add at least one line in donation details!")
             )
-        
-        all_donation_lines = (self.donations_details_lines + self.donations_details_lines_mechanism_ids).filtered(lambda r: r.display_type == False)
-        
+
+        all_donation_lines = (self.donations_details_lines + self.donations_details_lines_mechanism_ids).filtered(
+            lambda r: r.display_type == False)
+
+        if not self.code:
+            self.code = self.env['ir.sequence'].sudo().next_by_code('sponsorship.sequence')
+
         for line in all_donation_lines.filtered(lambda r: r.record_type == 'sponsorship'):
             for benefit in (line.benefit_id | line.benefit_ids):
                 if benefit.sponsor_related_id:
                     raise ValidationError(_("Cannot proceed with payment!\n\n"
-                    "The following sponsorship lines contain beneficiaries that are already sponsored by other sponsors:\n"
-                    "Lines: %s\n\n"
-                    "Please choose different beneficiaries for these lines before proceeding with the payment." % line.sequence_no))
-
+                                            "The following sponsorship lines contain beneficiaries that are already sponsored by other sponsors:\n"
+                                            "Lines: %s\n\n"
+                                            "Please choose different beneficiaries for these lines before proceeding with the payment." % line.sequence_no))
 
         if not all(all_donation_lines.mapped("sponsorships_computed")):
             (self.donations_details_lines + self.donations_details_lines_mechanism_ids).compute_sponsorships_lines()
@@ -1281,7 +1284,7 @@ class TakafulSponsorship(models.Model):
                 start_date = parse(str(self.start_date)).date()
                 start_by = _('Start Date')
                 start_text = start_by + ' ' + start_date.strftime('%d, %b %Y')
-    
+
                 subject = msg_template.title
                 message = msg_template.body + '\n' + _('Sponsorship Number') + ' %s' % self.code + '\n' + _(
                     'Contribution Value') + ' %s' % str(self.contribution_value) + '\n' + start_text
@@ -1291,7 +1294,7 @@ class TakafulSponsorship(models.Model):
                     'title': subject,
                     'body': message,
                 })
-    
+
                 push.sudo().send_sms_notification()
 
             self.state = "confirmed"
@@ -1349,8 +1352,7 @@ class TakafulSponsorship(models.Model):
             raise ValidationError(_("No Whatsapp notification of type 'Create Kafala' found."))
         else:
             pass
-            #self.action_send_whatsapp()
-
+            # self.action_send_whatsapp()
 
 
     def action_send_whatsapp(self):
diff --git a/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml b/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
index e3c5aae3e..9d6c63478 100644
--- a/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
+++ b/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <odoo>
-    <menuitem id="takaful_kufula_app_top_menu" sequence="15" name="Kafalat System" web_icon="odex_takaful,static/description/icon.png" groups="odex_takaful.group_kufula_user"/>
+    <menuitem id="takaful_kufula_app_top_menu" sequence="15" name="Kafalat System" web_icon="odex_takaful,static/description/icon5.png" groups="odex_takaful.group_kufula_user"/>
 
     <!-- Main Kafalat-->
     <menuitem id="kafalat_main_menu" parent="takaful_kufula_app_top_menu"
diff --git a/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml b/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
index b5ddf7845..6429fa11b 100644
--- a/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
+++ b/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
@@ -215,6 +215,9 @@
                                                attrs="{'required': [('display_type', '=', False)]}"/>
                                         <field name="name" widget="section_and_note_text" optional="show"/>
                                         <field name="direct_debit"/>
+                                        <field name="journal_id"
+                                                       attrs="{'invisible': [('direct_debit', '=', False)], 'required': [('direct_debit', '=', True)]}"/>
+
                                         <!-- <field name="cheque_number"
                                                attrs="{'required': [('payment_method', '=', 'check')], 'invisible': [('payment_method', '!=', 'check')]}"/>
                                         <field name="cheque_due_date"
@@ -413,6 +416,9 @@
                                                 <field name="sponsor_id" invisible="1"/>
                                                 <field name="direct_debit_partner_bank_id" context="{'form_view_ref': 'odex_takaful.res_partner_bank_view_form_quick_create', 'default_partner_id': sponsor_id}"
                                                        attrs="{'invisible': [('direct_debit', '=', False)], 'required': [('direct_debit', '=', True)]}"/>
+                                                <field name="journal_id"
+                                                       attrs="{'invisible': [('direct_debit', '=', False)], 'required': [('direct_debit', '=', True)]}"/>
+
                                                 <field name="debit_payment_file_attachment" widget="binary"
                                                        filename="debit_payment_attachment_file_name"
                                                        attrs="{'required': [('direct_debit', '=', True)], 'invisible': [('direct_debit', '=', False)]}"/>

From f9d76937e445ab294a0869317b64c0dcf064f827 Mon Sep 17 00:00:00 2001
From: Nossibaelhadi <N.Alhadi@exp-sa.com>
Date: Mon, 3 Nov 2025 20:18:10 +0300
Subject: [PATCH 04/16] FIX menu item view

---
 odex25_ensan/odex_takaful/views/takaful_menus_actions.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml b/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
index 03b3b0d3b..68afbeab3 100644
--- a/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
+++ b/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0"?>
 <odoo>
-<<<<<<< HEAD
+
     <menuitem id="takaful_kufula_app_top_menu" sequence="15" name="Kafalat System" web_icon="odex_takaful,static/description/icon5.png" groups="odex_takaful.group_kufula_user"/>
-=======
+
     <menuitem id="takaful_kufula_app_top_menu" sequence="15" name="Kafalat System" web_icon="odex_takaful,static/description/icon.png" groups="odex_takaful.donation_officer_group"/>
->>>>>>> bb335d757bca524e6bc8e1cc47f6327baa672c63
 
     <!-- Main Kafalat-->
     <menuitem id="kafalat_main_menu" parent="takaful_kufula_app_top_menu"

From 9e1168f92d071fb6de9453fc99b3803c4e0314e7 Mon Sep 17 00:00:00 2001
From: Nossibaelhadi <N.Alhadi@exp-sa.com>
Date: Mon, 3 Nov 2025 20:31:39 +0300
Subject: [PATCH 05/16] FIX menu item view2

---
 odex25_ensan/odex_takaful/views/takaful_menus_actions.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml b/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
index 68afbeab3..6caf62456 100644
--- a/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
+++ b/odex25_ensan/odex_takaful/views/takaful_menus_actions.xml
@@ -3,8 +3,6 @@
 
     <menuitem id="takaful_kufula_app_top_menu" sequence="15" name="Kafalat System" web_icon="odex_takaful,static/description/icon5.png" groups="odex_takaful.group_kufula_user"/>
 
-    <menuitem id="takaful_kufula_app_top_menu" sequence="15" name="Kafalat System" web_icon="odex_takaful,static/description/icon.png" groups="odex_takaful.donation_officer_group"/>
-
     <!-- Main Kafalat-->
     <menuitem id="kafalat_main_menu" parent="takaful_kufula_app_top_menu"
         sequence="10" name="Kafalat"/>

From fd881d4cc2bec17d601fbb1942f8103a5d18c212 Mon Sep 17 00:00:00 2001
From: Nossibaelhadi <N.Alhadi@exp-sa.com>
Date: Tue, 4 Nov 2025 01:41:14 +0300
Subject: [PATCH 06/16] FIX benefit kakala status

---
 odex25_ensan/odex_takaful/i18n/ar_001.po      | 24 ++++++++++++++++---
 .../models/donation_details_lines.py          |  2 +-
 .../odex_takaful/models/family_member.py      |  5 ++++
 odex25_ensan/odex_takaful/models/product.py   |  2 +-
 .../odex_takaful/views/family_member.xml      | 20 ++++++++++++++++
 .../views/takaful_sponorship_view.xml         |  2 +-
 6 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/odex25_ensan/odex_takaful/i18n/ar_001.po b/odex25_ensan/odex_takaful/i18n/ar_001.po
index ec0a7582b..5f2b6b44c 100644
--- a/odex25_ensan/odex_takaful/i18n/ar_001.po
+++ b/odex25_ensan/odex_takaful/i18n/ar_001.po
@@ -3226,7 +3226,7 @@ msgstr "عمليات الكفالة"
 #: model:ir.ui.menu,name:odex_takaful.kafalat_main_menu
 #: model_terms:ir.ui.view,arch_db:odex_takaful.view_takaful_sponsor_form
 msgid "Kafalat"
-msgstr "كفالة ونقاط بيع"
+msgstr "كفالات و نقاط بيع"
 
 #. module: odex_takaful
 #: model:ir.model,name:odex_takaful.model_takaful_wizard_report_kafalat_cancel
@@ -3258,7 +3258,7 @@ msgstr "نافذة معالج تقرير مدفوعات الكفالات"
 #. module: odex_takaful
 #: model:ir.ui.menu,name:odex_takaful.takaful_kufula_app_top_menu
 msgid "Kafalat System"
-msgstr "الكفالات ونقاط البيع"
+msgstr "كفالة و نقاط بيع"
 
 #. module: odex_takaful
 #: model:ir.ui.menu,name:odex_takaful.kafileen_main_menu
@@ -7259,4 +7259,22 @@ msgstr "إضافة كافل/متبرع جديد"
 #. module: odex_takaful
 #: model_terms:ir.ui.view,arch_db:odex_takaful.view_takaful_sponsor_form
 msgid "Related Donors"
-msgstr "كافل/متبرع مرتبط"
\ No newline at end of file
+msgstr "كافل/متبرع مرتبط"
+
+#. module: odex_takaful
+#: model:ir.model.fields,field_description:odex_takaful.field_family_member__kafala_status
+msgid "Kafala Status"
+msgstr "حالة الكفالة"
+
+#. module: odex_takaful
+#: model:ir.model.fields.selection,name:odex_takaful.selection__family_member__kafala_status__have_kafala
+#: model_terms:ir.ui.view,arch_db:odex_takaful.family_member_search_inherit
+msgid "Have Kafala"
+msgstr "مكفول"
+
+#. module: odex_takaful
+#: model:ir.model.fields.selection,name:odex_takaful.selection__family_member__kafala_status__have_not_kafala
+#: model_terms:ir.ui.view,arch_db:odex_takaful.family_member_search_inherit
+msgid "Have not Kafala"
+msgstr "غير مكفول"
+
diff --git a/odex25_ensan/odex_takaful/models/donation_details_lines.py b/odex25_ensan/odex_takaful/models/donation_details_lines.py
index a57b12760..8b317bcd6 100644
--- a/odex25_ensan/odex_takaful/models/donation_details_lines.py
+++ b/odex25_ensan/odex_takaful/models/donation_details_lines.py
@@ -169,7 +169,7 @@ class DonationsDetailsLines(models.Model):
                 rec.state = 'active'
                 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(
-                    {'sponsor_related_id': sponsor_id, "sponsorship_end_date": rec.end_date if rec.end_date else False})
+                    {'sponsor_related_id': sponsor_id, 'kafala_status': 'have_kafala', "sponsorship_end_date": rec.end_date if rec.end_date else False})
 
     @api.model
     def run_check_all_end_dates(self):
diff --git a/odex25_ensan/odex_takaful/models/family_member.py b/odex25_ensan/odex_takaful/models/family_member.py
index fbeca45bd..a75436b14 100644
--- a/odex25_ensan/odex_takaful/models/family_member.py
+++ b/odex25_ensan/odex_takaful/models/family_member.py
@@ -13,6 +13,11 @@ class FamilyMember(models.Model):
     sponsorship_end_date = fields.Date(string='Sponsorship End Date')
     is_restricted = fields.Boolean(string="Is Restricted ?", default=False, readonly=True)
     general_restriction = fields.Boolean(string="General Restriction", default=False, readonly=True)
+    kafala_status = fields.Selection(
+        [('have_kafala', 'Have Kafala'), ('have_not_kafala', 'Have not Kafala')],
+        string='Kafala Status',  default='have_not_kafala')
+
+
 
     def _compute_donation_details_count(self):
         for rec in self:
diff --git a/odex25_ensan/odex_takaful/models/product.py b/odex25_ensan/odex_takaful/models/product.py
index 42730c399..488302f15 100644
--- a/odex25_ensan/odex_takaful/models/product.py
+++ b/odex25_ensan/odex_takaful/models/product.py
@@ -6,7 +6,7 @@ class ProductTemplate(models.Model):
 
     donation_category = fields.Selection(
         [('donation', 'Donation'), ('sponsorship', 'Sponsorship'), ('endowment', 'Endowment')],
-        string='Donation Category', required=True, default='donation')
+        string='Donation Category')
     fixed_value = fields.Boolean(string='Is Fixed Value?', compute='_compute_fixed_value')
     sponsorship_duration = fields.Selection([('temporary', 'Temporary'), ('permanent', 'Permanent')],
                                             string='Sponsorship Duration Type')
diff --git a/odex25_ensan/odex_takaful/views/family_member.xml b/odex25_ensan/odex_takaful/views/family_member.xml
index 7f34668fb..b0f43d22d 100644
--- a/odex25_ensan/odex_takaful/views/family_member.xml
+++ b/odex25_ensan/odex_takaful/views/family_member.xml
@@ -17,6 +17,8 @@
                 <field name="sponsorship_end_date" readonly="1"/>
                 <field name="is_restricted" widget="boolean_toggle"/>
                 <field name="general_restriction" widget="boolean_toggle"/>
+                <field name="kafala_status" readonly="1"/>
+
             </xpath>
 
             <xpath expr="//header" position="inside">
@@ -41,6 +43,11 @@
         <field name="arch" type="xml">
             <field name="benefit_id" position="after">
                 <separator/>
+                <filter name="have_kafala" string="Have Kafala"
+                        domain="[('kafala_status','=','have_kafala')]"/>
+                <filter name="have_not_kafala" string="Have not Kafala"
+                        domain="[('kafala_status','=','have_not_kafala')]"/>
+                <separator/>
                 <filter name="orphan_benefit_type" string="Orphans"
                         domain="[('relationn_type', 'in', ['son', 'daughter'])]"/>
                 <filter name="widow_benefit_type" string="Widows"
@@ -72,4 +79,17 @@
             </field>
         </field>
     </record>
+
+    <record id="view_family_member_tree_inherit" model="ir.ui.view">
+        <field name="name">family.member.tree.inherit</field>
+        <field name="model">family.member</field>
+        <field name="inherit_id" ref="odex_benefit.family_member_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='member_status']" position="after">
+                <field name="kafala_status"  widget="badge"
+                       decoration-success="kafala_status == 'have_kafala'"
+                       decoration-danger="kafala_status == 'have_not_kafala'"/>
+            </xpath>
+        </field>
+    </record>
 </odoo>
\ No newline at end of file
diff --git a/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml b/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
index 500b06a7d..b625f19a7 100644
--- a/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
+++ b/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
@@ -487,7 +487,7 @@
                                             <page string="Orphans and Widows List"
                                                   attrs="{'invisible': [('sponsorship_type', '!=', 'group')]}">
                                                 <!--                                                  attrs="{'invisible': ['|', '|', '|', ('hide_beneficiary_group','=', True), ('parent.record_type','!=','sponsorship'), ('sponsorship_type', '!=', 'group'), ('benefit_type', '!=', 'both')]}">-->
-                                                <field name="benefit_ids" nolabel="1">
+                                                <field name="benefit_ids" nolabel="1" options="{'no_create': True}">
                                                     <tree editable="bottom">
                                                         <field name="name"/>
                                                         <field name="age"/>

From f05b27b2af47b28cfd2921e3111d5dd9bb79896b Mon Sep 17 00:00:00 2001
From: Nossibaelhadi <N.Alhadi@exp-sa.com>
Date: Tue, 4 Nov 2025 02:04:49 +0300
Subject: [PATCH 07/16] FIX benefit kakala status hava kafala

---
 .../odex_takaful/wizards/account_payment_register.py        | 6 ++++--
 .../odex_takaful/wizards/donation_extension_wizard.py       | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/odex25_ensan/odex_takaful/wizards/account_payment_register.py b/odex25_ensan/odex_takaful/wizards/account_payment_register.py
index f04d0698c..81163b174 100644
--- a/odex25_ensan/odex_takaful/wizards/account_payment_register.py
+++ b/odex25_ensan/odex_takaful/wizards/account_payment_register.py
@@ -126,13 +126,15 @@ class AccountRegisterPayment(models.TransientModel):
                     line.benefit_ids.write({
                         'sponsor_related_id': line.sponsorship_mechanism_id.sponsor_id.id,
                         'sponsorship_id': line.sponsorship_mechanism_id.id,
-                        'sponsorship_end_date': line.end_date if line.end_date else False
+                        'sponsorship_end_date': line.end_date if line.end_date else False,
+                        'kafala_status': 'have_kafala',
                     })
                 if line.sponsorship_type == 'person':
                     line.benefit_id.write({
                         'sponsor_related_id': line.sponsorship_mechanism_id.sponsor_id.id,
                         'sponsorship_id': line.sponsorship_mechanism_id.id,
-                        'sponsorship_end_date': line.end_date if line.end_date else False
+                        'sponsorship_end_date': line.end_date if line.end_date else False,
+                        'kafala_status': 'have_kafala',
                     })
                 line.sponsorship_mechanism_id.sponsor_id.sudo().is_sponsor_portal = True
 
diff --git a/odex25_ensan/odex_takaful/wizards/donation_extension_wizard.py b/odex25_ensan/odex_takaful/wizards/donation_extension_wizard.py
index 87093ea7f..556b28873 100644
--- a/odex25_ensan/odex_takaful/wizards/donation_extension_wizard.py
+++ b/odex25_ensan/odex_takaful/wizards/donation_extension_wizard.py
@@ -197,6 +197,7 @@ class DonationExtensionWizardLine(models.TransientModel):
         benefit_ids = self.donation_line_id.benefit_ids | self.donation_line_id.benefit_id
         benefit_ids.write({
             'sponsorship_end_date': new_end_date,
+            'kafala_status': 'have_kafala',
         })
         
         # Create new scheduling lines for the extension period

From 18d4797d914bfdf815e5c9f3764eae55606789b3 Mon Sep 17 00:00:00 2001
From: eslamtalaat74 <I.Talaat@exp-sa.com>
Date: Tue, 4 Nov 2025 08:54:08 +0200
Subject: [PATCH 08/16] benf category

---
 odex25_ensan/odex_benefit/i18n/ar_001.po         |  3 ---
 .../odex_benefit/security/security_view.xml      | 16 ++++++++--------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/odex25_ensan/odex_benefit/i18n/ar_001.po b/odex25_ensan/odex_benefit/i18n/ar_001.po
index f3ffbd9eb..751f8e08a 100644
--- a/odex25_ensan/odex_benefit/i18n/ar_001.po
+++ b/odex25_ensan/odex_benefit/i18n/ar_001.po
@@ -2016,9 +2016,6 @@ msgstr "بيانات المستفيدين"
 msgid "Beneficiaries Management"
 msgstr "فئات المستفيدين"
 
-
-
-
 #. module: odex_benefit
 #: model:res.groups,name:odex_benefit.group_benefit_manager
 msgid "Beneficiaries Manager"
diff --git a/odex25_ensan/odex_benefit/security/security_view.xml b/odex25_ensan/odex_benefit/security/security_view.xml
index aaf8c7b4b..127907e9c 100644
--- a/odex25_ensan/odex_benefit/security/security_view.xml
+++ b/odex25_ensan/odex_benefit/security/security_view.xml
@@ -6,14 +6,14 @@
             <field name="sequence">1</field>
         </record>
 
-        <record id="translation_benefit_ar" model="ir.translation">
-            <field name="name">ir.module.category,name</field>
-            <field name="lang">ar_001</field>
-            <field name="type">model</field>
-            <field name="res_id" eval="ref('module_category_benefit')"/>
-            <field name="src">Beneficiaries Management</field>
-            <field name="value">فئات المستفيدين</field>
-        </record>
+<!--       record <record id="translation_benefit_ar" model="ir.translation">-->
+<!--            <field name="name">ir.module.category,name</field>-->
+<!--            <field name="lang">ar_001</field>-->
+<!--            <field name="type">model</field>-->
+<!--            <field name="res_id" eval="ref('module_category_benefit')"/>-->
+<!--            <field name="src">Beneficiaries Management</field>-->
+<!--            <field name="value">فئات المستفيدين</field>-->
+<!--        </record>-->
 
         <!--        <record id="group_benefit_user" model="res.groups">-->
         <!--            <field name="name">Beneficiaries User</field>-->

From 61829af57650bc037cc07a8890013cb445c117f3 Mon Sep 17 00:00:00 2001
From: Nossibaelhadi <N.Alhadi@exp-sa.com>
Date: Tue, 4 Nov 2025 15:06:43 +0300
Subject: [PATCH 09/16] FIX customer notes and kafala info

---
 .../odex_benefit/models/family_members.py     |  4 +---
 odex25_ensan/odex_takaful/i18n/ar_001.po      | 15 ++++++++++++
 .../odex_takaful/models/family_member.py      |  3 +++
 .../models/takaful_sponorship_model.py        |  5 ++++
 .../odex_takaful/views/family_member.xml      | 23 +++++++++++++++----
 5 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/odex25_ensan/odex_benefit/models/family_members.py b/odex25_ensan/odex_benefit/models/family_members.py
index ed6315b9f..4fed4ac85 100644
--- a/odex25_ensan/odex_benefit/models/family_members.py
+++ b/odex25_ensan/odex_benefit/models/family_members.py
@@ -251,9 +251,7 @@ class FamilyMemberProfile(models.Model):
                                       default='auto')
     is_member_workflow = fields.Boolean('Is Member Workflow?')
     # sponsor_id = fields.Many2one('res.partner', string='Sponsor Partner',domain="[('account_type','=','sponsor')]")
-    sponsor_id = fields.Many2one('res.partner', string='Sponsor Partner', domain="[('is_sponsor_portal', '=', True)]")
-    sponsor_related_id = fields.Many2one('res.partner', string='Sponsor')
-    sponsorship_id = fields.Many2one('takaful.sponsorship', string='Sponsorship')
+
     required_attach = fields.Selection(selection=[('true', 'True'), ('false', 'False')], compute='get_required_attach',
                                        store=True, string='Member Required Attach')
     # Exception fields
diff --git a/odex25_ensan/odex_takaful/i18n/ar_001.po b/odex25_ensan/odex_takaful/i18n/ar_001.po
index 5f2b6b44c..145f1de36 100644
--- a/odex25_ensan/odex_takaful/i18n/ar_001.po
+++ b/odex25_ensan/odex_takaful/i18n/ar_001.po
@@ -7278,3 +7278,18 @@ msgstr "مكفول"
 msgid "Have not Kafala"
 msgstr "غير مكفول"
 
+
+#. module: odex_takaful
+#: code:addons/odex_takaful/models/takaful_sponorship_model.py:0
+#, python-format
+msgid "Please Check The Amount  in donation Line!"
+msgstr "مبلغ التبرع صفر الرجاء ادخال قيمة لمبلغ التبرع"
+
+
+#. module: odex_takaful
+#: model_terms:ir.ui.view,arch_db:odex_takaful.family_member_form_inherit_donation_button
+msgid "Kafala Information"
+msgstr ""
+
+
+
diff --git a/odex25_ensan/odex_takaful/models/family_member.py b/odex25_ensan/odex_takaful/models/family_member.py
index a75436b14..22a0bca4f 100644
--- a/odex25_ensan/odex_takaful/models/family_member.py
+++ b/odex25_ensan/odex_takaful/models/family_member.py
@@ -10,6 +10,9 @@ class FamilyMember(models.Model):
         string='Donation Details',
         compute='_compute_donation_details_count'
     )
+    sponsor_id = fields.Many2one('res.partner', string='Sponsor Partner', domain="[('is_sponsor_portal', '=', True)]")
+    sponsor_related_id = fields.Many2one('res.partner', string='Sponsor')
+    sponsorship_id = fields.Many2one('takaful.sponsorship', string='Sponsorship')
     sponsorship_end_date = fields.Date(string='Sponsorship End Date')
     is_restricted = fields.Boolean(string="Is Restricted ?", default=False, readonly=True)
     general_restriction = fields.Boolean(string="General Restriction", default=False, readonly=True)
diff --git a/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py b/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
index 1dab9c8c7..dff56d120 100644
--- a/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
+++ b/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py
@@ -1181,6 +1181,11 @@ class TakafulSponsorship(models.Model):
             raise ValidationError(
                 _("Please add at least one line in donation details!")
             )
+        #Check if The Total Amount is not Zero
+        if self.total_sponsorship_amount == 0:
+            raise ValidationError(
+                _("Please Check The Amount  in donation Line!")
+            )
 
         all_donation_lines = (self.donations_details_lines + self.donations_details_lines_mechanism_ids).filtered(
             lambda r: r.display_type == False)
diff --git a/odex25_ensan/odex_takaful/views/family_member.xml b/odex25_ensan/odex_takaful/views/family_member.xml
index b0f43d22d..a01667586 100644
--- a/odex25_ensan/odex_takaful/views/family_member.xml
+++ b/odex25_ensan/odex_takaful/views/family_member.xml
@@ -13,11 +13,24 @@
                            widget="statinfo"/>
                 </button>
             </xpath>
-            <xpath expr="//field[@name='sponsor_related_id']" position="after">
-                <field name="sponsorship_end_date" readonly="1"/>
-                <field name="is_restricted" widget="boolean_toggle"/>
-                <field name="general_restriction" widget="boolean_toggle"/>
-                <field name="kafala_status" readonly="1"/>
+            <xpath expr="//page[4]" position="after">
+                <page name="kafala_info" string="Kafala Information">
+                    <group>
+                        <field name="sponsor_related_id"
+                                           readonly="1"/>
+                        <field name="sponsor_id"
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info'])]}"
+                                               invisible="1"/>
+                        <field name="sponsorship_id" invisible="1"
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info'])]}"/>
+
+                        <field name="sponsorship_end_date" readonly="1"/>
+                        <field name="is_restricted" widget="boolean_toggle"/>
+                        <field name="general_restriction" widget="boolean_toggle"/>
+                        <field name="kafala_status" readonly="1"/>
+                    </group>
+
+                </page>
 
             </xpath>
 

From 54a8dd6f2a5a2e746551242f8df4e6076dbfb523 Mon Sep 17 00:00:00 2001
From: Nossibaelhadi <N.Alhadi@exp-sa.com>
Date: Tue, 4 Nov 2025 15:09:36 +0300
Subject: [PATCH 10/16] =?UTF-8?q?FIX=20customer=20notes=20and=20kafala=20i?=
 =?UTF-8?q?nfo=20=D9=81tran?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 odex25_ensan/odex_takaful/i18n/ar_001.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_ensan/odex_takaful/i18n/ar_001.po b/odex25_ensan/odex_takaful/i18n/ar_001.po
index 145f1de36..c9dcefb5d 100644
--- a/odex25_ensan/odex_takaful/i18n/ar_001.po
+++ b/odex25_ensan/odex_takaful/i18n/ar_001.po
@@ -7289,7 +7289,7 @@ msgstr "مبلغ التبرع صفر الرجاء ادخال قيمة لمبلغ
 #. module: odex_takaful
 #: model_terms:ir.ui.view,arch_db:odex_takaful.family_member_form_inherit_donation_button
 msgid "Kafala Information"
-msgstr ""
+msgstr "بيانات الكفالة"
 
 
 

From 5e880f435650499bb37b3f514a67fc5bb2629a3e Mon Sep 17 00:00:00 2001
From: Altahir Hassan <altexp@exp-sa.com>
Date: Tue, 4 Nov 2025 16:55:16 +0400
Subject: [PATCH 11/16] REMOVE unnecessary class from tree view in sponsorship
 form

---
 odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml b/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
index b625f19a7..5d18333d2 100644
--- a/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
+++ b/odex25_ensan/odex_takaful/views/takaful_sponorship_view.xml
@@ -187,7 +187,7 @@
                                        context="{'default_active_id': active_id,'default_donation_mechanism': 'without_conditions','default_start_date': sponsorship_creation_date}"
                                        widget="section_and_note_one2many"
                                        attrs="{'invisible': ['|',('donation_mechanism', '=', 'with_conditions'),('record_type', '!=', 'donation')], 'readonly': [('state','!=','draft')]}">
-                                    <tree editable="bottom" class="fix_overflow">
+                                    <tree editable="bottom">
                                         <control>
                                             <create name="add_line_control" string="Add a line"/>
                                             <create name="add_section_control" string="Add a section"

From e7a4b76b86741f8a4d983a022bb7c9378f90cfb1 Mon Sep 17 00:00:00 2001
From: Nossibaelhadi <N.Alhadi@exp-sa.com>
Date: Tue, 4 Nov 2025 16:38:16 +0300
Subject: [PATCH 12/16] FIX inhert from account move

---
 odex25_ensan/odex_takaful/views/acount_move.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 odex25_ensan/odex_takaful/views/acount_move.xml

diff --git a/odex25_ensan/odex_takaful/views/acount_move.xml b/odex25_ensan/odex_takaful/views/acount_move.xml
new file mode 100644
index 000000000..e69de29bb

From 11b7b8839539b56f740ab087a8c35c4763db26de Mon Sep 17 00:00:00 2001
From: Nossibaelhadi <N.Alhadi@exp-sa.com>
Date: Tue, 4 Nov 2025 16:39:06 +0300
Subject: [PATCH 13/16] FIX inhert from account move

---
 odex25_ensan/odex_takaful/views/acount_move.xml   | 15 +++++++++++++++
 odex25_ensan/odex_takaful/views/family_member.xml |  9 ++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/odex25_ensan/odex_takaful/views/acount_move.xml b/odex25_ensan/odex_takaful/views/acount_move.xml
index e69de29bb..81ac722c6 100644
--- a/odex25_ensan/odex_takaful/views/acount_move.xml
+++ b/odex25_ensan/odex_takaful/views/acount_move.xml
@@ -0,0 +1,15 @@
+<odoo>
+    <!-- Inherit  form account move  view -->
+<record id="takaful_account_move_inherit_form" model="ir.ui.view">
+      <field name="name">takaful.account.move.inherit.form</field>
+      <field name="model">account.move</field>
+      <field name="inherit_id" ref="account.view_move_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="//field[@name='invoice_origin']" position="attributes">
+            <attribute name="attrs">{'invisible': False}</attribute>
+        </xpath>
+
+
+      </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/odex25_ensan/odex_takaful/views/family_member.xml b/odex25_ensan/odex_takaful/views/family_member.xml
index a01667586..d10e6af69 100644
--- a/odex25_ensan/odex_takaful/views/family_member.xml
+++ b/odex25_ensan/odex_takaful/views/family_member.xml
@@ -13,21 +13,28 @@
                            widget="statinfo"/>
                 </button>
             </xpath>
+            <xpath expr="//field[@name='sponsor_related_id']" position="replace">
+
+                <field name="sponsor_related_id" readonly="1" invisible="1"/>
+            </xpath>
             <xpath expr="//page[4]" position="after">
                 <page name="kafala_info" string="Kafala Information">
                     <group>
+                        <field name="kafala_status" readonly="1"/>
                         <field name="sponsor_related_id"
                                            readonly="1"/>
                         <field name="sponsor_id"
                                                attrs="{'readonly':[('state','not in',['draft','complete_info'])]}"
                                                invisible="1"/>
+
                         <field name="sponsorship_id" invisible="1"
                                                attrs="{'readonly':[('state','not in',['draft','complete_info'])]}"/>
 
                         <field name="sponsorship_end_date" readonly="1"/>
+                    </group>
+                    <group>
                         <field name="is_restricted" widget="boolean_toggle"/>
                         <field name="general_restriction" widget="boolean_toggle"/>
-                        <field name="kafala_status" readonly="1"/>
                     </group>
 
                 </page>

From dcdb4511678533a373b1200a06a48db7d613f714 Mon Sep 17 00:00:00 2001
From: Altahir Hassan <altexp@exp-sa.com>
Date: Tue, 4 Nov 2025 17:42:59 +0400
Subject: [PATCH 14/16] ADD Arabic translations for donation messages and UI
 elements in odex_takaful module

---
 odex25_ensan/odex_takaful/i18n/ar_001.po | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/odex25_ensan/odex_takaful/i18n/ar_001.po b/odex25_ensan/odex_takaful/i18n/ar_001.po
index c9dcefb5d..b4c641cb8 100644
--- a/odex25_ensan/odex_takaful/i18n/ar_001.po
+++ b/odex25_ensan/odex_takaful/i18n/ar_001.po
@@ -7278,13 +7278,30 @@ msgstr "مكفول"
 msgid "Have not Kafala"
 msgstr "غير مكفول"
 
-
 #. module: odex_takaful
 #: code:addons/odex_takaful/models/takaful_sponorship_model.py:0
 #, python-format
 msgid "Please Check The Amount  in donation Line!"
 msgstr "مبلغ التبرع صفر الرجاء ادخال قيمة لمبلغ التبرع"
 
+#. module: odex_takaful
+#: model_terms:ir.ui.view,arch_db:odex_takaful.product_product_view_kanban
+msgid "<i class=\"fa fa-minus center\" title=\"Decrease\"/>"
+msgstr "<i class=\"fa fa-minus center\" title=\"أنقص\"/>"
+
+#. module: odex_takaful
+#: model_terms:ir.ui.view,arch_db:odex_takaful.product_product_view_kanban
+msgid "<i class=\"fa fa-plus\" title=\"Increase\"/>"
+msgstr "<i class=\"fa fa-plus\" title=\"زد\"/>"
+
+#. module: odex_takaful
+#: model_terms:ir.ui.view,arch_db:odex_takaful.product_template_view_kanban_odex_takaful
+msgid ""
+"<i class=\"fa fa-shopping-cart\"/>\n"
+"                                            <span>Add</span>"
+msgstr ""
+"<i class=\"fa fa-shopping-cart\"/>\n"
+"                                            <span>إضافة</span>"
 
 #. module: odex_takaful
 #: model_terms:ir.ui.view,arch_db:odex_takaful.family_member_form_inherit_donation_button

From 3fa9b6f1cc1d6ec9c8220a699c0dce0962e09078 Mon Sep 17 00:00:00 2001
From: Nossibaelhadi <N.Alhadi@exp-sa.com>
Date: Tue, 4 Nov 2025 17:09:17 +0300
Subject: [PATCH 15/16] FIX inhert from account move to view invoice_origin

---
 odex25_ensan/odex_takaful/views/acount_move.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_ensan/odex_takaful/views/acount_move.xml b/odex25_ensan/odex_takaful/views/acount_move.xml
index 81ac722c6..5f11baa99 100644
--- a/odex25_ensan/odex_takaful/views/acount_move.xml
+++ b/odex25_ensan/odex_takaful/views/acount_move.xml
@@ -7,6 +7,7 @@
       <field name="arch" type="xml">
         <xpath expr="//field[@name='invoice_origin']" position="attributes">
             <attribute name="attrs">{'invisible': False}</attribute>
+
         </xpath>
 
 

From 6ebd8e6257982e2d460305f3b467375baa980fd4 Mon Sep 17 00:00:00 2001
From: Nossibaelhadi <N.Alhadi@exp-sa.com>
Date: Tue, 4 Nov 2025 17:22:50 +0300
Subject: [PATCH 16/16] FIX family member kafala field

---
 odex25_ensan/odex_benefit/models/family_members.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/odex25_ensan/odex_benefit/models/family_members.py b/odex25_ensan/odex_benefit/models/family_members.py
index 4fed4ac85..ed6315b9f 100644
--- a/odex25_ensan/odex_benefit/models/family_members.py
+++ b/odex25_ensan/odex_benefit/models/family_members.py
@@ -251,7 +251,9 @@ class FamilyMemberProfile(models.Model):
                                       default='auto')
     is_member_workflow = fields.Boolean('Is Member Workflow?')
     # sponsor_id = fields.Many2one('res.partner', string='Sponsor Partner',domain="[('account_type','=','sponsor')]")
-
+    sponsor_id = fields.Many2one('res.partner', string='Sponsor Partner', domain="[('is_sponsor_portal', '=', True)]")
+    sponsor_related_id = fields.Many2one('res.partner', string='Sponsor')
+    sponsorship_id = fields.Many2one('takaful.sponsorship', string='Sponsorship')
     required_attach = fields.Selection(selection=[('true', 'True'), ('false', 'False')], compute='get_required_attach',
                                        store=True, string='Member Required Attach')
     # Exception fields