From cb0ff78a90c3ffbf61f0f5153f288e48a7180403 Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Thu, 15 Jan 2026 11:31:57 +0100
Subject: [PATCH] [FIX] odex_takaful

---
 odex25_takaful/odex_takaful/i18n/ar_001.po    |  17 +
 .../odex_takaful/security/ir.model.access.csv |  92 +++---
 .../odex_takaful/security/security_data.xml   | 302 +++++-------------
 .../views/donations_details_lines.xml         |   2 +-
 .../views/takaful_menus_actions.xml           |   5 +-
 5 files changed, 149 insertions(+), 269 deletions(-)

diff --git a/odex25_takaful/odex_takaful/i18n/ar_001.po b/odex25_takaful/odex_takaful/i18n/ar_001.po
index 1a803b36a..9506460ba 100644
--- a/odex25_takaful/odex_takaful/i18n/ar_001.po
+++ b/odex25_takaful/odex_takaful/i18n/ar_001.po
@@ -4901,6 +4901,11 @@ msgstr "طباعة ورقة البنك"
 msgid "Print Excel"
 msgstr "طباعة Excel"
 
+#. module: odex_takaful
+#: model_terms:ir.ui.view,arch_db:odex_takaful.donation_extension_history_form
+msgid "Print Extension Receipt"
+msgstr "طباعة السند"
+
 #. module: odex_takaful
 #: model_terms:ir.ui.view,arch_db:odex_takaful.sponsor_report_menu_form
 #: model_terms:ir.ui.view,arch_db:odex_takaful.transfer_deduction_wizard_form_view
@@ -7466,6 +7471,18 @@ msgstr "شيك"
 msgid "Direct Debit"
 msgstr "استقطاع"
 
+#. module: odex_takaful
+#: model:ir.model.fields,field_description:odex_takaful.field_account_payment__direct_debit
+#: model:ir.model.fields,field_description:odex_takaful.field_donation_extension_wizard_line__direct_debit
+#: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__direct_debit
+#: model:ir.model.fields,field_description:odex_takaful.field_sponsorship_scheduling_line__direct_debit
+#: model:ir.model.fields.selection,name:odex_takaful.selection__account_payment_register__takaful_payment_method__direct_debit
+#: model:ir.model.fields.selection,name:odex_takaful.selection__donations_details_lines__direct_debit_filter__direct
+#: model_terms:ir.ui.view,arch_db:odex_takaful.donations_details_lines_view_search
+#: model_terms:ir.ui.view,arch_db:odex_takaful.view_sponsorship_scheduling_line_search
+msgid "Direct Debit"
+msgstr "إستقطاع"
+
 #. module: odex_takaful
 #: code:addons/odex_takaful/static/src/xml/takaful_dashboard.xml:0
 msgid "Network"
diff --git a/odex25_takaful/odex_takaful/security/ir.model.access.csv b/odex25_takaful/odex_takaful/security/ir.model.access.csv
index 8654324a1..25b8c5a55 100644
--- a/odex25_takaful/odex_takaful/security/ir.model.access.csv
+++ b/odex25_takaful/odex_takaful/security/ir.model.access.csv
@@ -1,63 +1,57 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sponsorship_payment_user,Full access on sponsorship.payment to Payment  User,model_sponsorship_payment,group_kufula_user,1,1,1,1
-access_month_payment_full,Full access on month.payment to Month Payment Manager,model_month_payment,odex_takaful.group_kufula_user,1,1,1,1
-access_takaful_message_template,Full access on takaful.message.template,model_takaful_message_template,odex_takaful.group_kufula_user,1,1,1,1
-access_sponsorship_cancellation,Full access on sponsorship.cancellation,model_sponsorship_cancellation,odex_takaful.group_kufula_user,1,1,1,1
-access_takaful_contribution,Full access on takaful.contribution,model_takaful_contribution,odex_takaful.group_kufula_user,1,1,1,1
-access_takaful_push_notification,Full access on takaful.push.notification,model_takaful_push_notification,odex_takaful.group_kufula_user,1,1,1,1
-access_month_payment_line,Full access on month.payment.line,model_month_payment_line,odex_takaful.group_kufula_user,1,1,1,1
-access_sponsorship_benefit_arrears,Full access on sponsorship.benefit.arrears,model_sponsorship_benefit_arrears,odex_takaful.group_kufula_user,1,1,1,1
-access_sponsorship_reason_stop,Full access on sponsorship.reason.stop,model_sponsorship_reason_stop,odex_takaful.group_kufula_user,1,1,1,1
-access_donate_for_another_person,access_donate_for_another_person,model_donate_for_another_person,odex_takaful.group_kufula_user,1,1,1,1
-access_donations_items,access_donations_items,model_donations_items,odex_takaful.group_kufula_user,1,1,1,1
-access_replacement_reasons,access_replacement_reasons,model_replacement_reasons,odex_takaful.group_orphan_replacement,1,1,1,1
-access_replacement_process,access_replacement_process,model_replacement_process,odex_takaful.group_orphan_replacement,1,1,1,0
+access_sponsorship_payment_user,Full access on sponsorship.payment,model_sponsorship_payment,group_kufula_user,1,1,1,1
+access_month_payment_full,Full access on month.payment,model_month_payment,group_kufula_user,1,1,1,1
+access_takaful_message_template,Full access on takaful.message.template,model_takaful_message_template,group_kufula_user,1,1,1,1
+access_sponsorship_cancellation,Full access on sponsorship.cancellation,model_sponsorship_cancellation,group_kufula_user,1,1,1,1
+access_takaful_contribution,Full access on takaful.contribution,model_takaful_contribution,group_kufula_user,1,1,1,1
+access_takaful_push_notification,Full access on takaful.push.notification,model_takaful_push_notification,group_kufula_user,1,1,1,1
+access_month_payment_line,Full access on month.payment.line,model_month_payment_line,group_kufula_user,1,1,1,1
+access_sponsorship_benefit_arrears,Full access on sponsorship.benefit.arrears,model_sponsorship_benefit_arrears,group_kufula_user,1,1,1,1
+access_sponsorship_reason_stop,Full access on sponsorship.reason.stop,model_sponsorship_reason_stop,group_kufula_user,1,1,1,1
+access_donate_for_another_person,access_donate_for_another_person,model_donate_for_another_person,group_kufula_user,1,1,1,1
+access_donations_items,access_donations_items,model_donations_items,group_kufula_user,1,1,1,1
+access_replacement_reasons,access_replacement_reasons,model_replacement_reasons,group_orphan_replacement,1,1,1,1
+access_replacement_process,access_replacement_process,model_replacement_process,group_orphan_replacement,1,1,1,0
 access_takaful_notification,access_takaful_notification,model_takaful_notification,,1,1,1,1
 access_sponsorship_states,access_sponsorship_states,model_sponsorship_states,,1,1,1,1
-
-
 access_replacement_wiz,access_replacement_wiz,model_replacement_wiz,,1,1,1,1
-access_donations_details_lines,access_donations_details_lines,model_donations_details_lines,odex_takaful.group_kufula_user,1,1,1,1
-access_refund_details_lines,access_refund_details_lines,model_refund_details_lines,odex_takaful.group_kufula_user,1,1,1,1
-access_points_of_sale_custom,access_points_of_sale_custom,model_points_of_sale_custom,odex_takaful.group_kufula_user,1,1,1,1
-access_payment_details_lines,access_payment_details_lines,model_payment_details_lines,odex_takaful.group_kufula_user,1,1,1,1
-access_sponsorship_scheduling_line,access_sponsorship_scheduling_line,model_sponsorship_scheduling_line,odex_takaful.group_kufula_user,1,0,0,0
-access_refund_reasons,access_refund_reasons,model_refund_reasons,odex_takaful.group_kufula_user,1,1,1,1
-access_takaful_sponsorship_user,Full access on takaful.sponsorship to Sponsorship User,model_takaful_sponsorship,group_kufula_user,1,1,1,1
-access_res_partner_user,Access on res.pfartner to Sponsorship User,base.model_res_partner,group_kufula_user,1,1,0,0
-access_res_users_user,Access on res.users to Sponsorship User,base.model_res_users,group_kufula_user,1,1,0,0
-access_grant_benefit_invoice,Full access on grant.benefit.invoice to Month Payment Manager,model_grant_benefit_invoice,base.group_user,1,1,1,1
+access_donations_details_lines,access_donations_details_lines,model_donations_details_lines,group_kufula_user,1,1,1,1
+access_refund_details_lines,access_refund_details_lines,model_refund_details_lines,group_kufula_user,1,1,1,1
+access_points_of_sale_custom,access_points_of_sale_custom,model_points_of_sale_custom,group_kufula_user,1,1,1,1
+access_payment_details_lines,access_payment_details_lines,model_payment_details_lines,group_kufula_user,1,1,1,1
+access_sponsorship_scheduling_line,access_sponsorship_scheduling_line,model_sponsorship_scheduling_line,group_kufula_user,1,0,0,0
+access_refund_reasons,access_refund_reasons,model_refund_reasons,group_kufula_user,1,1,1,1
+access_takaful_sponsorship_user,Full access on takaful.sponsorship,model_takaful_sponsorship,group_kufula_user,1,1,1,1
+access_res_partner_user,Access on res.partner,base.model_res_partner,group_kufula_user,1,1,0,0
+access_res_users_user,Access on res.users,base.model_res_users,group_kufula_user,1,1,0,0
+access_grant_benefit_invoice,Full access on grant.benefit.invoice,model_grant_benefit_invoice,base.group_user,1,1,1,1
 access_refund_wiz,access_refund_wiz,model_refund_wiz,,1,1,1,1
 access_add_details_wiz,access_add_details_wiz,model_add_details_wiz,,1,1,1,1
 access_preferred_communication,access_preferred_communication,model_preferred_communication,,1,1,1,1
 access_takaful_payment_method,access_takaful_payment_method,model_takaful_payment_method,,1,1,1,1
 access_replacement_line_method,access_takaful_replacement_line,model_replacement_line,,1,1,1,1
 access_replacement_process_line_method,access_takaful_replacement_process_line,model_replacement_process_line,,1,1,1,1
-
-
 access_transfer_deduction_wizard,transfer.deduction.wizard.access,model_transfer_deduction_wizard,base.group_user,1,1,1,1
-access_account_payment_register_donation_officer,account_payment_register_donation_officer,account.model_account_payment_register,odex_takaful.donation_officer_group,1,1,1,0
-access_product_template_donation_officer,product_template_donation_officer,product.model_product_template,odex_takaful.donation_officer_group,1,1,1,0
-access_product_product_donation_officer,product_product_donation_officer,product.model_product_product,odex_takaful.donation_officer_group,1,1,1,0
-
-access_group_kufula_user_account_payment,access_group_kufula_user_account_payment,account.model_account_payment,odex_takaful.group_kufula_user,1,1,1,0
-access_group_kufula_user_account_partial_reconcile,access_group_kufula_user_account_partial_reconcile,account.model_account_partial_reconcile,odex_takaful.group_kufula_user,1,1,1,0
-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_account_payment_register_donation_officer,account_payment_register_donation_officer,account.model_account_payment_register,donation_officer_group,1,1,1,0
+access_product_template_donation_officer,product_template_donation_officer,product.model_product_template,donation_officer_group,1,1,1,0
+access_product_product_donation_officer,product_product_donation_officer,product.model_product_product,donation_officer_group,1,1,1,0
+access_group_kufula_user_account_payment,access_group_kufula_user_account_payment,account.model_account_payment,group_kufula_user,1,1,1,0
+access_group_kufula_user_account_partial_reconcile,access_group_kufula_user_account_partial_reconcile,account.model_account_partial_reconcile,group_kufula_user,1,1,1,0
+access_group_kufula_user_account_full_reconcile,access_group_kufula_user_account_full_reconcile,account.model_account_full_reconcile,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_donation_replacement_log,donation.replacement.log.access,model_donation_replacement_log,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
-access_add_benefit_wizard,add.benefit.wizard.access,model_add_benefit_wizard,odex_takaful.group_kufula_user,1,1,1,1
-access_extension_payment_wizard_line,extension.payment.wizard.line.access,model_extension_payment_wizard_line,odex_takaful.group_kufula_user,1,1,1,1
-access_group_kufula_user_product_template,access_group_kufula_user_product_template,product.model_product_template,odex_takaful.group_kufula_user,1,1,0,0
-access_group_kufula_user_account_move,access_group_kufula_user_account_move,account.model_account_move,odex_takaful.group_kufula_user,1,1,1,0
-access_group_kufula_user_sale_order,access_group_kufula_user_sale_order,sale.model_sale_order,odex_takaful.group_kufula_user,1,1,1,0
-access_group_kufula_user_grant_benefit,access_group_kufula_user_grant_benefit,odex_benefit.model_grant_benefit,odex_takaful.group_kufula_user,1,1,1,0
-access_group_kufula_user_res_partner,access_group_kufula_user_res_partner,base.model_res_partner,odex_takaful.group_kufula_user,1,1,1,0
-access_replace_benefit_wizard,replace.benefit.wizard.access,model_replace_benefit_wizard,odex_takaful.group_kufula_user,1,1,1,1
+access_donation_extension_history,donation.extension.history.access,model_donation_extension_history,group_kufula_user,1,1,1,0
+access_donation_extension_wizard_line,donation.extension.wizard.line.access,model_donation_extension_wizard_line,group_kufula_user,1,1,1,0
+access_donation_replacement_log,donation.replacement.log.access,model_donation_replacement_log,group_kufula_user,1,1,1,0
+access_replace_sponsor_wizard,replace.sponsor.wizard.access,model_replace_sponsor_wizard,group_replace_sponsor,1,1,1,1
+access_add_benefit_wizard,add.benefit.wizard.access,model_add_benefit_wizard,group_kufula_user,1,1,1,1
+access_extension_payment_wizard_line,extension.payment.wizard.line.access,model_extension_payment_wizard_line,group_kufula_user,1,1,1,1
+access_group_kufula_user_product_template,access_group_kufula_user_product_template,product.model_product_template,group_kufula_user,1,1,0,0
+access_group_kufula_user_account_move,access_group_kufula_user_account_move,account.model_account_move,group_kufula_user,1,1,1,0
+access_group_kufula_user_sale_order,access_group_kufula_user_sale_order,sale.model_sale_order,group_kufula_user,1,1,1,0
+access_group_kufula_user_grant_benefit,access_group_kufula_user_grant_benefit,odex_benefit.model_grant_benefit,group_kufula_user,1,1,1,0
+access_group_kufula_user_res_partner,access_group_kufula_user_res_partner,base.model_res_partner,group_kufula_user,1,1,1,0
+access_replace_benefit_wizard,replace.benefit.wizard.access,model_replace_benefit_wizard,group_kufula_user,1,1,1,1
 access_group_esterdad_wizard,access_group_esterdad_wizard,model_esterdad_wizard,,1,1,1,0
-
 access_group_otp_confirmation_wizard,access_group_otp_confirmation_wizard,model_otp_confirmation_wizard,,1,1,1,0
-access_payment_machine,access_payment_machine,model_payment_machine,odex_takaful.group_kufula_user,1,1,1,1
-access_payment_machine_manager,access_payment_machine_manager,model_payment_machine,odex_takaful.sponsorship_system_manager_group,1,1,1,1
\ No newline at end of file
+access_payment_machine,access_payment_machine,model_payment_machine,group_kufula_user,1,1,1,1
+access_payment_machine_manager,access_payment_machine_manager,model_payment_machine,sponsorship_system_manager_group,1,1,1,1
\ No newline at end of file
diff --git a/odex25_takaful/odex_takaful/security/security_data.xml b/odex25_takaful/odex_takaful/security/security_data.xml
index 281d8818b..d8cba36b2 100644
--- a/odex25_takaful/odex_takaful/security/security_data.xml
+++ b/odex25_takaful/odex_takaful/security/security_data.xml
@@ -3,142 +3,53 @@
 
         <record id="module_category_kufula" model="ir.module.category">
             <field name="name">Kufula System</field>
-            <field name="description">Helps you manage Kafleen and Kafalat in kufula System</field>
+            <field name="description">Helps you manage Kafleen and Kafalat in Kufula System</field>
             <field name="sequence">3</field>
         </record>
 
-        <!-- <record id="group_kufula_viewer" model="res.groups">
-            <field name="name">Viewer</field>
+        <record id="group_kufula_user" model="res.groups">
+            <field name="name">Kufula User</field>
             <field name="category_id" ref="module_category_kufula"/>
         </record>
-    
-        <record id="group_kufula_officer" model="res.groups">
-            <field name="name">Officer</field>
-            <field name="category_id" ref="module_category_kufula"/>
-            <field name="implied_ids" eval="[(4, ref('group_kufula_viewer'))]"/>
-            <field name="users" eval="[(4, ref('base.group_user'))]"/>
-        </record>
-
-        <record id="group_kufula_manager" model="res.groups">
-            <field name="name">Administrator</field>
-            <field name="category_id" ref="module_category_kufula"/>
-            <field name="implied_ids" eval="[(4, ref('group_kufula_officer'))]"/>
-            <field name="users" eval="[(4, ref('base.user_root'))]"/>
-        </record> -->
 
         <record id="group_can_make_sponsorship_payment" model="res.groups">
             <field name="name">Make Sponsorship Payments</field>
             <field name="category_id" ref="module_category_kufula"/>
-            <field name="comment">Can Make Payments For Sponsorships?</field>
         </record>
 
         <record id="group_can_recieve_sponsorship_payment" model="res.groups">
             <field name="name">Recieve Sponsorship Payments</field>
             <field name="category_id" ref="module_category_kufula"/>
-            <field name="comment">Can Recieve Payments For Sponsorships?</field>
         </record>
 
         <record id="takaful_group_user_sponsor" model="res.groups">
             <field name="name">Sponsor Account</field>
             <field name="category_id" ref="module_category_kufula"/>
-            <field name="comment">Is this user a Sponsor?</field>
         </record>
 
         <record id="group_can_activate_sponsor" model="res.groups">
             <field name="name">Can Activate Inactive Sponsors</field>
             <field name="category_id" ref="module_category_kufula"/>
-            <field name="comment">Can make Sponsor active again?</field>
         </record>
 
         <record id="group_refund_approval" model="res.groups">
             <field name="name">Refund Approval</field>
             <field name="category_id" ref="module_category_kufula"/>
-            <field name="comment">Can make Approval for refund?</field>
         </record>
 
         <record id="group_orphan_replacement" model="res.groups">
             <field name="name">Orphan Replacement</field>
             <field name="category_id" ref="module_category_kufula"/>
-            <field name="comment">Orphan Replacement</field>
         </record>
 
         <record id="group_replace_sponsor" model="res.groups">
             <field name="name">Replace Sponsor</field>
             <field name="category_id" ref="module_category_kufula"/>
-            <field name="comment">Can Replace Sponsor on Donation Lines</field>
         </record>
 
         <record id="group_show_donation_item_product" model="res.groups">
             <field name="name">Show Donation Item Product</field>
             <field name="category_id" ref="module_category_kufula"/>
-            <field name="comment">Can Show Donation Item Product?</field>
-        </record>
-
-        <!-- <record id="group_donations_coordinator" model="res.groups">
-            <field name="name">Donations Coordinator</field>
-            <field name="category_id" ref="module_category_kufula"/>
-        </record>
-
-        <record id="group_sponsorship_coordinator" model="res.groups">
-            <field name="name">Sponsorship Coordinator</field>
-            <field name="category_id" ref="module_category_kufula"/>
-        </record> -->
-
-        <!-- <record id="group_branch_manager" model="res.groups">
-            <field name="name">Branch Manager</field>
-            <field name="category_id" ref="module_category_kufula"/>
-        </record> -->
-
-        <!-- <record id="group_sponsorship_system_manager" model="res.groups">
-            <field name="name">Sponsorship System Manager</field>
-            <field name="category_id" ref="module_category_kufula"/>
-        </record> -->
-
-
-        <!-- <record id="donations_coordinator_rule" model="ir.rule">
-            <field name="name">Donations Coordinator - Record Type Donation</field>
-            <field name="model_id" ref="model_takaful_sponsorship"/>
-            <field name="groups" eval="[(4, ref('group_donations_coordinator'))]"/>
-            <field name="domain_force">[('record_type', '=', 'donation')]</field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
-        </record> -->
-
-        <!-- <record id="sponsorship_coordinator_rule" model="ir.rule">
-            <field name="name">Sponsorship Coordinator - Record Type Sponsorship</field>
-            <field name="model_id" ref="model_takaful_sponsorship"/>
-            <field name="groups" eval="[(4, ref('group_sponsorship_coordinator'))]"/>
-            <field name="domain_force">[('record_type', '=', 'sponsorship')]</field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
-        </record> -->
-
-
-        <!-- <record id="branch_manager_rule" model="ir.rule">
-            <field name="name">Branch Manager - Can Only See Their Branch</field>
-            <field name="model_id" ref="model_takaful_sponsorship"/>
-            <field name="groups" eval="[(4, ref('group_branch_manager'))]"/>
-            <field name="domain_force">[('manager_id.user_id', '=', user.id)]</field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
-        </record> -->
-
-        <!-- <record id="sponsorship_system_manager_rule" model="ir.rule">
-            <field name="name">Sponsorship System Manager</field>
-            <field name="model_id" ref="model_takaful_sponsorship"/>
-            <field name="groups" eval="[(4, ref('group_sponsorship_system_manager'))]"/>
-            <field name="domain_force">[(1,'=',1)]</field>
-        </record> -->
-
-        <record id="group_kufula_user" model="res.groups">
-            <field name="name">Kufula User</field>
-            <field name="category_id" ref="module_category_kufula"/>
         </record>
 
         <record id="group_print_receipt" model="res.groups">
@@ -146,44 +57,21 @@
             <field name="category_id" ref="module_category_kufula"/>
         </record>
 
+        <record id="group_update_sensible_fields" model="res.groups">
+            <field name="name">Updating Months Count &amp; Start Date</field>
+            <field name="category_id" ref="module_category_kufula"/>
+        </record>
+
         <record id="donation_officer_group" model="res.groups">
             <field name="name">Donations Officer</field>
             <field name="category_id" ref="module_category_kufula"/>
             <field name="implied_ids" eval="[(4, ref('group_kufula_user'))]"/>
         </record>
-        <record id="donation_officer_restrictions" model="ir.rule">
-            <field name="name">Donations Officer can only see his donations or his branch sponsors</field>
-            <field name="model_id" ref="model_takaful_sponsorship"/>
-            <field name="groups" eval="[(4, ref('donation_officer_group'))]"/>
-            <field name="domain_force">[
-                ('record_type', 'in', [False, 'donation']),
-                ('create_uid', '=', user.id)
-                ]
-            </field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
-        </record>
 
         <record id="sponsorship_officer_group" model="res.groups">
             <field name="name">Sponsorships Officer</field>
             <field name="category_id" ref="module_category_kufula"/>
-            <field name="implied_ids" eval="[(4, ref('group_kufula_user'))]"/>
-        </record>
-        <record id="sponsorship_officer_restrictions" model="ir.rule">
-            <field name="name">Sponsorships Officer can only see his sponsorships or his branch sponsors</field>
-            <field name="model_id" ref="model_takaful_sponsorship"/>
-            <field name="groups" eval="[(4, ref('sponsorship_officer_group'))]"/>
-            <field name="domain_force">[
-                ('record_type', 'in', [False, 'sponsorship']),
-                ('create_uid', '=', user.id)
-                ]
-            </field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
+            <field name="implied_ids" eval="[(4, ref('group_kufula_user')), (4, ref('group_update_sensible_fields'))]"/>
         </record>
 
         <record id="branch_manager_group" model="res.groups">
@@ -191,21 +79,11 @@
             <field name="category_id" ref="module_category_kufula"/>
             <field name="implied_ids" eval="[(4, ref('group_kufula_user'))]"/>
         </record>
-        <record id="branch_manager_restrictions" model="ir.rule">
-            <field name="name">Branch Manager can only see all his branch sponsorships and donations</field>
-            <field name="model_id" ref="model_takaful_sponsorship"/>
-            <field name="groups" eval="[(4, ref('branch_manager_group'))]"/>
-            <field name="domain_force">[('branch_custom_id.branch.manager_id.user_id', 'in', [user.id, False])]</field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
-        </record>
 
         <record id="sponsorship_system_manager_group" model="res.groups">
             <field name="name">Sponsorship System Manager</field>
             <field name="category_id" ref="module_category_kufula"/>
-            <field name="implied_ids" eval="[(4, ref('group_kufula_user'))]"/>
+            <field name="implied_ids" eval="[(4, ref('branch_manager_group'))]"/>
         </record>
 
         <record id="sponsorship_restrict_orphan_group" model="res.groups">
@@ -214,109 +92,99 @@
             <field name="implied_ids" eval="[(4, ref('group_kufula_user'))]"/>
         </record>
 
-        <record id="responsible_user_sponsorship_access" model="ir.rule">
-            <field name="name">Responsible Users can access related Sponsorships</field>
-            <field name="model_id" ref="model_takaful_sponsorship"/>
-            <field name="groups" eval="[(4, ref('group_kufula_user'))]"/>
-            <field name="domain_force">[('branch_custom_id.branch', 'child_of', user.employee_id.department_id.id)]</field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
-        </record>
-
-
-
-        <record id="kufula_user_donations_details_lines_access" model="ir.rule">
-            <field name="name">Users can access related Donations Details Lines</field>
-            <field name="model_id" ref="model_donations_details_lines"/>
-            <field name="groups" eval="[(4, ref('group_kufula_user'))]"/>
-            <field name="domain_force">[('branch_custom_id.branch', 'child_of', user.employee_id.department_id.id)]</field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
-        </record>
-
-        <record id="sponsorship_system_manager_restrictions" model="ir.rule">
-            <field name="name">Sponsorship System Manager can see everything and settings</field>
-            <field name="model_id" ref="model_takaful_sponsorship"/>
-            <field name="groups" eval="[(4, ref('sponsorship_system_manager_group'))]"/>
-            <field name="domain_force">[(1, '=', 1)]</field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
-        </record>
-
-        <!-- Groups for Department-based Access Control -->
-        <!-- <record id="group_beneficiary_department_access" model="res.groups">
-            <field name="name">Beneficiary - Department Access</field>
-            <field name="category_id" ref="module_category_kufula"/>
-            <field name="implied_ids" eval="[(4, ref('group_kufula_user'))]"/>
-            <field name="comment">Limits beneficiary records to user's department</field>
-        </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"/>
-            <field name="comment">Limits sponsor records to user's department</field>
-        </record>
-        <!-- Record Rules for Department-based Access Control -->
-        <!-- <record id="grant_benefit_department_rule" model="ir.rule">
-            <field name="name">Grant Benefit - Department Based Access</field>
-            <field name="model_id" ref="odex_benefit.model_grant_benefit"/>
-            <field name="groups" eval="[(4, ref('group_beneficiary_department_access'))]"/>
-            <field name="domain_force">[('branch_custom_id.branch', '=', user.employee_id.department_id.id)]</field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
         </record>
 
-        <record id="family_member_department_rule" model="ir.rule">
-            <field name="name">Family Member - Department Based Access</field>
-            <field name="model_id" ref="odex_benefit.model_family_member"/>
-            <field name="groups" eval="[(4, ref('group_beneficiary_department_access'))]"/>
-            <field name="domain_force">[('benefit_id.branch_custom_id.branch', '=', user.employee_id.department_id.id)]</field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
-        </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"/>
+            <field name="groups" eval="[(4, ref('donation_officer_group'))]"/>
+            <field name="domain_force">[
+                ('record_type', 'in', [False, 'donation']),
+                ('create_uid', '=', user.id)
+                ]
+            </field>
+        </record>
 
+        <record id="donation_officer_donations_details_restrictions" model="ir.rule">
+            <field name="name">Donations Officer: Own Donation Lines</field>
+            <field name="model_id" ref="model_donations_details_lines"/>
+            <field name="groups" eval="[(4, ref('donation_officer_group'))]"/>
+            <field name="domain_force">[
+                '&amp;',
+                    ('record_type', 'in', [False, 'donation']),
+                    '|',
+                        ('sponsorship_id.create_uid', '=', user.id),
+                        ('sponsorship_mechanism_id.create_uid', '=', user.id)
+                ]
+            </field>
+        </record>
+
+        <record id="sponsorship_officer_restrictions" model="ir.rule">
+            <field name="name">Sponsorships Officer: Own Sponsorships</field>
+            <field name="model_id" ref="model_takaful_sponsorship"/>
+            <field name="groups" eval="[(4, ref('sponsorship_officer_group'))]"/>
+            <field name="domain_force">[
+                ('record_type', 'in', [False, 'sponsorship']),
+                ('create_uid', '=', user.id)
+                ]
+            </field>
+        </record>
+
+        <record id="sponsorship_officer_donations_details_restrictions" model="ir.rule">
+            <field name="name">Sponsorships Officer: Own Donation Lines</field>
+            <field name="model_id" ref="model_donations_details_lines"/>
+            <field name="groups" eval="[(4, ref('sponsorship_officer_group'))]"/>
+            <field name="domain_force">[
+                '&amp;',
+                    ('record_type', 'in', [False, 'sponsorship']),
+                    '|',
+                        ('sponsorship_id.create_uid', '=', user.id),
+                        ('sponsorship_mechanism_id.create_uid', '=', user.id)
+                ]
+            </field>
+        </record>
+
+        <record id="branch_manager_restrictions" model="ir.rule">
+            <field name="name">Branch Manager: All Branch Sponsorships</field>
+            <field name="model_id" ref="model_takaful_sponsorship"/>
+            <field name="groups" eval="[(4, ref('branch_manager_group'))]"/>
+            <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)]</field>
+        </record>
+
+        <record id="branch_manager_donations_details_access" model="ir.rule">
+            <field name="name">Branch Manager: All Branch Donation Lines</field>
+            <field name="model_id" ref="model_donations_details_lines"/>
+            <field name="groups" eval="[(4, ref('branch_manager_group'))]"/>
+            <field name="domain_force">[('branch_custom_id.branch', 'child_of', user.employee_id.department_id.id)]</field>
+        </record>
+        
         <record id="sponsor_department_rule" model="ir.rule">
             <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'))]"/>
-            <field name="domain_force">[('branch_custom_id.branch', 'child_of', user.employee_id.department_id.id)]
-            </field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
+            <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>
         </record>
 
+        <record id="sponsorship_system_manager_restrictions" model="ir.rule">
+            <field name="name">Sponsorship System Manager: See All</field>
+            <field name="model_id" ref="model_takaful_sponsorship"/>
+            <field name="groups" eval="[(4, ref('sponsorship_system_manager_group'))]"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+        </record>
 
         <record id="sponsorship_marketer_restrictions" model="ir.rule">
-            <!--		<field name="name">Sponsorship Marketer can see and select all employees</field>-->
-            <field name="name">Sponsorship Marketer can see his employees</field>
+            <field name="name">Sponsorship Marketer: See Own/Dept Employees</field>
             <field name="model_id" ref="hr.model_hr_employee"/>
             <field name="groups" eval="[(4, ref('donation_officer_group'))]"/>
-            <!--		<field name="domain_force">[(1, '=', 1)]</field>-->
-            <field name="domain_force">['|', '|', ('user_id','=',user.id), ('department_id.manager_id.user_id','=',
-                user.id), ('parent_id.user_id','=', user.id)]
-            </field>
+            <field name="domain_force">['|', '|', ('user_id','=',user.id), ('department_id.manager_id.user_id','=', user.id), ('parent_id.user_id','=', user.id)]</field>
             <field name="perm_read" eval="1"/>
             <field name="perm_write" eval="1"/>
             <field name="perm_create" eval="0"/>
             <field name="perm_unlink" eval="0"/>
         </record>
 
-        <record id="group_update_sensible_fields" model="res.groups">
-            <field name="name">Updating Months Count &amp; Start Date</field>
-            <field name="category_id" ref="module_category_kufula"/>
-        </record>
     </data>
-
-</odoo>
+</odoo>
\ No newline at end of file
diff --git a/odex25_takaful/odex_takaful/views/donations_details_lines.xml b/odex25_takaful/odex_takaful/views/donations_details_lines.xml
index 00dfb3c3d..598d907d9 100644
--- a/odex25_takaful/odex_takaful/views/donations_details_lines.xml
+++ b/odex25_takaful/odex_takaful/views/donations_details_lines.xml
@@ -726,7 +726,7 @@
         <field name="name">Unconditional Donations</field>
         <field name="res_model">donations.details.lines</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('donation_mechanism', '=', 'without_conditions')]</field>
+        <field name="domain">[('record_type', '=', 'donation'), ('donation_mechanism', '=', 'without_conditions')]</field>
         <field name="view_ids" eval="[(5, 0, 0),
             (0, 0, {'view_mode': 'tree', 'view_id': ref('donations_unconditional_tree')}),
             (0, 0, {'view_mode': 'form', 'view_id': ref('donations_details_lines_view_form')})]"/>
diff --git a/odex25_takaful/odex_takaful/views/takaful_menus_actions.xml b/odex25_takaful/odex_takaful/views/takaful_menus_actions.xml
index b9b31e0a1..477b84f07 100644
--- a/odex25_takaful/odex_takaful/views/takaful_menus_actions.xml
+++ b/odex25_takaful/odex_takaful/views/takaful_menus_actions.xml
@@ -19,7 +19,8 @@
 
     <!-- Sponsorship Lines -->
     <menuitem id="donations_details_lines_app_menu" parent="sponsorship_lines_menu"
-     name="Sponsorship Lines" action="donations_details_lines_sponsorship_action" sequence="1"/>
+     name="Sponsorship Lines" action="donations_details_lines_sponsorship_action" 
+     groups="odex_takaful.sponsorship_officer_group" sequence="1"/>
     <menuitem id="manager_donations_details_lines_app_menu" parent="sponsorship_lines_menu"
      name="Editable Sponsorship Lines" action="manager_donations_details_lines_sponsorship_action" 
      groups="odex_takaful.group_update_sensible_fields" sequence="1"/>
@@ -42,7 +43,7 @@
     <!-- التبرعات - Donations Menu -->
     <!-- ========================================== -->
     <menuitem id="donations_main_menu" parent="takaful_kufula_app_top_menu"
-        sequence="20" name="Donations" groups="odex_takaful.group_kufula_user"/>
+        sequence="20" name="Donations" groups="odex_takaful.donation_officer_group"/>
 
     <menuitem id="donations_unconditional_menu" parent="donations_main_menu"
         name="Unconditional Donations" action="donations_unconditional_action" sequence="1"/>