devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6236 from expsa/fix_bugs 

[FIX] solve bugs from test 14
This commit is contained in:
NossibaElhadi 2026-01-19 13:50:16 +03:00 committed by GitHub
parent f055bf73fc d928f30acd
commit 07bf83dad9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 96 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
odex25_takaful/odex_takaful/i18n/ar_001.po
View File

@ -751,6 +751,8 @@ msgstr "مقبوضات الكفالة رقم %s"
#. module: odex_takaful
#: model:ir.model.fields,field_description:odex_takaful.field_account_payment_register__bank_id
#: model:ir.model.fields,field_description:odex_takaful.field_donation_extension_wizard_line__bank_id
#: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__bank_id
#: model_terms:ir.ui.view,arch_db:odex_takaful.benefit_month_payment_report_pdf
#: model_terms:ir.ui.view,arch_db:odex_takaful.benefit_month_payment_share
msgid "Bank"
@ -3093,18 +3095,22 @@ msgstr "تم الإصدار بواسطة"
#. module: odex_takaful
#: model:ir.model,name:odex_takaful.model_account_journal
#: model:ir.model.fields,field_description:odex_takaful.field_donation_extension_wizard_line__journal_id
#: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__journal_id
#: model:ir.model.fields,field_description:odex_takaful.field_extension_payment_wizard_line__journal_id
#: model:ir.model.fields,field_description:odex_takaful.field_grant_benefit_invoice__journal_id
#: model:ir.model.fields,field_description:odex_takaful.field_month_payment__journal_id
#: model:ir.model.fields,field_description:odex_takaful.field_payment_details_lines__journal_id
#: model:ir.model.fields,field_description:odex_takaful.field_payment_machine__journal_id
#: model:ir.model.fields,field_description:odex_takaful.field_points_of_sale_custom__journal_id
#: model:ir.model.fields,field_description:odex_takaful.field_takaful_payment_method__journal_id
msgid "Journal"
msgstr "دفتر اليومية"
#. module: odex_takaful
#: model:ir.model.fields,field_description:odex_takaful.field_donation_extension_wizard_line__journal_id
#: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__journal_id
#: model:ir.model.fields,field_description:odex_takaful.field_extension_payment_wizard_line__journal_id
#: model:ir.model.fields,field_description:odex_takaful.field_payment_machine__journal_id
#: model:ir.model.fields,field_description:odex_takaful.field_takaful_payment_method__journal_id
msgid "Journal"
msgstr "بنك الجمعية"
#. module: odex_takaful
#: model:ir.model,name:odex_takaful.model_account_move
#: model:ir.model.fields,field_description:odex_takaful.field_takaful_sponsorship__journal_entry_ids
@ -3204,6 +3210,8 @@ msgstr "مستخدم الكفالات"
#. module: odex_takaful
#: model:ir.model.fields,field_description:odex_takaful.field_account_payment_register__last_digits
#: model:ir.model.fields,field_description:odex_takaful.field_donation_extension_wizard_line__last_digits
#: model:ir.model.fields,field_description:odex_takaful.field_donations_details_lines__last_digits
msgid "Last Digits"
msgstr "رقم الحساب"
@ -6961,6 +6969,8 @@ msgid "Yes"
msgstr "نعم"
#. module: odex_takaful
#: model_terms:ir.ui.view,arch_db:odex_takaful.donation_extension_wizard_form
#: model_terms:ir.ui.view,arch_db:odex_takaful.takaful_sponsorship_form
#: model_terms:ir.ui.view,arch_db:odex_takaful.view_account_payment_register_form
msgid "You Can Type 4 Digits"
msgstr "يمكنك إدخال آخر اربعة أرقام"

11
odex25_takaful/odex_takaful/models/donation_details_lines.py
View File

@ -143,6 +143,17 @@ class DonationsDetailsLines(models.Model):
)
payment_method_type = fields.Selection(related='payment_method_display.payment_method', string='Payment Method Type', store=True)
benefit_kafala_status = fields.Selection(related='benefit_id.kafala_status', string="Benefit Kafala Status")
show_last_digits = fields.Boolean(string="Use 4 Digits", )
last_digits = fields.Char(string="Last Digits", size=32)
bank_id = fields.Many2one('res.bank', string="Bank")
@api.onchange("direct_debit_partner_bank_id")
def onchange_direct_debit_partner_bank_id(self):
for rec in self:
if rec.direct_debit_partner_bank_id:
rec.show_last_digits = False
else:
rec.show_last_digits = True
@api.onchange('family_id')

64
odex25_takaful/odex_takaful/views/donations_details_lines.xml
View File

@ -275,21 +275,21 @@
attrs="{'invisible': [('sponsorship_duration','!=','temporary')], 'required': [('sponsorship_duration','=','temporary')], 'readonly': [('parent_state', '!=', 'draft')]}"
readonly="1" force_save="1" />
<field name="payment_month_count" groups="!odex_takaful.group_update_sensible_fields" attrs="{
'invisible': ['&amp;', ('sponsorship_duration','!=','temporary'), ('direct_debit', '=', False)],
'required': [('sponsorship_duration','=','temporary')],
'invisible': ['&amp;', ('sponsorship_duration','!=','temporary'), ('direct_debit', '=', False)],
'required': [('sponsorship_duration','=','temporary')],
'readonly': [('parent_state', '!=', 'draft')]
}" />
<field name="payment_month_count" groups="odex_takaful.group_update_sensible_fields" attrs="{
'invisible': ['&amp;', ('sponsorship_duration','!=','temporary'), ('direct_debit', '=', False)],
'invisible': ['&amp;', ('sponsorship_duration','!=','temporary'), ('direct_debit', '=', False)],
'required': [('sponsorship_duration','=','temporary')]
}" />
<field name="start_date" string="Start Date" widget="date" groups="!odex_takaful.group_update_sensible_fields" attrs="{
'invisible': ['&amp;', ('sponsorship_duration', '!=', 'temporary'), ('direct_debit', '=', False)],
'required': [('sponsorship_duration', '=','temporary')],
'invisible': ['&amp;', ('sponsorship_duration', '!=', 'temporary'), ('direct_debit', '=', False)],
'required': [('sponsorship_duration', '=','temporary')],
'readonly': [('parent_state', '!=', 'draft')]
}" />
<field name="start_date" string="Start Date" widget="date" groups="odex_takaful.group_update_sensible_fields" context="{'update_start_date': True}" attrs="{
'invisible': ['&amp;', ('sponsorship_duration', '!=', 'temporary'), ('direct_debit', '=', False)],
'invisible': ['&amp;', ('sponsorship_duration', '!=', 'temporary'), ('direct_debit', '=', False)],
'required': [('sponsorship_duration', '=','temporary')]
}" />
<field name="end_date" string="End Date" widget="date"
@ -407,7 +407,7 @@
<field name="active" eval="False" />
<field name="inherit_id" ref="odex_takaful.donations_details_lines_view_form"/>
<field name="arch" type="xml">
<xpath expr="//form" position="attributes">
<attribute name="edit">1</attribute>
</xpath>
@ -415,25 +415,6 @@
</field>
</record>
<record id="manager_donations_details_lines_sponsorship_action" model="ir.actions.act_window">
<field name="name">Sponsorship Items</field>
<field name="res_model">donations.details.lines</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('record_type', '=', 'sponsorship')]</field>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('donations_details_lines_sponsorship_tree')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('donations_details_lines_view_form_odex_takaful')})]"/>
<field name="search_view_id" ref="donations_details_lines_sponsorship_search"/>
<field name="context">{'create': False, 'delete': False, 'default_record_type': 'sponsorship'}</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
No sponsorship items found
</p>
<p>
Sponsorship items appear here After confirming sponsorships from the sponsorships screen main
</p>
</field>
</record>
<record id="donations_details_lines_view_tree_waiting" model="ir.ui.view">
<field name="name">donations.details.lines.view.tree.waiting</field>
@ -522,7 +503,7 @@
<!-- ========================================== -->
<!-- بنود الكفالات - Sponsorship Lines Views -->
<!-- ========================================== -->
<!-- Tree View for Sponsorship Lines -->
<record id="donations_details_lines_sponsorship_tree" model="ir.ui.view">
<field name="name">donations.details.lines.sponsorship.tree</field>
@ -536,7 +517,7 @@
<field name="benefit_id"/>
<field name="family_id" optional="hide"/>
<field name="age" string="Age"/>
<field name="age_category" widget="badge"
<field name="age_category" widget="badge"
decoration-info="age_category == 'all'"
decoration-warning="age_category == '16'"
decoration-danger="age_category == '18'" optional="hide"/>
@ -650,10 +631,31 @@
</field>
</record>
<record id="manager_donations_details_lines_sponsorship_action" model="ir.actions.act_window">
<field name="name">Sponsorship Items</field>
<field name="res_model">donations.details.lines</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('record_type', '=', 'sponsorship')]</field>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('donations_details_lines_sponsorship_tree')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('donations_details_lines_view_form_odex_takaful')})]"/>
<field name="search_view_id" ref="donations_details_lines_sponsorship_search"/>
<field name="context">{'create': False, 'delete': False, 'default_record_type': 'sponsorship'}</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
No sponsorship items found
</p>
<p>
Sponsorship items appear here After confirming sponsorships from the sponsorships screen main
</p>
</field>
</record>
<!-- ========================================== -->
<!-- التبرعات غير المشروطة - Unconditional -->
<!-- ========================================== -->
<!-- Tree View for Unconditional Donations -->
<record id="donations_unconditional_tree" model="ir.ui.view">
<field name="name">donations.details.lines.unconditional.tree</field>
@ -745,7 +747,7 @@
<!-- ========================================== -->
<!-- التبرعات المشروطة - Conditional (For Families) -->
<!-- ========================================== -->
<!-- Tree View for Conditional Donations -->
<record id="donations_conditional_tree" model="ir.ui.view">
<field name="name">donations.details.lines.conditional.tree</field>
@ -830,4 +832,4 @@
</field>
</record>
</odoo>
</odoo>

18
odex25_takaful/odex_takaful/views/takaful_sponorship_view.xml
View File

@ -346,10 +346,17 @@
<field name="name" widget="section_and_note_text" optional="show"/>
<field name="direct_debit"/>
<field name="sponsor_id" invisible="1"/>
<field name="show_last_digits" 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)]}"
attrs="{'invisible': [('direct_debit', '=', False)], 'required': ['&amp;', ('direct_debit', '=', True), ('show_last_digits', '=', False)]}"
options="{'skip_disable_quick_create': True}"/>
<field name="last_digits"
attrs="{'invisible': ['|', ('show_last_digits', '=', False), ('direct_debit', '=', False)], 'required': ['&amp;', ('direct_debit', '=', True), ('show_last_digits', '=', True)]}" placeholder="You Can Type 4 Digits"/>
<field name="bank_id"
attrs="{'invisible': ['|', ('show_last_digits', '=', False), ('direct_debit', '=', False)], 'required': ['&amp;', ('direct_debit', '=', True), ('show_last_digits', '=', True)]}"/>
<field name="journal_id"
attrs="{'invisible': [('direct_debit', '=', False)], 'required': [('direct_debit', '=', True)]}"/>
@ -599,10 +606,17 @@
<field name="donation_types"
invisible="1"/>
<field name="sponsor_id" invisible="1"/>
<field name="show_last_digits" 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': ['|', ('payment_month_count_visibility','!=', True),('direct_debit', '=', False)], 'required': [('direct_debit', '=', True)]}"
attrs="{'invisible': ['|', ('payment_month_count_visibility','!=', True),('direct_debit', '=', False)], 'required': ['&amp;', ('direct_debit', '=', True), ('show_last_digits', '=', False)]}"
options="{'skip_disable_quick_create': True}"/>
<field name="last_digits"
attrs="{'invisible': ['|', ('show_last_digits', '=', False), ('direct_debit', '=', False)], 'required': [('show_last_digits', '=', True)]}" placeholder="You Can Type 4 Digits"/>
<field name="bank_id"
attrs="{'invisible': ['|', ('show_last_digits', '=', False), ('direct_debit', '=', False)], 'required': [('show_last_digits', '=', True)]}"/>
<field name="journal_id"
attrs="{'invisible': ['|', ('payment_month_count_visibility','!=', True),('direct_debit', '=', False)], 'required': [('direct_debit', '=', True)]}"/>

14
odex25_takaful/odex_takaful/wizards/donation_extension_wizard.py
View File

@ -297,7 +297,19 @@ class DonationExtensionWizardLine(models.TransientModel):
donation_mechanism = fields.Selection(related='donation_line_id.donation_mechanism')
months = fields.Integer(related='wizard_id.months')
partner_id = fields.Many2one(related='donation_line_id.sponsor_id')
show_last_digits = fields.Boolean(string="Use 4 Digits", )
last_digits = fields.Char(string="Last Digits", size=32)
bank_id = fields.Many2one('res.bank', string="Bank")
@api.onchange("direct_debit_partner_bank_id", "direct_debit")
def onchange_direct_debit_partner_bank_id(self):
for rec in self:
if rec.direct_debit_partner_bank_id:
rec.show_last_digits = False
else:
rec.show_last_digits = True
@api.depends('benefits_count', 'donation_amount', 'months', 'donation_qty', 'record_type', 'sponsorship_type')
def _compute_total_donation_amount(self):
for rec in self:

9
odex25_takaful/odex_takaful/wizards/donation_extension_wizard.xml
View File

@ -58,10 +58,17 @@
<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="show_last_digits" 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': partner_id}"
attrs="{'invisible': [('direct_debit', '=', False)], 'required': [('direct_debit', '=', True)]}"
attrs="{'invisible': [('direct_debit', '=', False)], 'required': ['&amp;', ('direct_debit', '=', True), ('show_last_digits', '=', False)]}"
options="{'skip_disable_quick_create': True}"/>
<field name="last_digits"
attrs="{'invisible': ['|', ('show_last_digits', '=', False), ('direct_debit', '=', False)], 'required': ['&amp;', ('direct_debit', '=', True), ('show_last_digits', '=', True)]}" placeholder="You Can Type 4 Digits"/>
<field name="bank_id"
attrs="{'invisible': ['|', ('show_last_digits', '=', False), ('direct_debit', '=', False)], 'required': ['&amp;', ('direct_debit', '=', True), ('show_last_digits', '=', 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"