diff --git a/odex25_ensan/odex_benefit/models/family_members.py b/odex25_ensan/odex_benefit/models/family_members.py index ed6315b9f..4fed4ac85 100644 --- a/odex25_ensan/odex_benefit/models/family_members.py +++ b/odex25_ensan/odex_benefit/models/family_members.py @@ -251,9 +251,7 @@ class FamilyMemberProfile(models.Model): default='auto') is_member_workflow = fields.Boolean('Is Member Workflow?') # sponsor_id = fields.Many2one('res.partner', string='Sponsor Partner',domain="[('account_type','=','sponsor')]") - sponsor_id = fields.Many2one('res.partner', string='Sponsor Partner', domain="[('is_sponsor_portal', '=', True)]") - sponsor_related_id = fields.Many2one('res.partner', string='Sponsor') - sponsorship_id = fields.Many2one('takaful.sponsorship', string='Sponsorship') + required_attach = fields.Selection(selection=[('true', 'True'), ('false', 'False')], compute='get_required_attach', store=True, string='Member Required Attach') # Exception fields diff --git a/odex25_ensan/odex_takaful/i18n/ar_001.po b/odex25_ensan/odex_takaful/i18n/ar_001.po index 5f2b6b44c..c9dcefb5d 100644 --- a/odex25_ensan/odex_takaful/i18n/ar_001.po +++ b/odex25_ensan/odex_takaful/i18n/ar_001.po @@ -7278,3 +7278,18 @@ msgstr "مكفول" msgid "Have not Kafala" msgstr "غير مكفول" + +#. module: odex_takaful +#: code:addons/odex_takaful/models/takaful_sponorship_model.py:0 +#, python-format +msgid "Please Check The Amount in donation Line!" +msgstr "مبلغ التبرع صفر الرجاء ادخال قيمة لمبلغ التبرع" + + +#. module: odex_takaful +#: model_terms:ir.ui.view,arch_db:odex_takaful.family_member_form_inherit_donation_button +msgid "Kafala Information" +msgstr "بيانات الكفالة" + + + diff --git a/odex25_ensan/odex_takaful/models/family_member.py b/odex25_ensan/odex_takaful/models/family_member.py index a75436b14..22a0bca4f 100644 --- a/odex25_ensan/odex_takaful/models/family_member.py +++ b/odex25_ensan/odex_takaful/models/family_member.py @@ -10,6 +10,9 @@ class FamilyMember(models.Model): string='Donation Details', compute='_compute_donation_details_count' ) + sponsor_id = fields.Many2one('res.partner', string='Sponsor Partner', domain="[('is_sponsor_portal', '=', True)]") + sponsor_related_id = fields.Many2one('res.partner', string='Sponsor') + sponsorship_id = fields.Many2one('takaful.sponsorship', string='Sponsorship') sponsorship_end_date = fields.Date(string='Sponsorship End Date') is_restricted = fields.Boolean(string="Is Restricted ?", default=False, readonly=True) general_restriction = fields.Boolean(string="General Restriction", default=False, readonly=True) diff --git a/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py b/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py index 1dab9c8c7..dff56d120 100644 --- a/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py +++ b/odex25_ensan/odex_takaful/models/takaful_sponorship_model.py @@ -1181,6 +1181,11 @@ class TakafulSponsorship(models.Model): raise ValidationError( _("Please add at least one line in donation details!") ) + #Check if The Total Amount is not Zero + if self.total_sponsorship_amount == 0: + raise ValidationError( + _("Please Check The Amount in donation Line!") + ) all_donation_lines = (self.donations_details_lines + self.donations_details_lines_mechanism_ids).filtered( lambda r: r.display_type == False) diff --git a/odex25_ensan/odex_takaful/views/family_member.xml b/odex25_ensan/odex_takaful/views/family_member.xml index b0f43d22d..a01667586 100644 --- a/odex25_ensan/odex_takaful/views/family_member.xml +++ b/odex25_ensan/odex_takaful/views/family_member.xml @@ -13,11 +13,24 @@ widget="statinfo"/> - - - - - + + + + + + + + + + + + + +