Merge pull request #6145 from expsa/14.0-feat-odex_takaful-auto-20260112_131933

[IMP] odex_takaful: enhance data models and user interface

odex25_takaful/odex_takaful/__manifest__.py

@@ -82,6 +82,7 @@
         'views/takaful_payment_method.xml',
         'views/product_views.xml',
         'views/payment_machine_views.xml',
+        'views/account_payment_views.xml',
         'views/takaful_menus_actions.xml',
         'views/benefit_category_views.xml',
         'data/message_template_data.xml',

odex25_takaful/odex_takaful/models/account_payment.py

@@ -5,6 +5,13 @@ class AccountPayment(models.Model):
     _inherit = 'account.payment'
 
     takaful_sponsorship_id = fields.Many2one(related="move_id.takaful_sponsorship_id")
+    branch_custom_id = fields.Many2one(
+        'branch.settings',
+        string="Branch",
+        related='takaful_sponsorship_id.branch_custom_id',
+        store=True,
+        readonly=True
+    )
     confirm_payment_refund = fields.Binary()
     IBN_number = fields.Integer()
     confirm_payment_refund_image = fields.Binary()

odex25_takaful/odex_takaful/views/account_payment_views.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <!-- Inherit account.payment search view to add payment method filters and group by branch -->
+        <record id="view_account_payment_search_inherit_takaful" model="ir.ui.view">
+            <field name="name">account.payment.search.inherit.takaful</field>
+            <field name="model">account.payment</field>
+            <field name="inherit_id" ref="account.view_account_payment_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//search" position="inside">
+                    <!-- Payment Method Filters by Name -->
+                    <separator/>
+                    <filter string="نقدي" name="filter_cash" domain="[('payment_method_line_id.name', 'ilike', 'نقدي')]"/>
+                    <filter string="شبكة" name="filter_network" domain="[('payment_method_line_id.name', 'ilike', 'شبكة')]"/>
+                    <filter string="تحويل بنكي" name="filter_bank_transfer" domain="['|', ('payment_method_line_id.name', 'ilike', 'تحويل بنكي'), ('payment_method_line_id.name', 'ilike', 'حوالة بنكية')]"/>
+                    <filter string="شيك" name="filter_check" domain="['|', ('payment_method_line_id.name', 'ilike', 'شيك'), ('payment_method_line_id.name', 'ilike', 'شيكات')]"/>
+                    
+                    <!-- Branch Filter -->
+                    <separator/>
+                    <filter string="لديه فرع" name="filter_has_branch" domain="[('branch_custom_id', '!=', False)]"/>
+                    
+                    <!-- Group By Filters (will appear in Group By dropdown) -->
+                    <filter string="طريقة السداد (بالاسم)" name="group_payment_method_line" domain="[]" context="{'group_by': 'payment_method_line_id'}"/>
+                    <filter string="الفرع" name="group_branch" domain="[]" context="{'group_by': 'branch_custom_id'}"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
+
+
+
+