From ac6b017b22b9a1655a976cde0c4600bf6fe61db9 Mon Sep 17 00:00:00 2001 From: younes Date: Mon, 12 Jan 2026 09:00:04 +0100 Subject: [PATCH] [IMP] odex_benefit: IMP benefit --- odex25_benefit/odex_benefit/i18n/ar_001.po | 28 +++++++++---------- .../odex_benefit/models/family_members.py | 24 ++++++++-------- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po index f6f979ab3..a681e00e0 100644 --- a/odex25_benefit/odex_benefit/i18n/ar_001.po +++ b/odex25_benefit/odex_benefit/i18n/ar_001.po @@ -18373,12 +18373,6 @@ msgid "" "vocational specialization." msgstr "أكبر من %s سنة وغير منتظم بتخصص علمي أو مهني." -#. module: odex_benefit -#: code:addons/odex_benefit/models/family_members.py:0 -#, python-format -msgid "She has exceeded the maximum age limit of %s years." -msgstr "لقد تجاوزت الحد الأقصى للعمر وهو %s سنة." - #. module: odex_benefit #: code:addons/odex_benefit/models/benefit.py:0 #, python-format @@ -18431,13 +18425,6 @@ msgstr "مبلغ الدعم" msgid "Exception Second Approve" msgstr "موافقة مدير الفرع للاستثناء" -#. module: odex_benefit -#: code:addons/odex_benefit/models/family_members.py:0 -#, python-format -msgid "" -"She has a physical or intellectual disability but is over %s years of age." -msgstr "لديها إعاقة جسدية أو عقلية ولكنها تجاوزت %s سنة من العمر." - #. module: odex_benefit #: code:addons/odex_benefit/models/payment_order.py:0 #: model_terms:ir.ui.view,arch_db:odex_benefit.payment_orders_form @@ -18506,4 +18493,17 @@ msgstr "الإجراء غير مسموح: الأسرة لديها %s فرد مس #. module: odex_benefit #: model:ir.model.fields.selection,name:odex_benefit.selection__education_status__education_entity__governmental_paid msgid "Governmental/Paid" -msgstr "حكومي /مقابل مادي" \ No newline at end of file +msgstr "حكومي /مقابل مادي" + +#. module: odex_benefit +#: code:addons/odex_benefit/models/family_members.py:0 +#: code:addons/odex_benefit/models/family_members.py:0 +#, python-format +msgid "She is over %s years of age and has no underage brothers." +msgstr "تجاوزت عمر %s وليس لديها اخوة قصر" + +#. module: odex_benefit +#: code:addons/odex_benefit/models/family_members.py:0 +#, python-format +msgid "She is over %s years of age." +msgstr "تجاوزت عمر %s" \ No newline at end of file diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py index ceeed6efd..662804386 100644 --- a/odex25_benefit/odex_benefit/models/family_members.py +++ b/odex25_benefit/odex_benefit/models/family_members.py @@ -687,19 +687,17 @@ class FamilyMemberProfile(models.Model): rec.member_status = 'non_benefit' reasons.append(_("She is employed and not enrolled in an educational institution.")) if age_exceeded: - if rec.age <= exceptional_age_has_disabilities and rec.disabilities_attachment_ids and rec.minor_siblings: - rec.member_status = 'benefit' - else: - if rec.age > exceptional_age_has_disabilities and rec.disabilities_attachment_ids: - rec.member_status = 'non_benefit' - reasons.append( - _("She has a physical or intellectual disability but is over %s years of age.") - % exceptional_age_has_disabilities - ) - else: - rec.member_status = 'non_benefit' - reasons.append( - _("She has exceeded the maximum age limit of %s years.") % female_benefit_age) + if rec.age > minor_siblings_age and not rec.minor_siblings: + rec.member_status = 'non_benefit' + reasons.append( + _("She is over %s years of age and has no underage brothers.") % female_benefit_age) + elif not rec.minor_siblings: + rec.member_status = 'non_benefit' + reasons.append( + _("She is over %s years of age and has no underage brothers.") % female_benefit_age) + elif rec.minor_siblings and rec.age > minor_siblings_age: + rec.member_status = 'non_benefit' + reasons.append(_("She is over %s years of age.") % minor_siblings_age) if rec.is_work and rec.member_income > max_income_for_benefit and rec.education_status in [ 'educated'] and current_education_status_id.case_study == 'continuous': rec.member_status = 'non_benefit'