From 0f6ea9f5466a60d2dd26ba6d5198e19a338b5c20 Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Sun, 25 Jan 2026 14:48:45 +0100
Subject: [PATCH 1/5] [UPD] odex_takaful

---
 .../odex_takaful/security/security_data.xml        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/odex25_takaful/odex_takaful/security/security_data.xml b/odex25_takaful/odex_takaful/security/security_data.xml
index 632c44b54..446fdb34e 100644
--- a/odex25_takaful/odex_takaful/security/security_data.xml
+++ b/odex25_takaful/odex_takaful/security/security_data.xml
@@ -163,7 +163,7 @@
             <field name="domain_force">[
                 '|', 
                     ('branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]), 
-                    ('branch_custom_id.branch', 'child_of', user.employee_id.department_id.id)
+                    ('branch_custom_id', 'child_of', user.branch_custom_id.id)
             ]</field>
         </record>
 
@@ -174,10 +174,10 @@
             <field name="domain_force">[
                 '|', '|', '|',
                     ('sponsorship_id.branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]),
-                    ('sponsorship_id.branch_custom_id.branch', 'child_of', user.employee_id.department_id.id),
+                    ('sponsorship_id.branch_custom_id', 'child_of', user.branch_custom_id.id),
 
                     ('sponsorship_mechanism_id.branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]),
-                    ('sponsorship_mechanism_id.branch_custom_id.branch', 'child_of', user.employee_id.department_id.id)
+                    ('sponsorship_mechanism_id.branch_custom_id', 'child_of', user.branch_custom_id.id)
             ]</field>
         </record>
 
@@ -189,11 +189,11 @@
                 '|', '|', '|', '|', 
                     ('create_uid', '=', user.id),
 
-                    ('create_uid.employee_id.department_id.manager_id.user_id', 'in', [user.id, False]),
-                    ('create_uid.employee_id.department_id', 'child_of', user.employee_id.department_id.id),
+                    ('create_uid.branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]),
+                    ('create_uid.branch_custom_id', 'child_of', user.branch_custom_id.id),
 
                     ('sponsorship_id.branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]),
-                    ('sponsorship_id.branch_custom_id.branch', 'child_of', user.employee_id.department_id.id)
+                    ('sponsorship_id.branch_custom_id', 'child_of', user.branch_custom_id.id)
             ]</field>
         </record>
         
@@ -201,7 +201,7 @@
             <field name="name">Sponsor - Department Based Access</field>
             <field name="model_id" ref="odex_takaful.model_takaful_sponsor"/>
             <field name="groups" eval="[(4, ref('group_sponsor_department_access')), (4, ref('branch_manager_group'))]"/>
-            <field name="domain_force">[('branch_custom_id.branch', 'child_of', user.employee_id.department_id.id)]</field>
+            <field name="domain_force">[('branch_custom_id', 'child_of', user.branch_custom_id.id)]</field>
         </record>
 
         <record id="sponsorship_system_manager_restrictions" model="ir.rule">

From 7cb8325c42d36b298e13beac500e58e43e9d9457 Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Sun, 25 Jan 2026 15:11:37 +0100
Subject: [PATCH 2/5] [UPD] odex_takaful

---
 odex25_takaful/odex_takaful/i18n/ar_001.po             | 7 ++++++-
 odex25_takaful/odex_takaful/security/security_data.xml | 7 ++++++-
 odex25_takaful/odex_takaful/wizards/esterdad.py        | 2 ++
 odex25_takaful/odex_takaful/wizards/esterdad.xml       | 3 ++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/odex25_takaful/odex_takaful/i18n/ar_001.po b/odex25_takaful/odex_takaful/i18n/ar_001.po
index a6fcb3bdd..a8feb19c9 100644
--- a/odex25_takaful/odex_takaful/i18n/ar_001.po
+++ b/odex25_takaful/odex_takaful/i18n/ar_001.po
@@ -7586,4 +7586,9 @@ msgstr "طباعة تقرير أم اليتيم/اليتيم"
 #. module: odex_takaful
 #: model_terms:ir.ui.view,arch_db:odex_takaful.takaful_account_move_inherit_form
 msgid "Previous Payments"
-msgstr "المدفوعات السابقة"
\ No newline at end of file
+msgstr "المدفوعات السابقة"
+
+#. module: odex_takaful
+#: model:res.groups,name:odex_takaful.group_refund_change_mobile
+msgid "Change Sponsor Mobile in Refund Wizard"
+msgstr "تغيير جوال الكافل في معالج الاسترداد"
diff --git a/odex25_takaful/odex_takaful/security/security_data.xml b/odex25_takaful/odex_takaful/security/security_data.xml
index 446fdb34e..4337fd02c 100644
--- a/odex25_takaful/odex_takaful/security/security_data.xml
+++ b/odex25_takaful/odex_takaful/security/security_data.xml
@@ -92,11 +92,16 @@
             <field name="implied_ids" eval="[(6, 0, [ref('group_kufula_user')])]"/>
         </record>
 
-         <record id="group_sponsor_department_access" model="res.groups">
+        <record id="group_sponsor_department_access" model="res.groups">
             <field name="name">Sponsor - Department Access</field>
             <field name="category_id" ref="module_category_kufula"/>
         </record>
 
+        <record id="group_refund_change_mobile" model="res.groups">
+            <field name="name">Change Sponsor Mobile in Refund Wizard</field>
+            <field name="category_id" ref="module_category_kufula"/>
+        </record>
+
         <record id="donation_officer_restrictions" model="ir.rule">
             <field name="name">Donations Officer: Own Donations</field>
             <field name="model_id" ref="model_takaful_sponsorship"/>
diff --git a/odex25_takaful/odex_takaful/wizards/esterdad.py b/odex25_takaful/odex_takaful/wizards/esterdad.py
index 87fce8937..f960ef6cc 100644
--- a/odex25_takaful/odex_takaful/wizards/esterdad.py
+++ b/odex25_takaful/odex_takaful/wizards/esterdad.py
@@ -149,6 +149,8 @@ class EsterdadWizard(models.Model):
                 })
                 if rec.sponsor_id.sponsor_or_donor_type == 'unknown' and not rec.sponsor_id.sponsor_phone:
                     rec.sponsor_id.sponsor_phone = rec.mobile
+                if rec.sponsor_id.sponsor_or_donor_type == 'registered' and rec.id_num:
+                    rec.sponsor_id.sponsor_id.id_number == rec.id_num
                 # context['default_payment_ids'] = [(6, 0, rec.payment_ids.ids)]
                 view = self.env.ref('odex_takaful.view_otp_wizard_form')
                 return {
diff --git a/odex25_takaful/odex_takaful/wizards/esterdad.xml b/odex25_takaful/odex_takaful/wizards/esterdad.xml
index 917749770..d9f11387d 100644
--- a/odex25_takaful/odex_takaful/wizards/esterdad.xml
+++ b/odex25_takaful/odex_takaful/wizards/esterdad.xml
@@ -50,7 +50,8 @@
                         <page string="بيانات المتبرع">
                             <group>
                                 <field name="sponsor_name"/>
-                                <field name="mobile"/>
+                                <field name="mobile" groups="odex_takaful.group_refund_change_mobile" />
+                                <field name="mobile" groups="!odex_takaful.group_refund_change_mobile" readonly="1" />
                                 <field name="id_num"/>
                             </group>
                         </page>

From 0a0499a873e01b08817f4afb17b8ad0062d79263 Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Sun, 25 Jan 2026 15:14:07 +0100
Subject: [PATCH 3/5] [UPD] odex_takaful

---
 odex25_takaful/odex_takaful/wizards/esterdad.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/odex25_takaful/odex_takaful/wizards/esterdad.py b/odex25_takaful/odex_takaful/wizards/esterdad.py
index f960ef6cc..1627b17be 100644
--- a/odex25_takaful/odex_takaful/wizards/esterdad.py
+++ b/odex25_takaful/odex_takaful/wizards/esterdad.py
@@ -147,6 +147,9 @@ class EsterdadWizard(models.Model):
                 rec.sponsor_id.write({  
                     'cancel_record_id': rec.id
                 })
+                rec.sponsor_id.sponsor_id.write({  
+                    'first_name': rec.sponsor_name
+                })
                 if rec.sponsor_id.sponsor_or_donor_type == 'unknown' and not rec.sponsor_id.sponsor_phone:
                     rec.sponsor_id.sponsor_phone = rec.mobile
                 if rec.sponsor_id.sponsor_or_donor_type == 'registered' and rec.id_num:

From 75c029699f612ef4c246403cede2955f5ac27da2 Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Sun, 25 Jan 2026 16:13:58 +0100
Subject: [PATCH 4/5] [FIX] odex_takaful

---
 .../odex_takaful/reports/extension_receipt_report.xml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/odex25_takaful/odex_takaful/reports/extension_receipt_report.xml b/odex25_takaful/odex_takaful/reports/extension_receipt_report.xml
index 78db5836c..1a745e6eb 100644
--- a/odex25_takaful/odex_takaful/reports/extension_receipt_report.xml
+++ b/odex25_takaful/odex_takaful/reports/extension_receipt_report.xml
@@ -6,8 +6,8 @@
         <t t-call="web.html_container">
             <!-- Get all extension history records for the same invoice -->
             <t t-foreach="docs" t-as="o">
-                <t t-set="invoice_id" t-value="o.invoice_id"/>
-                <t t-set="sponsorship" t-value="o.donation_detail_id.sponsorship_mechanism_id"/>
+                <t t-set="invoice_id" t-value="o.invoice_id.sudo()"/>
+                <t t-set="sponsorship" t-value="o.donation_detail_id.sudo().sponsorship_mechanism_id"/>
             
                 <t t-if="sponsorship">
                     <!-- Reuse sale order header layout -->

From 46e32a48daa5500f54b5823638a4fb39d3162200 Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Sun, 25 Jan 2026 19:02:43 +0100
Subject: [PATCH 5/5] [FIX] odex_takaful

---
 .../reports/extension_receipt_report.xml             |  5 +++--
 .../odex_takaful/security/security_data.xml          | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/odex25_takaful/odex_takaful/reports/extension_receipt_report.xml b/odex25_takaful/odex_takaful/reports/extension_receipt_report.xml
index 1a745e6eb..3e7a1e585 100644
--- a/odex25_takaful/odex_takaful/reports/extension_receipt_report.xml
+++ b/odex25_takaful/odex_takaful/reports/extension_receipt_report.xml
@@ -6,8 +6,9 @@
         <t t-call="web.html_container">
             <!-- Get all extension history records for the same invoice -->
             <t t-foreach="docs" t-as="o">
-                <t t-set="invoice_id" t-value="o.invoice_id.sudo()"/>
-                <t t-set="sponsorship" t-value="o.donation_detail_id.sudo().sponsorship_mechanism_id"/>
+                <t t-set="o" t-value="o.sudo()"/>
+                <t t-set="invoice_id" t-value="o.invoice_id"/>
+                <t t-set="sponsorship" t-value="o.donation_detail_id.sponsorship_mechanism_id"/>
             
                 <t t-if="sponsorship">
                     <!-- Reuse sale order header layout -->
diff --git a/odex25_takaful/odex_takaful/security/security_data.xml b/odex25_takaful/odex_takaful/security/security_data.xml
index 4337fd02c..8d0e3563e 100644
--- a/odex25_takaful/odex_takaful/security/security_data.xml
+++ b/odex25_takaful/odex_takaful/security/security_data.xml
@@ -168,7 +168,7 @@
             <field name="domain_force">[
                 '|', 
                     ('branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]), 
-                    ('branch_custom_id', 'child_of', user.branch_custom_id.id)
+                    ('branch_custom_id', '=', user.branch_custom_id.id)
             ]</field>
         </record>
 
@@ -179,10 +179,10 @@
             <field name="domain_force">[
                 '|', '|', '|',
                     ('sponsorship_id.branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]),
-                    ('sponsorship_id.branch_custom_id', 'child_of', user.branch_custom_id.id),
+                    ('sponsorship_id.branch_custom_id', '=', user.branch_custom_id.id),
 
                     ('sponsorship_mechanism_id.branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]),
-                    ('sponsorship_mechanism_id.branch_custom_id', 'child_of', user.branch_custom_id.id)
+                    ('sponsorship_mechanism_id.branch_custom_id', '=', user.branch_custom_id.id)
             ]</field>
         </record>
 
@@ -195,10 +195,10 @@
                     ('create_uid', '=', user.id),
 
                     ('create_uid.branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]),
-                    ('create_uid.branch_custom_id', 'child_of', user.branch_custom_id.id),
+                    ('create_uid.branch_custom_id', '=', user.branch_custom_id.id),
 
                     ('sponsorship_id.branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False]),
-                    ('sponsorship_id.branch_custom_id', 'child_of', user.branch_custom_id.id)
+                    ('sponsorship_id.branch_custom_id', '=', user.branch_custom_id.id)
             ]</field>
         </record>
         
@@ -206,7 +206,7 @@
             <field name="name">Sponsor - Department Based Access</field>
             <field name="model_id" ref="odex_takaful.model_takaful_sponsor"/>
             <field name="groups" eval="[(4, ref('group_sponsor_department_access')), (4, ref('branch_manager_group'))]"/>
-            <field name="domain_force">[('branch_custom_id', 'child_of', user.branch_custom_id.id)]</field>
+            <field name="domain_force">[('branch_custom_id', '=', user.branch_custom_id.id)]</field>
         </record>
 
         <record id="sponsorship_system_manager_restrictions" model="ir.rule">