[IMP] odex_benefit: IMP benefit

odex25_benefit/odex_benefit/i18n/ar_001.po

@@ -8586,14 +8586,10 @@ msgstr "نهاية الوقت المعين للنشاط"
 #: model:ir.model.fields,field_description:odex_benefit.field_education_exam_type__name
 #: model_terms:ir.ui.view,arch_db:odex_benefit.view_property_type_settings_form
 #: model:ir.model.fields,field_description:odex_benefit.field_education_period__name
-<<<<<<< HEAD
-#: model_terms:ir.ui.view,arch_db:odex_benefit.view_rent_contract_form
-=======
 msgid "Name"
 msgstr "الاسم"
 
 #. module: odex_benefit
->>>>>>> dev_odex25_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_cars_line__name
 #, fuzzy
 msgid "Name"
@@ -17593,7 +17589,6 @@ msgstr ""
 msgid ""
 "Payment Type requires a period of %s months, but selected period is %s "
 "months."
->>>>>>> dev_odex25_benefit
 msgstr "يتطلب نوع السداد فترة %s أشهر، ولكن الفترة المحددة هي %s أشهر."
 
 #. module: odex_benefit

odex25_benefit/odex_benefit/models/family_members.py

@@ -589,10 +589,16 @@ class FamilyMemberProfile(models.Model):
                                 rec.member_status = 'non_benefit'
                                 reasons.append(
                                     _("He has a physical or intellectual disability but is over %s years of age.") % exceptional_age_has_disabilities)
-                            if rec.education_status not in [
+                            elif rec.education_status not in [
                                 'educated'] and current_education_status_id.case_study != 'continuous':
                                 rec.member_status = 'non_benefit'
-                                reasons.append(_("He has exceeded the maximum age limit of %s years.") % male_benefit_age)
+                                reasons.append(
+                                    _("Over %s years old and not enrolled in any educational institution.") % male_benefit_age
+                                )
+                            elif current_education_status_id.case_study == 'continuous' and rec.age > exceptional_age_scientific_specialty:
+                                rec.member_status = 'non_benefit'
+                                reasons.append(
+                                    _("He has exceeded the maximum age limit of %s years for scientific specialties.") % exceptional_age_scientific_specialty)
                     if rec.is_work:
                         if rec.member_income > max_income_for_benefit:
                             rec.member_status = 'non_benefit'