Merge pull request #6158 from expsa/14.0-i18n-odex_takaful-auto-20260112_153836

[IMP] odex_takaful: enhance data models and user interface

odex25_takaful/odex_takaful/i18n/ar_001.po

@@ -7491,3 +7491,18 @@ msgstr "سجلاتي"
 msgid "All Records"
 msgstr "كل السجلات"
 
+
+#. module: odex_takaful
+#: model_terms:ir.ui.view,arch_db:odex_takaful.view_account_payment_search_inherit_takaful
+msgid "Has Branch"
+msgstr "لديه فرع"
+
+#. module: odex_takaful
+#: model_terms:ir.ui.view,arch_db:odex_takaful.view_account_payment_search_inherit_takaful
+msgid "Payment Method (by Name)"
+msgstr "طريقة السداد (بالاسم)"
+
+#. module: odex_takaful
+#: model:ir.model.fields,field_description:odex_takaful.field_account_payment__payment_method_name
+msgid "Payment Method Name"
+msgstr "اسم طريقة السداد"

odex25_takaful/odex_takaful/models/account_payment.py

@@ -1,4 +1,4 @@
-from odoo import models, fields
+from odoo import models, fields, api
 
 
 class AccountPayment(models.Model):
@@ -12,6 +12,13 @@ class AccountPayment(models.Model):
         store=True,
         readonly=True
     )
+    payment_method_name = fields.Char(
+        string="Payment Method Name",
+        compute='_compute_payment_method_name',
+        store=True,
+        readonly=True,
+        help="Stored payment method name for grouping purposes"
+    )
     confirm_payment_refund = fields.Binary()
     IBN_number = fields.Integer()
     confirm_payment_refund_image = fields.Binary()
@@ -19,6 +26,11 @@ class AccountPayment(models.Model):
     machine_id = fields.Many2one('payment.machine', string='Payment Machine')
     machine_reference = fields.Char(string='Machine Reference', help='Reference number from the payment machine')
 
+    @api.depends('payment_method_line_id', 'payment_method_line_id.name')
+    def _compute_payment_method_name(self):
+        for rec in self:
+            rec.payment_method_name = rec.payment_method_line_id.name if rec.payment_method_line_id else False
+
 
 class AccountPayment(models.Model):
     _inherit = 'account.journal'

odex25_takaful/odex_takaful/views/account_payment_views.xml

@@ -10,18 +10,18 @@
                 <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', 'شيكات')]"/>
+                    <filter string="Cash" name="filter_cash" domain="[('payment_method_line_id.name', 'ilike', 'نقدي')]"/>
+                    <filter string="Network" name="filter_network" domain="[('payment_method_line_id.name', 'ilike', 'شبكة')]"/>
+                    <filter string="Bank Transfer" name="filter_bank_transfer" domain="['|', ('payment_method_line_id.name', 'ilike', 'تحويل بنكي'), ('payment_method_line_id.name', 'ilike', 'حوالة بنكية')]"/>
+                    <filter string="Check" 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)]"/>
+                    <filter string="Has Branch" 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'}"/>
+                    <filter string="Payment Method (by Name)" name="group_payment_method_name" domain="[]" context="{'group_by': 'payment_method_name'}"/>
+                    <filter string="Branch" name="group_branch" domain="[]" context="{'group_by': 'branch_custom_id'}"/>
                 </xpath>
             </field>
         </record>