From 44258327a27dc1ed33e4da3fb5bb954954f2190f Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Tue, 16 Sep 2025 14:35:32 +0100
Subject: [PATCH] IMP benefit

---
 odex25_ensan/odex_benefit/models/benefit.py       | 15 +++++----------
 .../odex_benefit/views/actions_and_menus.xml      | 15 ++++++++-------
 odex25_ensan/odex_benefit/views/visit.xml         |  1 +
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/odex25_ensan/odex_benefit/models/benefit.py b/odex25_ensan/odex_benefit/models/benefit.py
index 6321b491e..930ea3d37 100644
--- a/odex25_ensan/odex_benefit/models/benefit.py
+++ b/odex25_ensan/odex_benefit/models/benefit.py
@@ -1230,27 +1230,22 @@ class GrantBenefitProfile(models.Model):
 
     @api.model
     def create(self, vals):
-        # for line_vals in vals:
-        #     if line_vals.get("education_status", False) == "educated" and "member_education_status_ids" not in line_vals:
-        #         raise ValidationError(
-        #             _("You should at least insert one current/previous education status!")
-        #         )
-        #     elif line_vals.get("replacement_education_status", False) == "educated" and "replacement_education_status_ids" not in line_vals:
-        #         raise ValidationError(
-        #             _("You should at least insert one current/previous mother education status!")
-        #         )
         res = super(GrantBenefitProfile, self).create(vals)
         if "applicant_name" not in vals:
             res.applicant_name = self.env.user.display_name
         if "name" in vals and res.user_id:
             res.user_id.sudo().write({"name": vals.get("name")})
-        # res = super(GrantBenefitProfile, self).create(vals)
         if res.user_id:
             res.sudo().user_id.write({"name": res.name})
         if not self.env.context.get('force_website', False):
             res._validate_required_attachments()
         if not res.code or res.code == _('New'):
             res.code = self.env['ir.sequence'].sudo().next_by_code('benefit.sequence') or _('New')
+        # Add mother
+        if res.mother_id_number:
+            res.add_mother_as_member()
+        if res.add_replacement_mother and res.replacement_mother_id_number:
+            res.add_replacement_mother_as_member()
         return res
 
     def unlink(self):
diff --git a/odex25_ensan/odex_benefit/views/actions_and_menus.xml b/odex25_ensan/odex_benefit/views/actions_and_menus.xml
index c9a1d35ab..253bcc2e5 100644
--- a/odex25_ensan/odex_benefit/views/actions_and_menus.xml
+++ b/odex25_ensan/odex_benefit/views/actions_and_menus.xml
@@ -781,13 +781,6 @@
         <!--        <menuitem id="benefit_black_list_menu" name="Beneficiaries Black List" sequence="5"-->
         <!--                  parent="benefit_main_menu" action="grant_benefit_black_list_action"/>-->
         <!--<===============================================================================>-->
-        <!--benefit vehicle model-->
-        <menuitem id="benefit_vehicle_model_settings_menu" name="Vehicle Settings" parent="odex_benefit.benefit_tools" sequence="4"/>
-        <menuitem id='benefit_vehicle_model_menu' name='Vehicle Model' parent='benefit_vehicle_model_settings_menu' action="benefit_vehicle_model_action" sequence="1"/>
-        <!--social search-->
-        <!--اللجان-->
-        <menuitem id="social_search_settings_menu" name="Social Search Settings" parent="odex_benefit.benefit_tools" sequence="4"/>
-        <menuitem id='social_search_committees_menu' name='Social Research Teams' parent='social_search_settings_menu' action="action_social_search_committees" sequence="1"/>
         <!--البحث الاجتماعي-->
         <menuitem id="visits_menu" name="Visits" parent="social_search_menu"
                   action="visits_action" sequence="4"/>
@@ -809,6 +802,14 @@
         <menuitem id='benefit_tools' name='Tools' parent='benefits_root_menu'
                   sequence="8" groups="odex_benefit.group_benefit_manager"/>
 
+         <!--benefit vehicle model-->
+        <menuitem id="benefit_vehicle_model_settings_menu" name="Vehicle Settings" parent="odex_benefit.benefit_tools" sequence="4"/>
+        <menuitem id='benefit_vehicle_model_menu' name='Vehicle Model' parent='benefit_vehicle_model_settings_menu' action="benefit_vehicle_model_action" sequence="1"/>
+        <!--social search-->
+        <!--اللجان-->
+        <menuitem id="social_search_settings_menu" name="Social Search Settings" parent="odex_benefit.benefit_tools" sequence="4"/>
+        <menuitem id='social_search_committees_menu' name='Social Research Teams' parent='social_search_settings_menu' action="action_social_search_committees" sequence="1"/>
+
         <!--###########################################################-->
         <!--benefit config-->
         <!--###########################################################-->
diff --git a/odex25_ensan/odex_benefit/views/visit.xml b/odex25_ensan/odex_benefit/views/visit.xml
index f7553346f..a46b98bd2 100644
--- a/odex25_ensan/odex_benefit/views/visit.xml
+++ b/odex25_ensan/odex_benefit/views/visit.xml
@@ -138,6 +138,7 @@
                                 <field name="visit_objective" invisible="1"
                                        attrs="{'readonly':[('state', 'in', ['close','cancel'])]}"/>
                                 <field name="otp_code" invisible="1"/>
+                                <field name="otp_generated_at" invisible="1"/>
                                 <field name="response_id" invisible="1"/>
                                 <field name="survey_url" invisible="1"/>
                             </group>