diff --git a/odex25_ensan/odex_benefit/i18n/ar_001.po b/odex25_ensan/odex_benefit/i18n/ar_001.po
index f0d76f6cb..93e3e3efa 100644
--- a/odex25_ensan/odex_benefit/i18n/ar_001.po
+++ b/odex25_ensan/odex_benefit/i18n/ar_001.po
@@ -2656,7 +2656,7 @@ msgstr "موديل السيارة"
 #: model:ir.model.fields,field_description:odex_benefit.field_family_member__case_study
 #: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__case_study
 msgid "Case Study"
-msgstr ""
+msgstr "استمرارية التعليم"
 
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_family_validation_setting__cash_expense
diff --git a/odex25_ensan/odex_benefit/models/benefit.py b/odex25_ensan/odex_benefit/models/benefit.py
index d283ca134..6bfc6b985 100644
--- a/odex25_ensan/odex_benefit/models/benefit.py
+++ b/odex25_ensan/odex_benefit/models/benefit.py
@@ -126,6 +126,7 @@ class GrantBenefitProfile(models.Model):
         ('Appendix', 'Appendix'), ], default='apartment')
     property_instrument_number = fields.Char(string='Property Instrument number')
     property_instrument_attach = fields.Binary(attachment=True,string='Property Instrument Attach')
+    electricity_attach = fields.Binary(attachment=True,string='Electricity Attach')
     property_instrument_date = fields.Date(string='Property Instrument Date')
     location_url = fields.Char(string='Location URL')
     location = fields.Char(string='location')
@@ -170,6 +171,7 @@ class GrantBenefitProfile(models.Model):
     mother_relation = fields.Selection(
         [('mother', _('Mother')), ('replacement_mother', _('Replacement Mother'))])
     mother_relationn = fields.Many2one('relation.settings',domain="['|',('relation_type','=','mother'),('relation_type','=','replacement_mother')]")
+    replacement_mother_relation = fields.Many2one('relation.settings',domain="[('relation_type','=','replacement_mother')]")
     mother_id = fields.Many2one('grant.benefit', domain="[('benefit_type','!=','orphan'),('gender','=','female')]")
     mother_name = fields.Char(string="Mother Name", tracking=True)
     mother_second_name = fields.Char(string="Mother Second Name", tracking=True)
@@ -210,8 +212,7 @@ class GrantBenefitProfile(models.Model):
     date_death_husband = fields.Date()
     date_divorcee = fields.Date()
     # Education_data
-    education_status = fields.Selection(string='Education Status',
-                                        selection=[('educated', 'educated'), ('illiterate', 'illiterate')])
+    education_status = fields.Selection(string='Education Status',selection=[('educated', 'educated'), ('illiterate', 'illiterate'),('under_study_age','Under Study Age')])
     case_study = fields.Selection(string='Case Study',
                                   selection=[('continuous', 'continuous'), ('intermittent', 'intermittent'),
                                              ('graduate', 'Graduate')])
@@ -486,8 +487,7 @@ class GrantBenefitProfile(models.Model):
     replacement_is_alhaju = fields.Boolean(string='IS Hajj')
     replacement_is_amra = fields.Boolean(string='IS Umra')
     # Education_data for replacement mother
-    replacement_education_status = fields.Selection(string='Education Status',
-                                        selection=[('educated', 'educated'), ('illiterate', 'illiterate')])
+    replacement_education_status = fields.Selection(string='Education Status',selection=[('educated', 'educated'), ('illiterate', 'illiterate'),('under_study_age','Under Study Age')])
     replacement_case_study = fields.Selection(string='Case Study',
                                   selection=[('continuous', 'continuous'), ('intermittent', 'intermittent'),
                                              ('graduate', 'Graduate')])
@@ -1392,7 +1392,7 @@ class GrantBenefitProfile(models.Model):
                 'is_mother':True,
                 'birth_date': rec.replacement_mother_birth_date,
                 'gender': 'female',
-                'relationn': self.env['relation.settings'].search([('relation_type','=','replacement_mother')]).id,
+                'relationn': rec.replacement_mother_relation.id,
                 'mother_marital_conf': rec.replacement_mother_marital_conf.id,
                 'mother_location': rec.replacement_mother_location,
                 'age': rec.replacement_mother_age,
@@ -1490,7 +1490,7 @@ class GrantBenefitProfile(models.Model):
                 'is_mother': True,
                 'birth_date': rec.replacement_mother_birth_date,
                 'gender': 'female',
-                'relationn': self.env['relation.settings'].search([('relation_type','=','replacement_mother')]).id,
+                'relationn': rec.replacement_mother_relation.id,
                 'mother_marital_conf': rec.replacement_mother_marital_conf.id,
                 'mother_location': rec.replacement_mother_location,
                 'age': rec.replacement_mother_age,
diff --git a/odex25_ensan/odex_benefit/models/family_members.py b/odex25_ensan/odex_benefit/models/family_members.py
index 4af9778ca..fe912a56e 100644
--- a/odex25_ensan/odex_benefit/models/family_members.py
+++ b/odex25_ensan/odex_benefit/models/family_members.py
@@ -74,8 +74,7 @@ class FamilyMemberProfile(models.Model):
     is_alhaju = fields.Boolean(string='Member Hajj')
     is_amra = fields.Boolean(string='Member Umra')
     # Education_data
-    education_status = fields.Selection(string='Education Status',
-                                        selection=[('educated', 'educated'), ('illiterate', 'illiterate')])
+    education_status = fields.Selection(string='Education Status',selection=[('educated', 'educated'), ('illiterate', 'illiterate'),('under_study_age', 'Under Study Age')])
     case_study = fields.Selection(string='Case Study',
                                   selection=[('continuous', 'continuous'), ('intermittent', 'intermittent'),
                                              ('graduate', 'Graduate')])
diff --git a/odex25_ensan/odex_benefit/views/benefit_view.xml b/odex25_ensan/odex_benefit/views/benefit_view.xml
index 9d9960af4..910d7d245 100644
--- a/odex25_ensan/odex_benefit/views/benefit_view.xml
+++ b/odex25_ensan/odex_benefit/views/benefit_view.xml
@@ -243,6 +243,7 @@
                                 <!--                                <field name="iban" readonly="1" force_save="1"/>-->
                                 <!--                                <field name="is_producer" widget="boolean_toggle"/>-->
                                 <field name="sms_phone" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'required':True}"/>
+                                <field name="city_id" attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}" string="City"/>
                                  <field name="branch_custom_id" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}" required="1"/>
                                  <field name="district_id" attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
                                  <button name="get_location_on_map" string="open in Map Directly" type="object" class="oe_highlight" attrs="{'invisible': ['|',('lat', '=', 0.0), ('lon', '=', 0.0)]}"/>
@@ -353,60 +354,58 @@
                                 <h3>Current Education Status</h3>
                                 <group>
                                     <group>
-                                        <field name="education_status"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                        <field name="education_status" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                        <field name="education_levels" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                         <field name="illiterate_reason" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],
-                                        'invisible':[('education_status','!=','illiterate')]}"/>
+                                       'invisible':[('education_status','!=','illiterate')]}"/>
                                         <field name="case_study"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                             <field name="intermittent_reason" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('case_study','!=','intermittent')]}"/>
                                         <field name="education_entity"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                         <field name="entities"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="education_levels" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="educational_certificate" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
+                                        <field name="educational_certificate" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                     </group>
                                     <group>
                                         <field name="specialization_ids"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                         <field name="classroom"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                         <field name="degree"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                         <field name="percentage"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="education_start_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="education_end_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
+                                        <field name="education_start_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
+                                        <field name="education_end_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                     </group>
                                 </group>
-                                <h3 attrs="{'invisible':[('education_status','=','illiterate')]}">Last Education
+                                <h3 attrs="{'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}">Last Education
                                     Status
                                 </h3>
                                 <group>
                                     <group>
                                         <field name="last_education_entity"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                         <field name="last_entities"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="last_education_levels"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
+                                        <field name="last_education_levels" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                         <field name="last_specialization_ids"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="last_educational_certificate" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
+                                        <field name="last_educational_certificate" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                     </group>
                                     <group>
                                         <field name="last_classroom"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                         <field name="last_degree"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                         <field name="last_percentage"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                         <field name="weak_study"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"
                                                widget="many2many_tags"/>
-                                        <field name="last_education_start_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="last_education_end_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                        <field name="last_education_start_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
+                                        <field name="last_education_end_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                     </group>
                                 </group>
                             </page>
@@ -418,6 +417,7 @@
                                         attrs="{'invisible': [('replacement_mother_status', '!=', 'benefit')]}"/>
                                 <group>
                                     <group>
+                                        <field name="replacement_mother_relation" class="oe_inline" options='{"no_open": True,"no_create_edit": True}' attrs="{'required':[('state','!=','draft'),('add_replacement_mother','=',True)],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
                                         <field name="replacement_mother_name"
                                                attrs="{'required':[('state','!=','draft'),('add_replacement_mother','=',True)],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
                                         <field name="replacement_mother_second_name"
@@ -456,60 +456,58 @@
                                 <h3>Current Education Status</h3>
                                 <group>
                                     <group>
-                                        <field name="replacement_education_status"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-                                        <field name="replacement_illiterate_reason" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],
-                                        'invisible':[('education_status','!=','illiterate')]}"/>
+                                        <field name="replacement_education_status" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                        <field name="replacement_education_levels" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
+                                        <field name="replacement_illiterate_reason" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','!=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                         <field name="replacement_case_study"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                         <field name="replacement_intermittent_reason" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('case_study','!=','intermittent')]}"/>
                                         <field name="replacement_education_entity"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                         <field name="replacement_entities"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="replacement_education_levels" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="replacement_educational_certificate" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
+                                        <field name="replacement_educational_certificate" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                     </group>
                                     <group>
                                         <field name="replacement_specialization_ids"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                         <field name="replacement_classroom"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                         <field name="replacement_degree"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                         <field name="replacement_percentage"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="replacement_education_start_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="replacement_education_end_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
+                                        <field name="replacement_education_start_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
+                                        <field name="replacement_education_end_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                     </group>
                                 </group>
-                                <h3 attrs="{'invisible':[('replacement_education_status','=','illiterate')]}">Last Education
+                                <h3 attrs="{'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}">Last Education
                                     Status
                                 </h3>
                                 <group>
                                     <group>
                                         <field name="replacement_last_education_entity"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                         <field name="replacement_last_entities"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                         <field name="replacement_last_education_levels"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                         <field name="replacement_last_specialization_ids"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="replacement_last_educational_certificate" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
+                                        <field name="replacement_last_educational_certificate" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                     </group>
                                     <group>
                                         <field name="replacement_last_classroom"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                         <field name="replacement_last_degree"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                         <field name="replacement_last_percentage"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                         <field name="replacement_weak_study"
-                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"
                                                widget="many2many_tags"/>
-                                        <field name="replacement_last_education_start_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                        <field name="replacement_last_education_end_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                        <field name="replacement_last_education_start_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
+                                        <field name="replacement_last_education_end_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('replacement_education_status','=','illiterate'),('replacement_education_status','=','under_study_age')]}"/>
                                     </group>
                                 </group>
                             </page>
@@ -611,61 +609,59 @@
                                                         <group>
                                                             <field name="is_scientific_specialty" invisible="1"/>
                                                             <field name="is_medical_specialty" invisible="1"/>
-                                                            <field name="education_status"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])]}"/>
+                                                            <field name="education_status" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])]}"/>
+                                                            <field name="education_levels" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                             <field name="illiterate_reason" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],
                                                                   'invisible':[('education_status','!=','illiterate')]}"/>
                                                             <field name="case_study"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                             <field name="intermittent_reason" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('case_study','!=','intermittent')]}"/>
                                                             <field name="education_entity"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                             <field name="entities"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                                            <field name="education_levels"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                                            <field name="educational_certificate" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
+                                                            <field name="educational_certificate" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                         </group>
                                                         <group>
                                                             <field name="specialization_ids"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                             <field name="classroom"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                             <field name="degree"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                             <field name="percentage"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                                            <field name="education_start_date" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                                            <field name="education_end_date" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
+                                                            <field name="education_start_date" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
+                                                            <field name="education_end_date" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                         </group>
                                                     </group>
-                                                    <h3 attrs="{'invisible':[('education_status','=','illiterate')]}">
+                                                    <h3 attrs="{'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}">
                                                         Last Education Status
                                                     </h3>
                                                     <group>
                                                         <group>
                                                             <field name="last_education_entity"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                             <field name="last_entities"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                             <field name="last_education_levels"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                             <field name="last_specialization_ids"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                                            <field name="last_educational_certificate" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
+                                                            <field name="last_educational_certificate" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                         </group>
                                                         <group>
                                                             <field name="last_classroom"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                             <field name="last_degree"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                             <field name="last_percentage"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                             <field name="weak_study"
-                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"
+                                                                   attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"
                                                                    widget="many2many_tags"/>
-                                                           <field name="last_education_start_date" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
-                                                            <field name="last_education_end_date" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':[('education_status','=','illiterate')]}"/>
+                                                           <field name="last_education_start_date" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
+                                                            <field name="last_education_end_date" attrs="{'readonly':[('parent.state','not in',['draft','complete_info','edit_info'])],'invisible':['|',('education_status','=','illiterate'),('education_status','=','under_study_age')]}"/>
                                                         </group>
                                                     </group>
                                                 </page>
@@ -723,63 +719,60 @@
                             <page string="Housing information">
                                 <form string="Housing">
                                     <sheet>
-                                        <!--                                        <div class="oe_title">-->
-                                        <!--                                            <h1>-->
-                                        <!--                                                <field placeholder="Name" name="housing_name" class="oe_inline" readonly="1" force_save="1"/>-->
-                                        <!--                                            </h1>-->
-                                        <!--                                        </div>-->
-                                        <h3>National address</h3>
-<!--                                        <group>-->
-<!--                                            <button name="geo_localize" string="Map" type="object"-->
-<!--                                                    class="oe_highlight"/>-->
-<!--                                        </group>-->
+                                    <group>
                                         <group>
-                                            <group>
-                                                <field name="country_id" attrs="{'required':[('state','!=','draft')]}"
-                                                       readonly="1"/>
-                                                <field name="state_id" attrs="{'required':[('state','!=','draft')]}"
-                                                       readonly="1" string="Region"/>
-                                                <field name="city_id" attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"
-                                                       string="City"/>
-                                                <field name="zip" attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-                                                <field name="block" attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-                                                <field name="house_number"
-                                                       attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-                                                <field name="street" attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-<!--                                                <field name="lat"-->
-<!--                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>-->
-<!--                                                <field name="lon"-->
-<!--                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>-->
-<!--                                                <field name="location_url"-->
-<!--                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>-->
-                                            </group>
-                                            <group>
-                                                <field name="floor"
-                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-                                                <field name="housing_number"
-                                                       attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-                                                <field name="nearby_mosque"
-                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-                                                <field name="housing_note"
-                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-                                                <field name="note_neighborhood"
-                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-                                                <field name="housing_type"
-                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-                                                <field name="housing_cat"
-                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-                                                <field name="property_type"
-                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
-                                                <field name="rent_amount" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','rent'),('property_type','!=','rent_shared')]}"/>
-                                                <field name="contract_num" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','rent'),('property_type','!=','rent_shared')]}"/>
-                                                <field name="rent_start_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','rent'),('property_type','!=','rent_shared')]}"/>
-                                                <field name="rent_end_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','rent'),('property_type','!=','rent_shared')]}"/>
-                                                <field name="rent_attachment" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','rent'),('property_type','!=','rent_shared')]}"/>
-                                                <field name="property_instrument_number" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','ownership'),('property_type','!=','charitable'),('property_type','!=','ownership_shared')]}"/>
-                                                <field name="property_instrument_attach" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','ownership'),('property_type','!=','charitable'),('property_type','!=','ownership_shared')]}"/>
-                                                <field name="property_instrument_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','ownership'),('property_type','!=','charitable'),('property_type','!=','ownership_shared')]}"/>
-                                            </group>
+                                            <h3>National address</h3>
+                                            <field name="country_id" attrs="{'required':[('state','!=','draft')]}"
+                                                   readonly="1"/>
+                                            <field name="state_id" attrs="{'required':[('state','!=','draft')]}"
+                                                   readonly="1" string="Region"/>
+                                            <field name="zip" attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                            <field name="block" attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                            <field name="house_number"
+                                                   attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                            <field name="street" attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+    <!--                                                <field name="lat"-->
+    <!--                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>-->
+    <!--                                                <field name="lon"-->
+    <!--                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>-->
+    <!--                                                <field name="location_url"-->
+    <!--                                                       attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>-->
                                         </group>
+                                        <group>
+                                            <h3> Housing details</h3>
+                                            <field name="floor"
+                                                   attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                            <field name="housing_number"
+                                                   attrs="{'required':[('state','!=','draft')],'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                            <field name="nearby_mosque"
+                                                   attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                            <field name="housing_note"
+                                                   attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                            <field name="note_neighborhood"
+                                                   attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                            <field name="housing_cat"
+                                                   attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                        </group>
+                                    </group>
+                                    <group>
+                                        <h3> Property details</h3>
+                                        <group>
+                                        </group>
+                                        <group>
+                                            <field name="housing_type" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                            <field name="property_type"
+                                               attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])]}"/>
+                                            <field name="rent_amount" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','rent'),('property_type','!=','rent_shared')]}"/>
+                                            <field name="contract_num" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','rent'),('property_type','!=','rent_shared')]}"/>
+                                            <field name="rent_start_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','rent'),('property_type','!=','rent_shared')]}"/>
+                                            <field name="rent_end_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','rent'),('property_type','!=','rent_shared')]}"/>
+                                            <field name="rent_attachment" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','rent'),('property_type','!=','rent_shared')]}"/>
+                                            <field name="property_instrument_number" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','ownership'),('property_type','!=','charitable'),('property_type','!=','ownership_shared')]}"/>
+                                            <field name="property_instrument_attach" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','ownership'),('property_type','!=','charitable'),('property_type','!=','ownership_shared')]}"/>
+                                            <field name="property_instrument_date" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','!=','ownership'),('property_type','!=','charitable'),('property_type','!=','ownership_shared')]}"/>
+                                            <field name="electricity_attach" attrs="{'readonly':[('state','not in',['draft','complete_info','edit_info'])],'invisible':[('property_type','=',False)]}"/>
+                                        </group>
+                                    </group>
                                          <group colspan="2" col="2">
                                                 <separator string="Geolocation" colspan="2"/>
                                                 <button string="Geolocalize" name="geo_localize" type="object" icon="fa-check" colspan="2"/>