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 #6283 from expsa/erff 

Erff
This commit is contained in:
kchyounes19 2026-01-21 09:01:44 +01:00 committed by GitHub
parent 9f0959fc49 5b5e077d77
commit abc5af41bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
odex25_benefit/odex_benefit/models/family_members.py
View File

@ -685,12 +685,12 @@ 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 current_education_status_id.case_study != 'continuous':
if rec.case_study != 'continuous':
rec.member_status = 'non_benefit'
reasons.append(
_("Over %s years old and not enrolled in any educational institution.") % male_benefit_age
)
elif current_education_status_id.case_study == 'continuous':
elif rec.case_study == 'continuous':
if rec.age >= exceptional_age_scientific_specialty:
rec.member_status = 'non_benefit'
reasons.append(
@ -706,7 +706,7 @@ class FamilyMemberProfile(models.Model):
reasons.append(
_("He is over %s years of age and not enrolled in an educational institution.") % male_benefit_age)
if not rec.is_married and rec.education_status in [
'educated'] and current_education_status_id.case_study in [
'educated'] and rec.case_study in [
'graduate', 'intermittent']:
rec.member_status = 'non_benefit'
reasons.append(
@ -721,7 +721,7 @@ class FamilyMemberProfile(models.Model):
elif rec.relationn.relation_type == 'daughter':
if rec.age < female_benefit_age and rec.is_work and rec.education_status not in [
'educated'] and current_education_status_id.case_study != 'continuous':
'educated'] and rec.case_study != 'continuous':
rec.member_status = 'non_benefit'
reasons.append(_("She is employed and not enrolled in an educational institution."))
if age_exceeded:
@ -744,7 +744,7 @@ class FamilyMemberProfile(models.Model):
rec.member_status = 'non_benefit'
reasons.append(_("She is employed and not enrolled in an educational institution."))
if rec.is_work and rec.education_status in [
'educated'] and current_education_status_id.case_study in [
'educated'] and rec.case_study in [
'graduate', 'intermittent']:
rec.member_status = 'non_benefit'
reasons.append(_("She is employed and has completed her education."))

2
odex25_benefit/odex_benefit/views/family_members.xml
View File

@ -363,7 +363,7 @@
decoration-success="member_status == 'benefit'"
decoration-danger="member_status == 'non_benefit'" string="Is Benefit?"/>
<field name="last_education_levels" optional="hide"/>
<field name="case_study" optional="hide"/>
<field name="case_study" optional="show"/>
<field name="is_excluded_suspension"/>
<field name="age"/>
<field name="benefit_id" optional="hide"/>