From 9159dbd18395a9f14f8e0e06b523ef8dc16bef23 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Mon, 19 Jan 2026 11:25:52 +0100
Subject: [PATCH 01/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po    |  6 +++-
 .../odex_benefit/models/family_members.py     | 35 +++++++++++++------
 .../odex_benefit/views/family_members.xml     | 22 ++++++------
 .../wizards/suspend_reason_wizard.py          |  4 +++
 4 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index 330cfca57..37743d6c2 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -18094,11 +18094,15 @@ msgid "Resume Approval by Family Services Manager"
 msgstr "اعتماد مديرة خدمات المستفيدين للإعادة"
 
 #. module: odex_benefit
-#: model_terms:ir.ui.view,arch_db:odex_benefit.family_member_form
 #: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
 msgid "Resume Family Service"
 msgstr "إعادة الأسرة للخدمة"
 
+#. module: odex_benefit
+#: model_terms:ir.ui.view,arch_db:odex_benefit.family_member_form
+msgid "Resume Member Service"
+msgstr "إعادة الفرد للخدمة"
+
 #. module: odex_benefit
 #: model_terms:ir.ui.view,arch_db:odex_benefit.family_member_form
 #: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py
index a34409bd2..e2ecf2073 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -567,6 +567,7 @@ class FamilyMemberProfile(models.Model):
         'member_location_conf',
         'state',
         'is_dead',
+        'is_work',
         'benefit_id.member_ids.member_status',
     )
     def check_member_status(self):
@@ -698,8 +699,7 @@ class FamilyMemberProfile(models.Model):
                         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':
+                    if rec.is_work and rec.member_income > max_income_for_benefit:
                         rec.member_status = 'non_benefit'
                         reasons.append(_("She works with a salary greater than %s.") % max_income_for_benefit)
                     if rec.is_work and rec.education_status in ['illiterate']:
@@ -892,6 +892,11 @@ class FamilyMemberProfile(models.Model):
 
     # Member Suspend Manual
     def action_suspend(self):
+        ctx = dict(self.env.context or {})
+        ctx.update({
+            'active_model': 'family.member',
+            'active_id': self.id,
+        })
         return {
             'name': _('Suspend Reason Wizard'),
             'view_mode': 'form',
@@ -900,11 +905,17 @@ class FamilyMemberProfile(models.Model):
             'res_model': 'suspend.reason.wizard',
             'view_id': self.env.ref('odex_benefit.view_suspend_member_reason_wizard_form').id,
             'target': 'new',
+            'context': ctx,
         }
 
     def action_resume_member(self):
         ctx = dict(self.env.context or {})
-        ctx['resume_family'] = True
+        #ctx['resume_family'] = True
+        ctx.update({
+            'resume_family': True,
+            'active_model': 'family.member',
+            'active_id': self.id,
+        })
         return {
             'name': _('Resume Reason Wizard'),
             'view_mode': 'form',
@@ -951,6 +962,7 @@ class FamilyMemberProfile(models.Model):
                 rec.state_a = 'family_services_manager'
             else:
                 rec.state_a = 'second_approve'
+                rec.is_member_workflow = False
                 rec.action_type = 'approved'
 
     def action_suspend_third_accept(self):
@@ -963,6 +975,7 @@ class FamilyMemberProfile(models.Model):
     def action_resume_third_accept(self):
         for rec in self:
             rec.state_a = 'second_approve'
+            rec.is_member_workflow = False
             rec.action_type = 'approved'
 
     def action_suspend_refuse(self):
@@ -1136,28 +1149,28 @@ class FamilyMemberProfile(models.Model):
         for record in self:
             if not record.member_phone:
                 continue
-            
+
             phone = record.member_phone
-            
+
             # Remove +966 prefix if present
             if phone.startswith('+966'):
                 phone = phone[4:]
                 record.member_phone = phone
-            
+
             # Validate Saudi mobile pattern
             if re.match(SAUDI_MOBILE_PATTERN, phone) is None:
                 raise ValidationError(
                     _('Enter a valid Saudi mobile number'))
-            
+
             # Check phone against family's main phones
             if record.benefit_id and phone in [
-                record.benefit_id.phone, 
-                record.benefit_id.phone2, 
+                record.benefit_id.phone,
+                record.benefit_id.phone2,
                 record.benefit_id.sms_phone
             ]:
                 raise ValidationError(
                     _("Phone number cannot be the same in The Family"))
-            
+
             # Check for duplicate phone in other members (excluding current record)
             exist = self.search([
                 ('member_phone', '=', phone),
@@ -1166,7 +1179,7 @@ class FamilyMemberProfile(models.Model):
             if exist:
                 raise ValidationError(
                     _("The phone Number already exists in Family with code %s") % exist.benefit_id.code)
-            
+
             # Check if phone exists in grant.benefit
             exist_in_family = self.env["grant.benefit"].search([
                 '|', '|',
diff --git a/odex25_benefit/odex_benefit/views/family_members.xml b/odex25_benefit/odex_benefit/views/family_members.xml
index e62bd76b1..28578e741 100644
--- a/odex25_benefit/odex_benefit/views/family_members.xml
+++ b/odex25_benefit/odex_benefit/views/family_members.xml
@@ -13,44 +13,44 @@
                                 confirm="Are you sure you want to move  to Temporarily Suspended ?"/>
                         <button name="action_suspend_first_accept" type="object"
                                 string="First Approve" class="oe_highlight"
-                                attrs="{'invisible': ['|',('action_type','!=','suspended'),('state', 'not in', ['waiting_approve'])]}"
+                                attrs="{'invisible': ['|','|',('action_type','!=','suspended'),('state', 'not in', ['waiting_approve']),('is_member_workflow','=',False)]}"
                         />
                         <button name="action_suspend_second_accept" type="object"
                                 string="Second Approve" class="oe_highlight"
-                                attrs="{'invisible': ['|',('action_type','!=','suspended'),('state', 'not in', ['first_approve'])]}"
+                                attrs="{'invisible': ['|','|',('action_type','!=','suspended'),('state', 'not in', ['first_approve']),('is_member_workflow','=',False)]}"
                         />
                         <button name="action_suspend_third_accept" type="object"
                                 string="Third Approve" class="oe_highlight"
                                 groups="odex_benefit.group_benefit_manager"
-                                attrs="{'invisible': ['|',('action_type','!=','suspended'),('state', 'not in', ['family_services_manager'])]}"/>
+                                attrs="{'invisible': ['|','|',('action_type','!=','suspended'),('state', 'not in', ['family_services_manager']),('is_member_workflow','=',False)]}"/>
                         <button name="action_resume_first_accept" type="object"
                                 string="Resume Approval by Operations Head" class="oe_highlight"
-                                attrs="{'invisible': ['|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['waiting_approve'])]}"
+                                attrs="{'invisible': ['|','|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['waiting_approve']),('is_member_workflow','=',False)]}"
                                 groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager"
                         />
                         <button name="action_resume_second_accept" type="object"
                                 string="Resume Approval by Branch Manager" class="oe_highlight"
                                 groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"
-                                attrs="{'invisible': ['|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['first_approve'])]}"/>
+                                attrs="{'invisible': ['|','|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['first_approve']),('is_member_workflow','=',False)]}"/>
                         <button name="action_resume_third_accept" type="object"
                                 string="Resume Approval by Family Services Manager" class="oe_highlight"
                                 groups="odex_benefit.group_benefit_manager"
-                                attrs="{'invisible': ['|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['family_services_manager'])]}"/>
-                        <button name="action_resume_member" string="Resume Family Service"
+                                attrs="{'invisible': ['|','|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['family_services_manager']),('is_member_workflow','=',False)]}"/>
+                        <button name="action_resume_member" string="Resume Member Service"
                                 type="object" class="btn btn-success"
-                                attrs="{'invisible': [('state', 'not in', ['temporary_suspended', 'suspended_second_approve'])]}"
+                                attrs="{'invisible': ['|',('state', 'not in', ['temporary_suspended', 'suspended_second_approve']),('is_member_workflow','=',False)]}"
                                 groups="odex_benefit.group_benefit_researcher"/>
                         <button name="action_final_suspend" type="object"
                                 string="Final Suspension" class="btn btn-danger"
-                                attrs="{'invisible': [('state', '!=', 'temporary_suspended')]}"
+                                attrs="{'invisible': ['|',('state', '!=', 'temporary_suspended'),('is_member_workflow','=',False)]}"
                                 groups="odex_benefit.group_benefit_manager"/>
                         <button name="action_reject_resume" type="object"
                                 string="Reject Resume" class="oe_highlight"
-                                attrs="{'invisible': ['|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['waiting_approve','first_approve','family_services_manager'])]}"
+                                attrs="{'invisible': ['|','|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['waiting_approve','first_approve','family_services_manager']),('is_member_workflow','=',False)]}"
                         />
                         <button name="action_suspend_refuse" type="object"
                                 string="Suspend Refuse" class="oe_highlight"
-                                attrs="{'invisible': ['|',('action_type','!=','suspended'),('state', 'not in', ['waiting_approve','first_approve','family_services_manager','suspended_second_approve'])]}"
+                                attrs="{'invisible': ['|','|',('action_type','!=','suspended'),('state', 'not in', ['waiting_approve','first_approve','family_services_manager','suspended_second_approve']),('is_member_workflow','=',False)]}"
                         />
                         <!-- Exception -->
                         <button name="action_exception" type="object"
diff --git a/odex25_benefit/odex_benefit/wizards/suspend_reason_wizard.py b/odex25_benefit/odex_benefit/wizards/suspend_reason_wizard.py
index 62aaa9693..8b0139416 100644
--- a/odex25_benefit/odex_benefit/wizards/suspend_reason_wizard.py
+++ b/odex25_benefit/odex_benefit/wizards/suspend_reason_wizard.py
@@ -81,6 +81,9 @@ class SuspendReasonWizard(models.TransientModel):
                 action_type = ('resume_from_temporary'
                                if benefit.state == 'temporary_suspended'
                                else 'resume_from_final')
+                benefit.member_ids.write({
+                    'action_type': action_type,
+                })
                 vals = {
                     'state': 'waiting_approve',
                     'action_type': action_type,
@@ -97,6 +100,7 @@ class SuspendReasonWizard(models.TransientModel):
                     'is_excluded_suspension': False,
                     'is_member_workflow': False,
                     'final_suspend_date': rec.final_suspend_date,
+                    'action_type': 'suspended',
                 })
                 if rec.suspend_attachment:
                     attachment = rec._create_attachment_record_from_binary()

From 2e56e9fb7b168ff8857957cd9f4ccb3203282871 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Mon, 19 Jan 2026 12:49:34 +0100
Subject: [PATCH 02/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po    |  6 ---
 odex25_benefit/odex_benefit/models/benefit.py | 47 ++++++++++---------
 .../odex_benefit/models/family_members.py     | 28 ++++++-----
 .../odex_benefit/views/benefit_view.xml       |  2 +-
 .../odex_benefit/views/family_members.xml     |  7 +++
 5 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index 37743d6c2..f05e4a111 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -11469,12 +11469,6 @@ msgstr ""
 "رقم التعريف الضريبي. قم بإكماله إذا كانت جهة الاتصال تخضع للضرائب الحكومية. "
 "يُستخدم في بعض المستندات القانونية."
 
-#. module: odex_benefit
-#: code:addons/odex_benefit/models/benefit.py:0
-#, python-format
-msgid "The account number already exists!"
-msgstr ""
-
 #. module: odex_benefit
 #: code:addons/odex_benefit/models/death_reason_settings.py:0
 #: model:ir.model.constraint,message:odex_benefit.constraint_death_reason_settings_uniq_name
diff --git a/odex25_benefit/odex_benefit/models/benefit.py b/odex25_benefit/odex_benefit/models/benefit.py
index 4a557c9a3..2dd9ee776 100644
--- a/odex25_benefit/odex_benefit/models/benefit.py
+++ b/odex25_benefit/odex_benefit/models/benefit.py
@@ -1664,18 +1664,19 @@ class GrantBenefitProfile(models.Model):
                 if messages:
                     raise UserError("\n".join(messages))
 
-            if not rec.user_id:
-                self.sudo().create_user()
+            #if not rec.user_id:
+            #    self.sudo().create_user()
 
-            rec.user_id.sudo().write({
-                'groups_id': [(3, self.env.ref('base.group_user', False).id)],
-            })
-            # rec.user_id.sudo().write({
-            #     'groups_id': [(4, self.env.ref('odex_benefit.group_benefit_user', False).id)],
-            # })
-            rec.user_id.sudo().write({
-                'groups_id': [(4, self.env.ref('base.group_portal', False).id)],
-            })
+            if rec.user_id:
+                rec.user_id.sudo().write({
+                    'groups_id': [(3, self.env.ref('base.group_user', False).id)],
+                })
+                # rec.user_id.sudo().write({
+                #     'groups_id': [(4, self.env.ref('odex_benefit.group_benefit_user', False).id)],
+                # })
+                rec.user_id.sudo().write({
+                    'groups_id': [(4, self.env.ref('base.group_portal', False).id)],
+                })
             if rec.action_type == 'new':
                 rec.approve_date = datetime.now()
             self.sudo().send_approval_benefit_email()
@@ -1795,14 +1796,14 @@ class GrantBenefitProfile(models.Model):
 
     # @api.multi
     def action_edit_info(self):
-        user = self.user_id
-        if not user:
-            user = self.env['res.users'].sudo().search(
-                [('partner_id', '=', self.partner_id.id), ('active', '=', False)])
-            if user:
-                user.write({'active': True})
-            else:
-                user = self.create_user()
+        #user = self.user_id
+        #if not user:
+        #    user = self.env['res.users'].sudo().search(
+        #        [('partner_id', '=', self.partner_id.id), ('active', '=', False)])
+        #    if user:
+        #        user.write({'active': True})
+        #    else:
+        #        user = self.create_user()
         #group_e = self.env.ref('odex_benefit.group_benefit_edit', False)
         try:
             #group_e.sudo().write({'users': [(4, user.id)]})
@@ -2640,11 +2641,11 @@ class GrantBenefitProfile(models.Model):
                 raise ValidationError(_("The IBAN number must contain exactly 22 digits."))
 
             # Check if the account number already exists in the partner bank or benefit
-            partner_exist = self.env['res.partner.bank'].search([('acc_number', '=', self.acc_number)], limit=1)
-            benefit_exist = self.search([('acc_number', '=', self.acc_number)], limit=1)
+            #partner_exist = self.env['res.partner.bank'].search([('acc_number', '=', self.acc_number)], limit=1)
+            #benefit_exist = self.search([('acc_number', '=', self.acc_number)], limit=1)
 
-            if partner_exist or benefit_exist:
-                raise ValidationError(_("The account number already exists!"))
+            #if partner_exist or benefit_exist:
+            #    raise ValidationError(_("The account number already exists!"))
 
     @api.onchange('mother_marital_conf', 'mother_location_conf', 'mother_net_income')
     def _onchange_mother_info(self):
diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py
index e2ecf2073..f3bb20b68 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -422,18 +422,24 @@ class FamilyMemberProfile(models.Model):
                           "Numbers and special characters are not allowed.") % field_label
                     )
 
-    @api.depends('age')
+    @api.depends('age', 'relationn')
     def _compute_get_age_status(self):
+        validation_setting = self.env["family.validation.setting"].search([], limit=1)
+        female_benefit_age = validation_setting.female_benefit_age or 26
+        male_benefit_age = validation_setting.male_benefit_age or 18
+
         for rec in self:
-            current_education_status_id = rec.member_education_status_ids.filtered(
-                lambda r: r.education_status_type == 'current')
-            if rec.relationn.relation_type == 'son' and rec.age <= 18:
-                rec.age_status = 'minor'
-            elif rec.relationn.relation_type == 'daughter' and rec.age <= 26:
-                rec.age_status = 'minor'
-            elif rec.relationn.relation_type == 'son' and rec.age <= 22 and (
-                    current_education_status_id.specialization_ids.is_scientific_specialty or current_education_status_id.specialization_ids.is_medical_specialty):
-                rec.age_status = 'minor'
+            if not rec.relationn or not rec.relationn.relation_type:
+                rec.age_status = 'non_minor'
+                continue
+
+            age = rec.age or 0
+            rtype = rec.relationn.relation_type
+
+            if rtype == 'daughter':
+                rec.age_status = 'minor' if age < female_benefit_age else 'non_minor'
+            elif rtype == 'son':
+                rec.age_status = 'minor' if age < male_benefit_age else 'non_minor'
             else:
                 rec.age_status = 'non_minor'
 
@@ -910,7 +916,7 @@ class FamilyMemberProfile(models.Model):
 
     def action_resume_member(self):
         ctx = dict(self.env.context or {})
-        #ctx['resume_family'] = True
+        # ctx['resume_family'] = True
         ctx.update({
             'resume_family': True,
             'active_model': 'family.member',
diff --git a/odex25_benefit/odex_benefit/views/benefit_view.xml b/odex25_benefit/odex_benefit/views/benefit_view.xml
index 2733beaa1..2e76c14b3 100644
--- a/odex25_benefit/odex_benefit/views/benefit_view.xml
+++ b/odex25_benefit/odex_benefit/views/benefit_view.xml
@@ -708,7 +708,7 @@
                                             'invisible':[('father_dead_reason_id_not_defined', '=', False)],
                                             'readonly':[('state','not in',['draft','new','complete_info'])]}
                                         "/>
-                                        <field name="father_dead_date" required="1"
+                                        <field name="father_dead_date" required="0"
                                                attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}"/>
                                         <field name="father_dead_country_id" required="1"
                                                attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}"
diff --git a/odex25_benefit/odex_benefit/views/family_members.xml b/odex25_benefit/odex_benefit/views/family_members.xml
index 28578e741..31265349e 100644
--- a/odex25_benefit/odex_benefit/views/family_members.xml
+++ b/odex25_benefit/odex_benefit/views/family_members.xml
@@ -366,6 +366,13 @@
                            decoration-danger="state in ['refused','suspended_second_approve']"
                            decoration-warning="state in ['first_refusal','waiting_approve']"
                            decoration-info="state not in ('waiting_approve','draft','new','first_approve', 'second_approve','first_refusal','refused','suspended_second_approve')"/>
+                    <field name="action_type" widget="badge" optional="show"
+                           decoration-muted="action_type == 'new'"
+                           decoration-info="action_type == 'edit_info'"
+                           decoration-success="action_type == 'approved'"
+                           decoration-danger="action_type == 'suspended'"
+                           decoration-warning="action_type in ['resume_from_temporary', 'exception']"
+                           decoration-primary="action_type == 'resume_from_final'"/>
                 </tree>
             </field>
         </record>

From 9e0935d67b65f28c60d93ac4fb2a05745c9f92b4 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Mon, 19 Jan 2026 14:39:36 +0100
Subject: [PATCH 03/27] [IMP] odex_benefit: IMP benefit

---
 .../odex_benefit/views/actions_and_menus.xml        |  2 +-
 .../odex_benefit/views/service_request.xml          | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/odex25_benefit/odex_benefit/views/actions_and_menus.xml b/odex25_benefit/odex_benefit/views/actions_and_menus.xml
index 7ac943335..38246aa24 100644
--- a/odex25_benefit/odex_benefit/views/actions_and_menus.xml
+++ b/odex25_benefit/odex_benefit/views/actions_and_menus.xml
@@ -564,7 +564,7 @@
                 '|',
                 '&amp;','&amp;',
                 ('is_seasonal','=',False),
-                ('state','=','accounting_approve'),
+                ('state','in',['accounting_approve','return_to_bank','family_received_device','send_request_to_supplier']),
                 ('payment_order_state','=','none'),
                 '&amp;','&amp;','&amp;',
                 ('is_seasonal','=',True),
diff --git a/odex25_benefit/odex_benefit/views/service_request.xml b/odex25_benefit/odex_benefit/views/service_request.xml
index fe95e442b..6f0f63052 100644
--- a/odex25_benefit/odex_benefit/views/service_request.xml
+++ b/odex25_benefit/odex_benefit/views/service_request.xml
@@ -105,11 +105,13 @@
                                 states="accounting_approve"/>
                         <button name="action_first_refuse" type="object"
                                 string="Return the request to the specialist" class="btn btn-warning"
-                                states="accounting_approve"
+                                groups="odex_benefit.group_benefit_payment_accountant_accept"
+                                attrs="{'invisible': ['|','|',('state', '!=', 'accounting_approve'),('payment_order_count','!=',0),('total_moves', '!=', 0)]}"
                         />
                         <button name="action_refuse" type="object"
                                 string="Refuse" class="btn btn-danger"
-                                states="accounting_approve"
+                                groups="odex_benefit.group_benefit_payment_accountant_accept"
+                                attrs="{'invisible': ['|','|',('state', '!=', 'accounting_approve'),('payment_order_count','!=',0),('total_moves', '!=', 0)]}"
                         />
                         <button name="action_processed" type="object"
                                 string="Processed" class="oe_highlight"
@@ -177,7 +179,8 @@
                             <button name="action_open_related_move_records"
                                     class="oe_stat_button"
                                     icon="fa-file-text-o"
-                                    type="object" attrs="{'invisible': ['|',('total_moves', '=', 0),('payment_order_count','!=','0')]}">
+                                    type="object"
+                                    attrs="{'invisible': ['|',('total_moves', '=', 0),('payment_order_count','!=','0')]}">
                                 <field name="total_moves" widget="statinfo" string="Total Moves"/>
                             </button>
                         </div>
@@ -276,7 +279,7 @@
                                                ('exception', '=', False),
                                                '|',
                                                    '&amp;',
-                                                       ('state', 'not in', ['draft', 'researcher', 'waiting_approve', 'first_approve', 'gm_assistant', 'accounting_approve']),
+                                                       ('state', 'not in', ['draft', 'researcher']),
                                                        ('service_type', 'in', ['marriage', 'eid_gift', 'winter_clothing', 'ramadan_basket']),
                                                        ('service_type', 'in', ['electrical_devices', 'home_furnishing', 'rent'])
                                            ]
@@ -320,7 +323,7 @@
                             <page string="Services Attachments Settings"
                                   attrs="{'invisible':[('required_attach','=',False)]}">
                                 <field name="attachment_lines" widget="one2many_list">
-                                    <tree editable="bottom" delete="0">
+                                    <tree editable="bottom">
                                         <field name="name"/>
                                         <field name="service_attach" widget="many2many_attachment_preview"/>
                                         <field name="write_uid"/>

From c74cb8f89dd3e457928c6dce201ca34b7515105b Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Mon, 19 Jan 2026 15:33:53 +0100
Subject: [PATCH 04/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/models/benefit.py | 57 +++++++------------
 .../odex_benefit/models/benefit_config.py     |  2 +
 .../views/benefit_config_view.xml             | 14 ++++-
 .../odex_benefit/views/benefit_view.xml       |  6 +-
 4 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/odex25_benefit/odex_benefit/models/benefit.py b/odex25_benefit/odex_benefit/models/benefit.py
index 2dd9ee776..e0e4ab0d5 100644
--- a/odex25_benefit/odex_benefit/models/benefit.py
+++ b/odex25_benefit/odex_benefit/models/benefit.py
@@ -750,10 +750,6 @@ class GrantBenefitProfile(models.Model):
     @api.depends('is_mother_work','mother_salary_ids','mother_expenses_ids','mother_debits_ids')
     def _compute_mother_net_income(self):
         for rec in self:
-            if not rec.is_mother_work:
-                rec.mother_net_income = 0.0
-                continue
-
             deductions = (
                     sum(rec.mother_expenses_ids.filtered('deduct_from_family_income').mapped('amount')) +
                     sum(rec.mother_debits_ids.filtered('deduct_from_family_income').mapped('monthly_installment'))
@@ -1424,30 +1420,28 @@ class GrantBenefitProfile(models.Model):
             return status, reasons
 
     def check_replacement_mother_status(self):
-        validation_setting = self.env["family.validation.setting"].search([], limit=1)
-        mini_income_for_mother = validation_setting.mini_income_for_mother
-        max_income_for_mother = validation_setting.max_income_for_mother
         for rec in self:
             reasons = []
             status = 'benefit'
             if not rec.add_replacement_mother:
                 continue
-            if not rec.replacement_mother_location_conf.is_benefit or not rec.replacement_mother_marital_conf.is_benefit or rec.state in ['suspended_second_approve','refused']:
+            if rec.state in ['suspended_second_approve', 'refused']:
                 status = 'non_benefit'
-                reasons.append(_("The replacement mother's marital or location conditions are not eligible."))
-            elif rec.replacement_mother_marital_conf.is_benefit:
-                if rec.replacement_is_mother_work and rec.replacement_mother_country_id.code == 'SA' or (
-                        rec.replacement_mother_country_id.code != 'SA' and rec.father_country_id.code == 'SA'):
-                    if mini_income_for_mother < rec.replacement_mother_income <= max_income_for_mother:
-                        status = 'non_benefit'
-                        reasons.append(_("The replacement mother's income is between minimum and maximum thresholds."))
-                    elif rec.replacement_mother_income <= mini_income_for_mother:
-                        status = 'benefit'
-                    elif rec.replacement_mother_income > max_income_for_mother:
-                        status = 'benefit'
-                elif not rec.replacement_is_mother_work and rec.replacement_mother_country_id.code == 'SA' or (
-                        rec.replacement_mother_country_id.code != 'SA' and rec.father_country_id.code == 'SA'):
-                    status = 'benefit'
+                reasons.append(_("Family is suspended or refused."))
+                return status, reasons
+
+            if not rec.replacement_mother_marital_conf or not rec.replacement_mother_location_conf:
+                status = 'non_benefit'
+                reasons.append(_("Replacement mother marital or location information is missing."))
+                return status, reasons
+
+            if not rec.replacement_mother_marital_conf.replacement_mother_is_benefit:
+                status = 'non_benefit'
+                reasons.append(_("The replacement mother's marital status is not eligible for benefits."))
+
+            if not rec.replacement_mother_location_conf.replacement_mother_is_benefit:
+                status = 'non_benefit'
+                reasons.append(_("The replacement mother's location is not eligible for benefits."))
             return status, reasons
 
     def delete_from_db(self):
@@ -2212,18 +2206,11 @@ class GrantBenefitProfile(models.Model):
         for rec in self:
             total = 0.0
             rec.total_income = 0.0
-            if not rec.add_replacement_mother:
-                if rec.mother_status == 'non_benefit':
-                    total = sum(rec.salary_ids.filtered(lambda e: e.approved).mapped('salary_amount'))
-                elif rec.mother_status == 'benefit':
-                    total = sum(rec.salary_ids.filtered(lambda e: e.approved).mapped('salary_amount')) + rec.mother_income
-                rec.total_income = total
-            if rec.add_replacement_mother:
-                if rec.replacement_mother_status == 'non_benefit':
-                    total = sum(rec.salary_ids.filtered(lambda e: e.approved).mapped('salary_amount'))
-                elif rec.replacement_mother_status == 'benefit':
-                    total = sum(rec.salary_ids.filtered(lambda e: e.approved).mapped('salary_amount')) + rec.replacement_mother_income
-                rec.total_income += total
+            if rec.mother_status == 'non_benefit':
+                total = sum(rec.salary_ids.filtered(lambda e: e.approved).mapped('salary_amount'))
+            elif rec.mother_status == 'benefit':
+                total = sum(rec.salary_ids.filtered(lambda e: e.approved).mapped('salary_amount')) + rec.mother_income
+            rec.total_income = total
 
     def get_mother_name(self):
         for rec in self:
@@ -2655,7 +2642,7 @@ class GrantBenefitProfile(models.Model):
                               'message': _('Not Benefit')}
         return res
 
-    @api.onchange('replacement_mother_marital_conf', 'replacement_mother_location_conf', 'replacement_mother_income')
+    @api.onchange('replacement_mother_marital_conf', 'replacement_mother_location_conf')
     def _onchange_replacement_mother_info(self):
         res = {}
         for rec in self:
diff --git a/odex25_benefit/odex_benefit/models/benefit_config.py b/odex25_benefit/odex_benefit/models/benefit_config.py
index acf02914e..b810e6d41 100644
--- a/odex25_benefit/odex_benefit/models/benefit_config.py
+++ b/odex25_benefit/odex_benefit/models/benefit_config.py
@@ -806,6 +806,7 @@ class LocationSettings(models.Model):
     location_type = fields.Selection([('member', _('Member')), ('mother_location', _('Mother Location'))])
     is_benefit = fields.Boolean(string='Is Benefit?')
     is_far_from_family = fields.Boolean(string='Is Far From Family?')
+    replacement_mother_is_benefit = fields.Boolean(string="Replacement Mother Is Benefit?", default=True, )
 
 class AttachmentsSettings(models.Model):
     _name = 'attachments.settings'
@@ -897,6 +898,7 @@ class MaritalStatus(models.Model):
     name = fields.Char(string="Name")
     is_benefit = fields.Boolean(string='Is Benefit?')
     is_dead = fields.Boolean(string='Is Dead?')
+    replacement_mother_is_benefit = fields.Boolean(string="Replacement Mother Is Benefit?",default=True,)
 
 class AgeCategory(models.Model):
     _name = 'age.category'
diff --git a/odex25_benefit/odex_benefit/views/benefit_config_view.xml b/odex25_benefit/odex_benefit/views/benefit_config_view.xml
index 9a85a8a57..6f804938a 100644
--- a/odex25_benefit/odex_benefit/views/benefit_config_view.xml
+++ b/odex25_benefit/odex_benefit/views/benefit_config_view.xml
@@ -1016,9 +1016,13 @@
                             <group>
                                 <field name="name"/>
                                 <field name="location_type"/>
-                                <field name="is_benefit"/>
+
                                 <field name="is_far_from_family"/>
                             </group>
+                            <group>
+                                <field name="is_benefit"/>
+                                <field name="replacement_mother_is_benefit"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>
@@ -1033,6 +1037,7 @@
                     <field name="location_type"/>
                     <field name="is_benefit"/>
                     <field name="is_far_from_family"/>
+                    <field name="replacement_mother_is_benefit"/>
                 </tree>
             </field>
         </record>
@@ -1333,9 +1338,13 @@
                         <group>
                             <group>
                                 <field name="name"/>
-                                <field name="is_benefit"/>
+
                                 <field name="is_dead"/>
                             </group>
+                            <group>
+                                <field name="is_benefit"/>
+                                <field name="replacement_mother_is_benefit"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>
@@ -1348,6 +1357,7 @@
                 <tree>
                     <field name="name"/>
                     <field name="is_benefit"/>
+                    <field name="replacement_mother_is_benefit"/>
                 </tree>
             </field>
         </record>
diff --git a/odex25_benefit/odex_benefit/views/benefit_view.xml b/odex25_benefit/odex_benefit/views/benefit_view.xml
index 2e76c14b3..4cc7bb68c 100644
--- a/odex25_benefit/odex_benefit/views/benefit_view.xml
+++ b/odex25_benefit/odex_benefit/views/benefit_view.xml
@@ -909,7 +909,7 @@
                                             </tree>
                                         </field>
                                     </page>
-                                    <page string="Mother Expenses" attrs="{'invisible':[('is_mother_work','=',False)]}">
+                                    <page string="Mother Expenses">
                                         <field name="mother_expenses_ids" context="{'default_state': 'accepted'}"
                                                attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}">
                                             <tree editable="top">
@@ -929,7 +929,7 @@
                                             </tree>
                                         </field>
                                     </page>
-                                    <page string="Mother Income" attrs="{'invisible':[('is_mother_work','=',False)]}">
+                                    <page string="Mother Income">
                                         <field name="mother_salary_ids"
                                                context="{'default_state': 'accepted','default_is_mother_salary': True}"
                                                mode="tree"
@@ -955,7 +955,7 @@
                                             </tree>
                                         </field>
                                     </page>
-                                    <page string="Mother Debts" attrs="{'invisible':[('is_mother_work','=',False)]}">
+                                    <page string="Mother Debts">
                                         <field name="mother_debits_ids" context="{'default_state': 'accepted'}"
                                                attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}">
                                             <form>

From f7b80a7332e24580b81b253b57902c6680a89517 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Mon, 19 Jan 2026 15:46:04 +0100
Subject: [PATCH 05/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po    | 33 ++++++++++++++++++-
 .../models/ir_attachment_inherit.py           |  2 +-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index f05e4a111..2f7483c5a 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -18509,4 +18509,35 @@ msgstr "تجاوزت عمر %s وليس لديها اخوة قصر"
 #: 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
+msgstr "تجاوزت عمر %s"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_location_settings__replacement_mother_is_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_marital_status__replacement_mother_is_benefit
+msgid "Replacement Mother Is Benefit?"
+msgstr "هل الأم البديلة مستفيدة؟"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/benefit.py:0
+#, python-format
+msgid "Family is suspended or refused."
+msgstr "توقفت الأسرة أو تم رفضها."
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/benefit.py:0
+#, python-format
+msgid "Replacement mother marital or location information is missing."
+msgstr "معلومات الحالة الاجتماعية أو موقع السكن للأم البديلة مفقودة."
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/benefit.py:0
+#, python-format
+msgid "The replacement mother's marital status is not eligible for benefits."
+msgstr "الحالة الاجتماعية للأم البديلة غير مؤهلة للاستفادة."
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/benefit.py:0
+#, python-format
+msgid "The replacement mother's location is not eligible for benefits."
+msgstr "مكان سكن الأم البديلة غير مؤهل للاستفادة."
+
diff --git a/odex25_benefit/odex_benefit/models/ir_attachment_inherit.py b/odex25_benefit/odex_benefit/models/ir_attachment_inherit.py
index ed443109c..ce6457f33 100644
--- a/odex25_benefit/odex_benefit/models/ir_attachment_inherit.py
+++ b/odex25_benefit/odex_benefit/models/ir_attachment_inherit.py
@@ -18,7 +18,7 @@ class BenefitAttachment(models.Model):
     attach_id = fields.Many2one('attachments.settings', string="Attach",domain=[('attach_type', '=', 'member_attach')])
     hobbies_id = fields.Many2one('attachments.settings', string="Hobby",domain=[('attach_type', '=', 'hobbies_attach')])
     diseases_id = fields.Many2one('attachments.settings', string="Diseases",domain=[('attach_type', '=', 'diseases_attach'), ('parent_id','=',False)])
-    diseases_child_id = fields.Many2one('attachments.settings',string="Sub Disease",domain="[('parent_id','=',diseases_id)]")
+    diseases_child_id = fields.Many2one('attachments.settings',string="Sub Disease",domain="[('attach_type', '=', 'diseases_attach'),('parent_id','=',diseases_id)]")
     disabilities_id = fields.Many2one('attachments.settings', string="Disabilities",domain=[('attach_type', '=', 'disabilities_attach'), ('parent_id','=',False)])
     disabilities_child_id = fields.Many2one('attachments.settings',string="Sub Disability",domain="[('parent_id','=',disabilities_id)]")
     hobby_attach = fields.Binary(attachment=True, string="Hobby Attach")

From 68c4c924a63c0f96d45548dcdc9876d15ad47ac4 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Tue, 20 Jan 2026 08:42:45 +0100
Subject: [PATCH 06/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po    | 21 ----------
 .../odex_benefit/models/family_members.py     | 38 ++++++++++---------
 .../odex_benefit/views/benefit_view.xml       |  8 ++--
 3 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index 2f7483c5a..8305d40d2 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -18368,14 +18368,6 @@ msgid ""
 "specialization."
 msgstr "أكبر من %s سنة وغير منتظم بتخصص علمي أو مهني."
 
-#. module: odex_benefit
-#: code:addons/odex_benefit/models/family_members.py:0
-#, python-format
-msgid ""
-"The member is over %s years old and not enrolled in a scientific or "
-"vocational specialization."
-msgstr "أكبر من %s سنة وغير منتظم بتخصص علمي أو مهني."
-
 #. module: odex_benefit
 #: code:addons/odex_benefit/models/benefit.py:0
 #, python-format
@@ -18498,19 +18490,6 @@ msgstr "الإجراء غير مسموح: الأسرة لديها %s فرد مس
 msgid "Governmental/Paid"
 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"
-
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_location_settings__replacement_mother_is_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_marital_status__replacement_mother_is_benefit
diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py
index f3bb20b68..344f64eec 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -617,6 +617,17 @@ class FamilyMemberProfile(models.Model):
                 benefiting_children = rec.benefit_id.member_ids.filtered(
                     lambda m: m.relationn.relation_type in ['son', 'daughter'] and m.member_status == 'benefit'
                 )
+                has_benefiting_son = any(
+                    m.relationn.relation_type == 'son' and m.member_status == 'benefit'
+                    for m in rec.benefit_id.member_ids
+                )
+                has_younger_benefiting_daughter = any(
+                    m.relationn.relation_type == 'daughter'
+                    and m.member_status == 'benefit'
+                    and m.age < female_benefit_age
+                    for m in rec.benefit_id.member_ids
+                    if m.id != rec.id
+                )
 
                 if rec.relationn.relation_type == 'mother':
                     if not benefiting_children:
@@ -638,7 +649,8 @@ class FamilyMemberProfile(models.Model):
                 # Gender-specific checks
                 elif rec.relationn.relation_type == 'son':
                     if age_exceeded:
-                        if rec.age <= exceptional_age_has_disabilities and rec.disabilities_attachment_ids and rec.minor_siblings:
+                        if rec.age <= exceptional_age_has_disabilities and rec.disabilities_attachment_ids and (
+                                has_benefiting_son or has_younger_benefiting_daughter):
                             rec.member_status = 'benefit'
                         else:
                             if rec.age > exceptional_age_has_disabilities and rec.disabilities_attachment_ids:
@@ -651,18 +663,12 @@ class FamilyMemberProfile(models.Model):
                                     _("Over %s years old and not enrolled in any educational institution.") % male_benefit_age
                                 )
                             elif current_education_status_id.case_study == 'continuous':
-                                if current_education_status_id.specialization_ids.is_scientific_specialty and rec.age >= exceptional_age_scientific_specialty:
+                                if rec.age >= exceptional_age_scientific_specialty:
                                     rec.member_status = 'non_benefit'
                                     reasons.append(
                                         _("Over %s years old and not enrolled in a scientific or vocational specialization.")
                                         % exceptional_age_scientific_specialty
                                     )
-                                if not current_education_status_id.specialization_ids.is_scientific_specialty:
-                                    rec.member_status = 'non_benefit'
-                                    reasons.append(
-                                        _("The member is over %s years old and not enrolled in a scientific or vocational specialization.")
-                                        % male_benefit_age
-                                    )
                     if rec.is_work:
                         if rec.member_income > max_income_for_benefit:
                             rec.member_status = 'non_benefit'
@@ -694,17 +700,15 @@ 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 > minor_siblings_age and not rec.minor_siblings:
+                        if has_benefiting_son or has_younger_benefiting_daughter:
+                            rec.member_status = 'benefit'
+                        else:
                             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)
+                                _("She exceeded the age limit (%s) and has no benefiting son "
+                                  "nor any younger benefiting daughter.")
+                                % female_benefit_age
+                            )
                     if rec.is_work and rec.member_income > max_income_for_benefit:
                         rec.member_status = 'non_benefit'
                         reasons.append(_("She works with a salary greater than %s.") % max_income_for_benefit)
diff --git a/odex25_benefit/odex_benefit/views/benefit_view.xml b/odex25_benefit/odex_benefit/views/benefit_view.xml
index 4cc7bb68c..be02fb3bf 100644
--- a/odex25_benefit/odex_benefit/views/benefit_view.xml
+++ b/odex25_benefit/odex_benefit/views/benefit_view.xml
@@ -528,7 +528,8 @@
                             </button>
 
                             <button name="action_view_non_benefit_members" type="object" icon="fa-users">
-                                <field string="Non Benefit Members" name="non_member_count" force_save="1" class="custom_stat_value"
+                                <field string="Non Benefit Members" name="non_member_count" force_save="1"
+                                       class="custom_stat_value"
                                        widget="statinfo"/>
                             </button>
                             <button icon="fa-list-ul" name="action_open_related_move_line_records" type="object">
@@ -802,7 +803,8 @@
                                                options="{'no_create': True, 'no_create_edit': True,'no_quick_create': True, 'no_open': True}"
                                                groups="!odex_benefit.group_benefit_manager"
                                                required="1"/>
-                                        <field name="mother_status" invisible="1" readonly="1" widget="badge" force_save="1"
+                                        <field name="mother_status" invisible="1" readonly="1" widget="badge"
+                                               force_save="1"
                                                decoration-success="mother_status == 'benefit'"
                                                decoration-danger="mother_status == 'non_benefit'"/>
                                     </group>
@@ -856,7 +858,7 @@
                                         <field name="mother_net_income" widget="monetary" force_save="1"
                                                options="{'currency_field': 'currency_id', 'field_digits': False}"
                                                digits="[16,0]"
-                                               attrs="{'invisible':[('is_mother_work','=',False)]}"/>
+                                        />
                                         <field name="mother_salary_certificate"
                                                widget="many2many_attachment_preview"
                                                invisible="1"/>

From c813947614b735df3b360417234593531a07b598 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Tue, 20 Jan 2026 10:12:01 +0100
Subject: [PATCH 07/27] [IMP] odex_benefit: IMP Benefit

---
 .../odex_benefit/models/family_members.py     | 35 ++++++++++++++++++-
 .../odex_benefit/views/family_members.xml     | 16 +++++++--
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py
index 344f64eec..756dfcd0b 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -293,6 +293,8 @@ class FamilyMemberProfile(models.Model):
     resume_date = fields.Date(string="Return Date")
     resume_notes = fields.Text(string="Return Notes")
     exit_benefit_date = fields.Date(string="Exit Benefit Date")
+    can_request_temporary_exception = fields.Boolean(string="Can Request Temporary Exception",
+                                                     compute='_compute_can_request_temporary_exception', )
 
     # def create(self, vals):
     #     for line_vals in vals:
@@ -343,6 +345,31 @@ class FamilyMemberProfile(models.Model):
                 rec.last_education_levels = False
                 rec.case_study = False
 
+    @api.depends(
+        'relationn.relation_type',
+        'case_study',
+        'age',
+        'benefit_id',
+    )
+    def _compute_can_request_temporary_exception(self):
+        settings = self.env["family.validation.setting"].search([], limit=1)
+
+        exceptional_age_scientific = (
+            settings.exceptional_age_scientific_specialty
+            if settings else 22
+        )
+
+        for rec in self:
+            if not rec.relationn:
+                rec.can_request_temporary_exception = False
+                continue
+
+            is_son = rec.relationn.relation_type == 'son'
+            is_continuous = rec.case_study == 'continuous'
+            old_enough = (rec.age or 0) >= exceptional_age_scientific
+
+            rec.can_request_temporary_exception = is_son and is_continuous and old_enough
+
     @api.model
     def name_search(self, name='', args=None, operator='ilike', limit=100):
         if self._context.get('members_domain_force_all'):
@@ -574,6 +601,7 @@ class FamilyMemberProfile(models.Model):
         'state',
         'is_dead',
         'is_work',
+        'case_study',
         'benefit_id.member_ids.member_status',
     )
     def check_member_status(self):
@@ -1022,9 +1050,14 @@ class FamilyMemberProfile(models.Model):
     def action_exception_second_accept(self):
         for rec in self:
             rec.is_excluded_suspension = True
-            rec.state_a = 'exception_second_approve'
+            rec.state_a = 'family_services_manager'
             # rec.is_member_workflow = False
 
+    def action_exception_third_accept(self):
+        for rec in self:
+            rec.is_excluded_suspension = True
+            rec.state_a = 'exception_second_approve'
+
     def action_exception_final_accept(self):
         for rec in self:
             rec.is_excluded_suspension = True
diff --git a/odex25_benefit/odex_benefit/views/family_members.xml b/odex25_benefit/odex_benefit/views/family_members.xml
index 31265349e..d5b21a778 100644
--- a/odex25_benefit/odex_benefit/views/family_members.xml
+++ b/odex25_benefit/odex_benefit/views/family_members.xml
@@ -56,6 +56,12 @@
                         <button name="action_exception" type="object"
                                 string="Temporarily Exception" class="oe_highlight"
                                 confirm="Are you sure you want to move  to Temporarily Exception ?"
+                                groups="!odex_benefit.group_benefit_supervisor"
+                                attrs="{'invisible': ['|','|',('action_type','=','exception'),('member_status','=','benefit'),('can_request_temporary_exception','=',False)]}"/>
+                        <button name="action_exception" type="object"
+                                string="Temporarily Exception" class="oe_highlight"
+                                confirm="Are you sure you want to move  to Temporarily Exception ?"
+                                groups="odex_benefit.group_benefit_supervisor"
                                 attrs="{'invisible': ['|',('action_type','=','exception'),('member_status','=','benefit')]}"/>
                         <button name="action_exception_first_accept" type="object"
                                 string="Exception First Approve" class="oe_highlight"
@@ -66,13 +72,18 @@
                                 groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"
                                 attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['first_approve'])]}"
                         />
+                        <button name="action_exception_third_accept" type="object"
+                                string="Exception Family Services Manager Approve" class="oe_highlight"
+                                groups="odex_benefit.group_benefit_manager"
+                                attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['family_services_manager'])]}"
+                        />
                         <button name="action_exception_final_accept" type="object"
                                 string="Exception Final Approve" class="oe_highlight"
                                 attrs="{'invisible': [('state','not in',['exception_second_approve'])]}"
                                 groups="odex_benefit.group_benefit_manager"/>
                         <button name="action_exception_refuse" type="object"
                                 string="Exception Refuse" class="btn btn-danger"
-                                attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['waiting_approve','first_approve','exception_second_approve'])]}"
+                                attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['waiting_approve','first_approve','family_services_manager','exception_second_approve'])]}"
                         />
                         <field name="state" widget="statusbar"
                                statusbar_visible="draft,new,complete_info,waiting_approve,first_approve,second_approve"/>
@@ -195,12 +206,13 @@
                                        attrs="{'readonly':[('state','not in',['draft','complete_info'])]}"/>
                                 <field name="last_education_levels"
                                        attrs="{'invisible':[('education_status','!=','educated')]}"/>
-                                <field name="case_study"
+                                <field name="case_study" force_save="1"
                                        attrs="{'invisible':[('education_status','!=','educated')]}"/>
                             </group>
                         </group>
                         <group>
                             <group>
+                                <field name="can_request_temporary_exception" invisible="1"/>
                                 <field name="sponsor_related_id"
                                        readonly="1"/>
                                 <field name="sponsor_id"

From c123806f3b01e2118660b2f85e8b3928036222ca Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Tue, 20 Jan 2026 10:16:39 +0100
Subject: [PATCH 08/27] [IMP] odex_benefit: IMP Benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index 8305d40d2..3bcd9ced2 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -18520,3 +18520,13 @@ msgstr "الحالة الاجتماعية للأم البديلة غير مؤه
 msgid "The replacement mother's location is not eligible for benefits."
 msgstr "مكان سكن الأم البديلة غير مؤهل للاستفادة."
 
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_family_member__can_request_temporary_exception
+msgid "Can Request Temporary Exception"
+msgstr "يمكن طلب استثناء مؤقت"
+
+#. module: odex_benefit
+#: model_terms:ir.ui.view,arch_db:odex_benefit.family_member_form
+msgid "Exception Family Services Manager Approve"
+msgstr "اعتماد مديرة خدمات المستفيدين للاستثناء"
+

From 56462e07097459387914908118b921dbd7688994 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Tue, 20 Jan 2026 11:49:33 +0100
Subject: [PATCH 09/27] [IMP]odex_benefit: IMP benefit

---
 .../odex_benefit/models/service_request.py       | 16 ++++++++++++++++
 .../odex_benefit/models/services_settings.py     |  8 ++++++++
 .../odex_benefit/views/services_settings.xml     |  1 +
 3 files changed, 25 insertions(+)

diff --git a/odex25_benefit/odex_benefit/models/service_request.py b/odex25_benefit/odex_benefit/models/service_request.py
index 2c6c607b5..4831b7a8a 100644
--- a/odex25_benefit/odex_benefit/models/service_request.py
+++ b/odex25_benefit/odex_benefit/models/service_request.py
@@ -1148,6 +1148,22 @@ class ServiceRequest(models.Model):
             domain = [('is_seasonal_service', '=', False), ('service_type', '!=', 'main_service'),
                       ('benefit_category_ids', 'in', [rec.family_category.id])]
 
+            if rec.family_id:
+                mother_country = rec.family_id.mother_country_id
+                father_country = rec.family_id.father_country_id
+
+                country_domain = [
+                    '|',
+                    ('allowed_country_ids', '=', False),
+                    '|',
+                    ('allowed_country_ids', 'in', [mother_country.id] if mother_country else []),
+                    ('allowed_country_ids', 'in', [father_country.id] if father_country else [])
+                ]
+
+                allowed_services = self.env['services.settings'].search(country_domain)
+
+                domain.append(('id', 'in', allowed_services.ids if allowed_services else []))
+
             if rec.family_id.property_type_id:
                 if rec.family_id.property_type_code != 'ownership':
                     domain.append(('service_type', '!=', 'home_restoration'))
diff --git a/odex25_benefit/odex_benefit/models/services_settings.py b/odex25_benefit/odex_benefit/models/services_settings.py
index bcf29558e..42ccee3cf 100644
--- a/odex25_benefit/odex_benefit/models/services_settings.py
+++ b/odex25_benefit/odex_benefit/models/services_settings.py
@@ -145,6 +145,14 @@ class ServicesSettings(models.Model):
         domain="[('model_id.model', '=', 'family.member')]",
         help="Select fields from the Member profile to display only when the service is for a member."
     )
+    allowed_country_ids = fields.Many2many(
+        comodel_name='res.country',
+        relation='services_settings_country_rel',
+        column1='service_id',
+        column2='country_id',
+        string='Allowed Countries',
+        help='Countries where this service is available. Leave empty to allow all countries.'
+    )
 
     @api.onchange('benefit_type')
     def _onchange_benefit_type(self):
diff --git a/odex25_benefit/odex_benefit/views/services_settings.xml b/odex25_benefit/odex_benefit/views/services_settings.xml
index 39a1dbc1d..745bc7fa6 100644
--- a/odex25_benefit/odex_benefit/views/services_settings.xml
+++ b/odex25_benefit/odex_benefit/views/services_settings.xml
@@ -25,6 +25,7 @@
                                 <field name="parent_service"
                                        attrs="{'invisible':[('service_type','=','main_service')]}"/>
                                 <field name="benefit_category_ids" widget="many2many_tags" required="1"/>
+                                <field name="allowed_country_ids" widget="many2many_tags"/>
                                 <field name="currency_id" groups="base.group_multi_currency"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>

From 020ed54b97b3fbc7cbd2a012bf836f7278fe0b86 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Tue, 20 Jan 2026 11:56:21 +0100
Subject: [PATCH 10/27] [IMP]odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index 3bcd9ced2..df9ee30cf 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -18530,3 +18530,14 @@ msgstr "يمكن طلب استثناء مؤقت"
 msgid "Exception Family Services Manager Approve"
 msgstr "اعتماد مديرة خدمات المستفيدين للاستثناء"
 
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_services_settings__allowed_country_ids
+msgid "Allowed Countries"
+msgstr "الجنسيات المسموح بها"
+
+#. module: odex_benefit
+#: model:ir.model.fields,help:odex_benefit.field_services_settings__allowed_country_ids
+msgid ""
+"Countries where this service is available. Leave empty to allow all "
+"countries."
+msgstr "الجنسيات التي تتوفر فيها هذه الخدمة. اتركها فارغة للسماح بجميع الجنسيات."
\ No newline at end of file

From f3d05ab60afb1ce9b4bf3c8e362245c0c594e484 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Tue, 20 Jan 2026 12:06:45 +0100
Subject: [PATCH 11/27] [IMP] odex_benefit: IMP Benefit

---
 odex25_benefit/odex_benefit/models/family_members.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py
index 756dfcd0b..894fd613c 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -720,9 +720,6 @@ class FamilyMemberProfile(models.Model):
                             _("Failure to complete the required documents or official proofs, or the family’s ineligibility for the association’s services, and the application has been rejected."))
 
                 elif rec.relationn.relation_type == 'daughter':
-                    if rec.is_married:
-                        rec.member_status = 'non_benefit'
-                        reasons.append(_("Married"))
                     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':
                         rec.member_status = 'non_benefit'
@@ -737,6 +734,9 @@ class FamilyMemberProfile(models.Model):
                                   "nor any younger benefiting daughter.")
                                 % female_benefit_age
                             )
+                    if rec.is_married:
+                        rec.member_status = 'non_benefit'
+                        reasons.append(_("Married"))
                     if rec.is_work and rec.member_income > max_income_for_benefit:
                         rec.member_status = 'non_benefit'
                         reasons.append(_("She works with a salary greater than %s.") % max_income_for_benefit)

From ad58f28047450e188b94d4cd8377b33fa9484f03 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Tue, 20 Jan 2026 13:17:33 +0100
Subject: [PATCH 12/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po           | 5 -----
 odex25_benefit/odex_benefit/models/family_expense.py | 6 +++++-
 odex25_benefit/odex_benefit/models/family_members.py | 7 +------
 odex25_benefit/odex_benefit/views/family_members.xml | 9 ++-------
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index df9ee30cf..af665f4e0 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -18525,11 +18525,6 @@ msgstr "مكان سكن الأم البديلة غير مؤهل للاستفاد
 msgid "Can Request Temporary Exception"
 msgstr "يمكن طلب استثناء مؤقت"
 
-#. module: odex_benefit
-#: model_terms:ir.ui.view,arch_db:odex_benefit.family_member_form
-msgid "Exception Family Services Manager Approve"
-msgstr "اعتماد مديرة خدمات المستفيدين للاستثناء"
-
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_services_settings__allowed_country_ids
 msgid "Allowed Countries"
diff --git a/odex25_benefit/odex_benefit/models/family_expense.py b/odex25_benefit/odex_benefit/models/family_expense.py
index e2431ade1..60aa7655c 100644
--- a/odex25_benefit/odex_benefit/models/family_expense.py
+++ b/odex25_benefit/odex_benefit/models/family_expense.py
@@ -278,8 +278,12 @@ class ConfirmBenefitExpense(models.Model):
                     base_domain.append(('branch_custom_id', 'in', rec.branch_custom_ids.ids))
                 min_income = validation_setting.benefit_category_ids.mapped('mini_income_amount')
                 max_income = validation_setting.benefit_category_ids.mapped('max_income_amount')
+                benefit_category_ids = validation_setting.benefit_category_ids
                 base_domain.extend([('member_income', '>=', min(min_income)), ('member_income', '<=', max(max_income))])
-                base_domain.extend([('benefit_category_id', '!=', False)])
+                if benefit_category_ids:
+                    base_domain.extend([('benefit_category_id', 'in', benefit_category_ids.ids)])
+                else:
+                    base_domain.extend([('benefit_category_id', '!=', False)])
                 if rec.start_date and rec.end_date:
                     conflicting_records = self.search([
                         ('id', '!=', rec._origin.id),
diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py
index 894fd613c..43f0f3e19 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -1048,15 +1048,10 @@ class FamilyMemberProfile(models.Model):
             rec.state_a = 'first_approve'
 
     def action_exception_second_accept(self):
-        for rec in self:
-            rec.is_excluded_suspension = True
-            rec.state_a = 'family_services_manager'
-            # rec.is_member_workflow = False
-
-    def action_exception_third_accept(self):
         for rec in self:
             rec.is_excluded_suspension = True
             rec.state_a = 'exception_second_approve'
+            # rec.is_member_workflow = False
 
     def action_exception_final_accept(self):
         for rec in self:
diff --git a/odex25_benefit/odex_benefit/views/family_members.xml b/odex25_benefit/odex_benefit/views/family_members.xml
index d5b21a778..a69ffee3b 100644
--- a/odex25_benefit/odex_benefit/views/family_members.xml
+++ b/odex25_benefit/odex_benefit/views/family_members.xml
@@ -57,12 +57,12 @@
                                 string="Temporarily Exception" class="oe_highlight"
                                 confirm="Are you sure you want to move  to Temporarily Exception ?"
                                 groups="!odex_benefit.group_benefit_supervisor"
-                                attrs="{'invisible': ['|','|',('action_type','=','exception'),('member_status','=','benefit'),('can_request_temporary_exception','=',False)]}"/>
+                                attrs="{'invisible': ['|',('member_status','=','benefit'),('can_request_temporary_exception','=',False)]}"/>
                         <button name="action_exception" type="object"
                                 string="Temporarily Exception" class="oe_highlight"
                                 confirm="Are you sure you want to move  to Temporarily Exception ?"
                                 groups="odex_benefit.group_benefit_supervisor"
-                                attrs="{'invisible': ['|',('action_type','=','exception'),('member_status','=','benefit')]}"/>
+                                attrs="{'invisible': [('member_status','=','benefit')]}"/>
                         <button name="action_exception_first_accept" type="object"
                                 string="Exception First Approve" class="oe_highlight"
                                 groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager"
@@ -72,11 +72,6 @@
                                 groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"
                                 attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['first_approve'])]}"
                         />
-                        <button name="action_exception_third_accept" type="object"
-                                string="Exception Family Services Manager Approve" class="oe_highlight"
-                                groups="odex_benefit.group_benefit_manager"
-                                attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['family_services_manager'])]}"
-                        />
                         <button name="action_exception_final_accept" type="object"
                                 string="Exception Final Approve" class="oe_highlight"
                                 attrs="{'invisible': [('state','not in',['exception_second_approve'])]}"

From ac8c5b276450ce2d00312dc5e7c448e94e0d92af Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Tue, 20 Jan 2026 14:24:36 +0100
Subject: [PATCH 13/27] [IMP] odex_benefit: IMP benefit

---
 .../odex_benefit/security/ir.model.access.csv |  1 +
 .../odex_benefit/security/security_view.xml   |  9 ++--
 .../odex_benefit/views/actions_and_menus.xml  |  4 +-
 .../odex_benefit/views/benefit_view.xml       | 51 ++++++++++---------
 .../views/family_expense_view.xml             |  4 +-
 .../odex_benefit/views/family_members.xml     | 16 +++---
 .../odex_benefit/views/res_country.xml        |  2 +-
 .../views/seasonal_service_view.xml           |  2 +-
 .../odex_benefit/views/service_request.xml    |  6 +--
 9 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/odex25_benefit/odex_benefit/security/ir.model.access.csv b/odex25_benefit/odex_benefit/security/ir.model.access.csv
index 06fa19693..a6c89971f 100644
--- a/odex25_benefit/odex_benefit/security/ir.model.access.csv
+++ b/odex25_benefit/odex_benefit/security/ir.model.access.csv
@@ -3,6 +3,7 @@ access_benefit_researcher_record,access_benefit_researcher_record,model_grant_be
 access_benefit_woman_commitee_record,access_benefit_record,model_grant_benefit,odex_benefit.group_benefit_woman_commitee,1,1,1,1
 access_benefit_branch_manager_record,access_benefit_branch_manager_record,model_grant_benefit,odex_benefit.group_benefit_branch_manager,1,1,1,1
 access_benefit_manager_record,access_benefit_manager_record,model_grant_benefit,odex_benefit.group_benefit_manager,1,1,1,1
+access_benefit_family_services_manager,access_benefit_family_services_manager,model_grant_benefit,odex_benefit.group_family_services_manager,1,1,1,1
 access_education_status_all,education_status,model_education_status,odex_benefit.group_benefit_info,1,1,1,1
 access_education_status_all_users,education_status_all_users,model_education_status,,1,0,0,0
 access_weak_course_all,weak_course,model_weak_course,odex_benefit.group_benefit_info,1,1,1,1
diff --git a/odex25_benefit/odex_benefit/security/security_view.xml b/odex25_benefit/odex_benefit/security/security_view.xml
index f0b38f02f..0b76b3b7b 100644
--- a/odex25_benefit/odex_benefit/security/security_view.xml
+++ b/odex25_benefit/odex_benefit/security/security_view.xml
@@ -107,7 +107,6 @@
             <field name="name">Family Services Manager</field>
             <field name="category_id" ref="module_category_benefit"/>
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
-            <field name="implied_ids" eval="[(4, ref('group_benefit_manager'))]"/>
         </record>
 
         <record id="group_service_legal_department" model="res.groups">
@@ -133,7 +132,7 @@
             <field name="name">Show All Benefits Profiles</field>
             <field name="model_id" ref="model_grant_benefit"/>
             <field name="domain_force">[(1, '=', 1)]</field>
-            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor'))]"/>
+            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager'))]"/>
             <field name="active" eval="True" />
         </record>
 
@@ -166,7 +165,7 @@
             <field name="name">Show All Visit Location</field>
             <field name="model_id" ref="model_visit_location"/>
             <field name="domain_force">[(1, '=', 1)]</field>
-            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor'))]"/>
+            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager'))]"/>
             <field name="active" eval="True" />
         </record>
 
@@ -215,7 +214,7 @@
             <field name="name">Show All Family Complaints</field>
             <field name="model_id" ref="model_family_complaints"/>
             <field name="domain_force">[(1, '=', 1)]</field>
-            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor'))]"/>
+            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager'))]"/>
             <field name="active" eval="True" />
         </record>
 
@@ -295,7 +294,7 @@
             <field name="name">Show All Family Members</field>
             <field name="model_id" ref="model_family_member"/>
             <field name="domain_force">[(1, '=', 1)]</field>
-            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor'))]"/>
+            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager'))]"/>
             <field name="active" eval="True" />
         </record>
 
diff --git a/odex25_benefit/odex_benefit/views/actions_and_menus.xml b/odex25_benefit/odex_benefit/views/actions_and_menus.xml
index 38246aa24..7a30a2ad5 100644
--- a/odex25_benefit/odex_benefit/views/actions_and_menus.xml
+++ b/odex25_benefit/odex_benefit/views/actions_and_menus.xml
@@ -774,7 +774,7 @@
         <!--Benefit Menus-->
         <!--###########################################################-->
         <menuitem id="benefits_root_menu" name="Benefit Management"
-                  web_icon="odex_benefit,static/description/icon1.png" groups="odex_benefit.group_benefit_info,odex_benefit.group_benefit_manager,odex_benefit.group_benefit_researcher,odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_branch_manager"/>
+                  web_icon="odex_benefit,static/description/icon1.png" groups="odex_benefit.group_benefit_info,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager,odex_benefit.group_benefit_researcher,odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_branch_manager"/>
 <!--        <menuitem id="benefits_root_menu" name="Benefit Management"/>-->
         <!--#ملفات المستفيدين-->
         <menuitem id="benefit_main_menu" name="Benefit Managements"
@@ -1035,7 +1035,7 @@
             parent="odex_benefit.benefit_tools" sequence="4"/>
 
         <menuitem id="services_settings_menu" name="Services Settings" sequence="100"
-                  parent="odex_benefit.benefit_tools_services_settings_menu" action="services_settings_action" groups="odex_benefit.group_benefit_manager"/>
+                  parent="odex_benefit.benefit_tools_services_settings_menu" action="services_settings_action" groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
         <menuitem id="services_requests_menu" name="Services Requests" sequence="2"
                   parent="odex_benefit.benefit_services" action="service_request_action"/>
         <menuitem id="services_requests_account_menu" name="Services Requests" sequence="9"
diff --git a/odex25_benefit/odex_benefit/views/benefit_view.xml b/odex25_benefit/odex_benefit/views/benefit_view.xml
index be02fb3bf..93cd70f4a 100644
--- a/odex25_benefit/odex_benefit/views/benefit_view.xml
+++ b/odex25_benefit/odex_benefit/views/benefit_view.xml
@@ -367,24 +367,24 @@
                         <button name="action_first_accepted" type="object"
                                 string="First Accept" class="oe_highlight"
                                 confirm="Are you sure you want to accept  ?"
-                                groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                                 attrs="{'invisible': ['|',('action_type','not in',['new','edit_info']),('state','not in',['waiting_approve'])]}"/>
                         <button name="action_second_accepted" type="object"
                                 string="Second Accept" class="oe_highlight"
                                 confirm="Are you sure you want to accept  ?"
-                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                                 attrs="{'invisible': ['|',('action_type','not in',['new','edit_info']),('state','not in',['first_approve'])]}"/>
                         <button name="action_refuse" type="object"
                                 string="Final Refuse" class="oe_highlight"
                                 confirm="Are you sure you want to final refuse  ?"
-                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_woman_commitee"
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_woman_commitee"
                                 states="first_refusal"
                         />
                         <button name="complete_data" type="object"
                                 string="Researcher Assignment" class="oe_highlight"
                                 confirm="Are you sure you want to Researcher assignment ?"
                                 states="new"
-                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_woman_commitee"/>
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_woman_commitee"/>
                         <button name="finish_complete_data" type="object"
                                 string="Finish Complete" class="oe_highlight"
                                 confirm="Are you sure you want to Finish Complete data ?"
@@ -392,19 +392,19 @@
                         <button name="action_first_refusal" type="object"
                                 string="First Refuse" class="btn btn-danger"
                                 confirm="Are you sure you want to refuse  ?"
-                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_researcher"
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_researcher"
                                 attrs="{'invisible': ['|',('action_type','!=','new'),('state','not in',['waiting_approve','complete_info'])]}"
                         />
                         <button name="action_set_to_new" type="object"
                                 string="Set To for Researcher" class="btn btn-warning"
                                 confirm="Are you sure you want to set the state to Waiting for Researcher?"
-                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_woman_commitee"
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_woman_commitee"
                                 attrs="{'invisible': ['|',('action_type','not in',['new','edit_info']),('state','not in',['waiting_approve','first_approve','refused','first_refusal'])]}"
                         />
                         <button name="action_black_list" type="object"
                                 string="Black List" class="btn btn-dark-grey"
                                 attrs="{'invisible': ['|',('action_type','not in',['new','edit_info']),('state','not in',['waiting_approve','refused'])]}"
-                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_woman_commitee"
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_woman_commitee"
                                 confirm="Are you sure you want to move  to black list ?"/>
                         <button name="action_suspend" type="object"
                                 string="Temporarily Suspended" class="btn btn-danger"
@@ -421,15 +421,15 @@
                         <button name="action_suspend_first_accept" type="object"
                                 string="First Approve" class="oe_highlight"
                                 attrs="{'invisible': ['|',('action_type','!=','suspended'),('state', 'not in', ['waiting_approve'])]}"
-                                groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                         />
                         <button name="action_suspend_second_accept" type="object"
                                 string="Second Approve" class="oe_highlight"
-                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                                 attrs="{'invisible': ['|',('action_type','!=','suspended'),('state', 'not in', ['first_approve'])]}"/>
                         <button name="action_suspend_third_accept" type="object"
                                 string="Third Approve" class="oe_highlight"
-                                groups="odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                                 attrs="{'invisible': ['|',('action_type','!=','suspended'),('state', 'not in', ['family_services_manager'])]}"/>
                         <!-- Resume from suspension -->
                         <button name="action_resume_first_accept" type="object"
@@ -453,11 +453,11 @@
                         />
                         <button name="action_resume_third_accept" type="object"
                                 string="Resume Approval by Family Services Manager" class="oe_highlight"
-                                groups="odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                                 attrs="{'invisible': ['|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['family_services_manager'])]}"/>
                         <button name="action_reject_resume" type="object"
                                 string="Reject Resume" class="btn btn-danger"
-                                groups="odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                                 attrs="{'invisible': ['|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', '!=', 'family_services_manager')]}"
                         />
                         <button name="action_resume_family" string="Resume Family Service"
@@ -467,7 +467,7 @@
                         <button name="action_final_suspend" type="object"
                                 string="Final Suspension" class="btn btn-danger"
                                 attrs="{'invisible': [('state', '!=', 'temporary_suspended')]}"
-                                groups="odex_benefit.group_benefit_manager"/>
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
                         <button name="action_suspend_refuse" type="object"
                                 string="Suspend Refuse" class="oe_highlight"
                                 attrs="{'invisible': ['|',('action_type','!=','suspended'),('state', 'not in', ['waiting_approve','first_approve','family_services_manager','suspended_second_approve'])]}"
@@ -479,15 +479,16 @@
                                 confirm="Are you sure you want to move  to Temporarily Exception ?"/>
                         <button name="action_exception_first_accept" type="object"
                                 string="Exception First Approve" class="oe_highlight"
-                                groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                                 attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['waiting_approve'])]}"/>
                         <button name="action_exception_second_accept" type="object"
                                 string="Exception Second Approve" class="oe_highlight"
                                 attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['first_approve'])]}"
-                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"/>
+                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
                         <button name="action_exception_final_accept" type="object"
                                 string="Exception Final Approve" class="oe_highlight"
-                                states="exception_second_approve" groups="odex_benefit.group_benefit_manager"/>
+                                states="exception_second_approve"
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
                         <button name="action_exception_refuse" type="object"
                                 string="Exception Refuse" class="oe_highlight"
                                 attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['waiting_approve','first_approve','exception_second_approve'])]}"
@@ -1512,14 +1513,14 @@
                                                        readonly="1" string="Region"/> -->
                                                 <field name="city_id" readonly="1" string="City" force_save="1"
                                                        options="{'no_create': True, 'no_create_edit': True}"
-                                                       groups="odex_benefit.group_benefit_manager"/>
+                                                       groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
                                                 <!-- <field name="res_city_id" string="Res City"
                                                        options="{'no_create': True, 'no_create_edit': True}"/> -->
                                                 <!-- <field name="housing_city"/> -->
                                                 <field name="district_id" force_save="1"
                                                        options="{'no_create': True, 'no_create_edit': True}"
                                                        attrs="{'readonly':[('state', 'not in', ['draft', 'new', 'complete_info'])]}"
-                                                       groups="odex_benefit.group_benefit_manager"/>
+                                                       groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
                                                 <field name="zip"
                                                        attrs="{'required':[('state','not in',['draft','new'])],'readonly':[('state','not in',['draft','new','complete_info'])]}"/>
                                                 <field name="short_number"/>
@@ -1961,7 +1962,9 @@
                                     <field name="notes" nolabel="1"/>
                                 </group>
                             </page>
-                            <page string="Configuration" groups="odex_benefit.group_benefit_manager" invisible="1">
+                            <page string="Configuration"
+                                  groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
+                                  invisible="1">
                                 <!--                                <group col="4">-->
                                 <!--                                    <field name="is_life" attrs="{'invisible':[('is_life','!=',False)]}"/>-->
                                 <!--                                    <field name="is_sport" widget="boolean_toggle"/>-->
@@ -1987,14 +1990,15 @@
                                     <field name="has_car" widget="boolean_toggle" invisible="1"
                                            attrs="{'readonly':[('state','not in',['draft','new','complete_info'])]}"/>
                                     <field name="is_excluded_suspension" invisible="1"
-                                           groups="odex_benefit.group_benefit_manager,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_woman_commitee"
+                                           groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager,odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_woman_commitee"
                                            readonly="1" force_save="1"/>
                                 </group>
                                 <group>
                                     <!-- <field name="request_producer_id"/> -->
                                     <field name="user_id" readonly="1" force_save="1"
-                                           groups="odex_benefit.group_benefit_manager"/>
-                                    <field name="is_from_portal" groups="odex_benefit.group_benefit_manager"/>
+                                           groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
+                                    <field name="is_from_portal"
+                                           groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
                                     <field name="password" password="True" invisible="1"/>
                                     <field name="has_needs" invisible="1"/>
                                     <!--                                    <field name="required_attach" attrs="{'required':[('state','not in',['draft'])]}"/>-->
@@ -2018,7 +2022,8 @@
             <field name="name">grant.benefit.form</field>
             <field name="model">grant.benefit</field>
             <field name="inherit_id" ref="odex_benefit.grant_benefit_form"/>
-            <field name="groups_id" eval="[(6,0,[ref('odex_benefit.group_benefit_manager')])]"/>
+            <field name="groups_id"
+                   eval="[(6,0,[ref('odex_benefit.group_benefit_manager'),ref('odex_benefit.group_family_services_manager')])]"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='city_id']" position="replace">
                     <field name="city_id" invisible="1"/>
diff --git a/odex25_benefit/odex_benefit/views/family_expense_view.xml b/odex25_benefit/odex_benefit/views/family_expense_view.xml
index 8d4b1407b..8d7b4dfb4 100644
--- a/odex25_benefit/odex_benefit/views/family_expense_view.xml
+++ b/odex25_benefit/odex_benefit/views/family_expense_view.xml
@@ -62,10 +62,10 @@
 
                     <button string="Confirm" type="object" name="action_accounting_approve" class="oe_highlight"
                             states="assistant_general_manager"
-                            groups="odex_benefit.group_benefit_manager"/>
+                            groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
                     <button string="Reset" type="object" name="action_reset_to_calculated" class="btn btn-danger"
                             states="assistant_general_manager"
-                            groups="odex_benefit.group_benefit_manager"/>
+                            groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
                     <button string="Reset" type="object" name="action_reset_to_calculated" class="btn btn-danger"
                             states="accounting_approve" groups="odex_benefit.group_family_services_manager"/>
                 </header>
diff --git a/odex25_benefit/odex_benefit/views/family_members.xml b/odex25_benefit/odex_benefit/views/family_members.xml
index a69ffee3b..f0d3f7058 100644
--- a/odex25_benefit/odex_benefit/views/family_members.xml
+++ b/odex25_benefit/odex_benefit/views/family_members.xml
@@ -21,20 +21,20 @@
                         />
                         <button name="action_suspend_third_accept" type="object"
                                 string="Third Approve" class="oe_highlight"
-                                groups="odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                                 attrs="{'invisible': ['|','|',('action_type','!=','suspended'),('state', 'not in', ['family_services_manager']),('is_member_workflow','=',False)]}"/>
                         <button name="action_resume_first_accept" type="object"
                                 string="Resume Approval by Operations Head" class="oe_highlight"
                                 attrs="{'invisible': ['|','|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['waiting_approve']),('is_member_workflow','=',False)]}"
-                                groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                         />
                         <button name="action_resume_second_accept" type="object"
                                 string="Resume Approval by Branch Manager" class="oe_highlight"
-                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                                 attrs="{'invisible': ['|','|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['first_approve']),('is_member_workflow','=',False)]}"/>
                         <button name="action_resume_third_accept" type="object"
                                 string="Resume Approval by Family Services Manager" class="oe_highlight"
-                                groups="odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                                 attrs="{'invisible': ['|','|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['family_services_manager']),('is_member_workflow','=',False)]}"/>
                         <button name="action_resume_member" string="Resume Member Service"
                                 type="object" class="btn btn-success"
@@ -43,7 +43,7 @@
                         <button name="action_final_suspend" type="object"
                                 string="Final Suspension" class="btn btn-danger"
                                 attrs="{'invisible': ['|',('state', '!=', 'temporary_suspended'),('is_member_workflow','=',False)]}"
-                                groups="odex_benefit.group_benefit_manager"/>
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
                         <button name="action_reject_resume" type="object"
                                 string="Reject Resume" class="oe_highlight"
                                 attrs="{'invisible': ['|','|',('action_type','not in',['resume_from_final','resume_from_temporary']),('state', 'not in', ['waiting_approve','first_approve','family_services_manager']),('is_member_workflow','=',False)]}"
@@ -65,17 +65,17 @@
                                 attrs="{'invisible': [('member_status','=','benefit')]}"/>
                         <button name="action_exception_first_accept" type="object"
                                 string="Exception First Approve" class="oe_highlight"
-                                groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                                 attrs="{'invisible': ['|',('action_type','!=','exception'),('state','not in',['waiting_approve'])]}"/>
                         <button name="action_exception_second_accept" type="object"
                                 string="Exception Second Approve" class="oe_highlight"
-                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                                 attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['first_approve'])]}"
                         />
                         <button name="action_exception_final_accept" type="object"
                                 string="Exception Final Approve" class="oe_highlight"
                                 attrs="{'invisible': [('state','not in',['exception_second_approve'])]}"
-                                groups="odex_benefit.group_benefit_manager"/>
+                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
                         <button name="action_exception_refuse" type="object"
                                 string="Exception Refuse" class="btn btn-danger"
                                 attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['waiting_approve','first_approve','family_services_manager','exception_second_approve'])]}"
diff --git a/odex25_benefit/odex_benefit/views/res_country.xml b/odex25_benefit/odex_benefit/views/res_country.xml
index f5cf839a4..1b6122f9d 100644
--- a/odex25_benefit/odex_benefit/views/res_country.xml
+++ b/odex25_benefit/odex_benefit/views/res_country.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                <xpath expr="//group[@name='country_details']" position="after">
                    <group>
-                     <field name="is_excluded" groups="odex_benefit.group_benefit_manager"></field>
+                       <field name="is_excluded" groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
                    </group>
                 </xpath>
             </field>
diff --git a/odex25_benefit/odex_benefit/views/seasonal_service_view.xml b/odex25_benefit/odex_benefit/views/seasonal_service_view.xml
index 0640804e9..a3bccb4ee 100644
--- a/odex25_benefit/odex_benefit/views/seasonal_service_view.xml
+++ b/odex25_benefit/odex_benefit/views/seasonal_service_view.xml
@@ -25,7 +25,7 @@
 
                     <button name="action_approval_of_gm_assistant" type="object"
                             string="Approve" class="oe_highlight"
-                            groups="odex_benefit.group_benefit_manager"
+                            groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                             attrs="{'invisible': [('state', '!=', 'gm_assistant')]}"/>
 
                     <button name="action_reset_to_calculated" type="object"
diff --git a/odex25_benefit/odex_benefit/views/service_request.xml b/odex25_benefit/odex_benefit/views/service_request.xml
index 6f0f63052..b3580f9ce 100644
--- a/odex25_benefit/odex_benefit/views/service_request.xml
+++ b/odex25_benefit/odex_benefit/views/service_request.xml
@@ -152,16 +152,16 @@
                                 string="Beneficiary Approve" class="oe_highlight"
                                 confirm="Are you sure you want to approve  ?"
                                 states="gm_assistant"
-                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"/>
+                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
                         <button name="action_first_refuse" type="object"
                                 string="Return the request to the specialist" class="btn btn-warning"
                                 states="gm_assistant"
-                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                         />
                         <button name="action_refuse" type="object"
                                 string="Refuse" class="btn btn-danger"
                                 states="gm_assistant"
-                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager"
+                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
                         />
                         <field name="state" widget="statusbar"
                                statusbar_visible="draft,researcher,waiting_approve,first_approve,accounting_approve,send_request_to_supplier,family_received_device,refused"/>

From 300d7fad4fb37b67a2c99734ed76d1dd64ca005f Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Wed, 21 Jan 2026 07:22:38 +0100
Subject: [PATCH 14/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/models/family_members.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py
index 43f0f3e19..24fb4732d 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -725,7 +725,7 @@ 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 has_benefiting_son or has_younger_benefiting_daughter:
+                        if rec.age < minor_siblings_age and (has_benefiting_son or has_younger_benefiting_daughter):
                             rec.member_status = 'benefit'
                         else:
                             rec.member_status = 'non_benefit'

From d0e7a2cbe8bca19b3804e5f03a1727d010b10957 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Wed, 21 Jan 2026 08:58:10 +0100
Subject: [PATCH 15/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/models/family_members.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py
index 24fb4732d..79ecce19a 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -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."))

From 5b5e077d77211fb40f11944824d71a936d2ed44d Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Wed, 21 Jan 2026 09:00:05 +0100
Subject: [PATCH 16/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/views/family_members.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_benefit/odex_benefit/views/family_members.xml b/odex25_benefit/odex_benefit/views/family_members.xml
index f0d3f7058..94643ebbf 100644
--- a/odex25_benefit/odex_benefit/views/family_members.xml
+++ b/odex25_benefit/odex_benefit/views/family_members.xml
@@ -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"/>

From 574f3d4576ad5f628fc0f644b2918d1b48ecc927 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Wed, 21 Jan 2026 11:17:54 +0100
Subject: [PATCH 17/27] [IMP]odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/models/benefit.py   | 11 +++++------
 .../odex_benefit/models/family_members.py       |  7 ++++++-
 .../odex_benefit/models/service_request.py      | 17 ++++++++---------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/odex25_benefit/odex_benefit/models/benefit.py b/odex25_benefit/odex_benefit/models/benefit.py
index e0e4ab0d5..e044d4481 100644
--- a/odex25_benefit/odex_benefit/models/benefit.py
+++ b/odex25_benefit/odex_benefit/models/benefit.py
@@ -1405,8 +1405,10 @@ class GrantBenefitProfile(models.Model):
                     reasons.append(_("The mother's marital or location conditions are not eligible."))
                     status = 'non_benefit'
                 elif rec.mother_marital_conf.is_benefit :
-                    if rec.is_mother_work and rec.mother_country_id.code == 'SA' or (
-                            rec.mother_country_id.code != 'SA' and rec.father_country_id.code == 'SA'):
+                    if rec.mother_country_id.code != 'SA' and rec.father_country_id.code != 'SA' and not rec.mother_country_id.is_excluded and not rec.father_country_id.is_excluded:
+                        reasons.append(_("Non-Saudi mothers and fathers cannot register."))
+                        status = 'non_benefit'
+                    else:
                         if mini_income_for_mother < rec.mother_net_income <= max_income_for_mother:
                             reasons.append(_("The mother's income is between minimum and maximum thresholds."))
                             status = 'non_benefit'
@@ -1414,9 +1416,6 @@ class GrantBenefitProfile(models.Model):
                             status = 'benefit'
                         elif rec.mother_net_income > max_income_for_mother:
                             status = 'benefit'
-                    elif not rec.is_mother_work and rec.mother_country_id.code == 'SA' or (
-                            rec.mother_country_id.code != 'SA' and rec.father_country_id.code == 'SA'):
-                        status = 'benefit'
             return status, reasons
 
     def check_replacement_mother_status(self):
@@ -2190,7 +2189,7 @@ class GrantBenefitProfile(models.Model):
         validation_setting = self.env["family.validation.setting"].search([], limit=1)
         max_income_for_mother = validation_setting.max_income_for_mother
         for rec in self:
-            add_mother_net_income = (rec.mother_status == 'benefit' and rec.mother_net_income > max_income_for_mother)
+            add_mother_net_income = (rec.mother_location_conf.is_benefit and rec.mother_marital_conf.is_benefit and rec.mother_net_income > max_income_for_mother)
             if add_mother_net_income:
                 rec.mother_income = rec.mother_net_income
             else:
diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py
index 79ecce19a..99c4ec0dd 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -649,10 +649,15 @@ class FamilyMemberProfile(models.Model):
                     m.relationn.relation_type == 'son' and m.member_status == 'benefit'
                     for m in rec.benefit_id.member_ids
                 )
+
                 has_younger_benefiting_daughter = any(
                     m.relationn.relation_type == 'daughter'
                     and m.member_status == 'benefit'
-                    and m.age < female_benefit_age
+                    and m.birth_date
+                    and (
+                            m.birth_date + rd(years=female_benefit_age) + rd(days=(m.relationn.grace_period_days or 0))
+                            > date.today()
+                    )
                     for m in rec.benefit_id.member_ids
                     if m.id != rec.id
                 )
diff --git a/odex25_benefit/odex_benefit/models/service_request.py b/odex25_benefit/odex_benefit/models/service_request.py
index 4831b7a8a..95c1bd826 100644
--- a/odex25_benefit/odex_benefit/models/service_request.py
+++ b/odex25_benefit/odex_benefit/models/service_request.py
@@ -1,3 +1,5 @@
+from Tools.scripts.dutree import store
+
 from odoo import fields, models, api, _
 from odoo.exceptions import UserError, ValidationError
 from datetime import date, datetime, timedelta
@@ -20,9 +22,9 @@ class ServiceRequest(models.Model):
     researcher_id = fields.Many2one("committees.line", string="Researcher", related="family_id.researcher_id",
                                     store=True)
     family_category = fields.Many2one('benefit.category', string='Family Category',
-                                      related='family_id.benefit_category_id', search="_search_benefit_category_id")
+                                      related='family_id.benefit_category_id', store=True)
     family_code = fields.Char(string='Family Code', related='family_id.code', store=True)
-    benefit_member_count = fields.Integer(string="Benefit Member count", related='family_id.benefit_member_count')
+    benefit_member_count = fields.Integer(string="Benefit Member count", related='family_id.benefit_member_count',store=True)
     branch_custom_id = fields.Many2one('branch.settings', string="Branch", related='family_id.branch_custom_id',
                                        store=True)
     member_id = fields.Many2one('family.member', string='Member')
@@ -79,7 +81,7 @@ class ServiceRequest(models.Model):
     start = fields.Date(string="Start Date")
     end = fields.Date(string='End Date')
     added_amount_if_mother_dead = fields.Float(string="Added Amount (If mother dead)",
-                                               compute="_get_added_amount_if_mother_dead",store=True)
+                                               compute="_get_added_amount_if_mother_dead", store=True)
     attachment_lines = fields.One2many(
         'service.attachments.settings',
         'service_request_id',
@@ -205,9 +207,6 @@ class ServiceRequest(models.Model):
                                            compute='_compute_related_information_html', store=True, )
     researcher_opinion = fields.Html(string='Specialist Opinion', tracking=True)
 
-    def _search_benefit_category_id(self, operator, value):
-        return [('family_id.benefit_category_id', operator, value)]
-
     def action_create_project(self):
         pass
 
@@ -1060,7 +1059,7 @@ class ServiceRequest(models.Model):
                             if service_type == 'rent':
                                 rec.service_max_amount += rec.added_amount_if_mother_dead
                                 rec.requested_service_amount = min(rec.rent_amount_payment,
-                                                                   rec.estimated_rent_amount_payment) + rec.added_amount_if_mother_dead
+                                                                   rec.estimated_rent_amount_payment + rec.added_amount_if_mother_dead)
                     elif rec.max_limit_period == "calendar_year":
                         current_date = rec.date.date() if isinstance(rec.date, datetime) else rec.date
                         allowed_years = rec.service_cat.allowed_period or 1
@@ -1359,7 +1358,7 @@ class ServiceRequest(models.Model):
             else:
                 rec.rent_amount_payment = 0.0
 
-    @api.depends('family_id','service_cat','payment_type')
+    @api.depends('family_id', 'service_cat', 'payment_type')
     def _get_added_amount_if_mother_dead(self):
         for rec in self:
             added_amount_if_mother_dead = 0.0
@@ -1367,4 +1366,4 @@ class ServiceRequest(models.Model):
                 added_amount_if_mother_dead = rec.service_cat.raise_amount_for_orphan
                 if rec.service_cat.raise_amount_for_orphan and rec.payment_type:
                     added_amount_if_mother_dead = rec.service_cat.raise_amount_for_orphan / int(rec.payment_type)
-            rec.added_amount_if_mother_dead = added_amount_if_mother_dead
\ No newline at end of file
+            rec.added_amount_if_mother_dead = added_amount_if_mother_dead

From 88a471f2fac6f79a785fa087c98d188dacfeee26 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Wed, 21 Jan 2026 11:34:43 +0100
Subject: [PATCH 18/27] [IMP]odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/models/service_request.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/odex25_benefit/odex_benefit/models/service_request.py b/odex25_benefit/odex_benefit/models/service_request.py
index 95c1bd826..0bad26487 100644
--- a/odex25_benefit/odex_benefit/models/service_request.py
+++ b/odex25_benefit/odex_benefit/models/service_request.py
@@ -1,5 +1,3 @@
-from Tools.scripts.dutree import store
-
 from odoo import fields, models, api, _
 from odoo.exceptions import UserError, ValidationError
 from datetime import date, datetime, timedelta
@@ -42,7 +40,7 @@ class ServiceRequest(models.Model):
                                               store=True)
     service_attach = fields.Many2many('ir.attachment', 'rel_service_attachment_service_request', 'service_request_id',
                                       'attachment_id', string='Service Attachment')
-    requested_service_amount = fields.Float(string="Requested Service Amount", copy=False)
+    requested_service_amount = fields.Float(string="Requested Service Amount", copy=False,tracking=False)
     # yearly Estimated Rent Amount
     estimated_rent_amount = fields.Float(string="Estimated Rent Amount", compute="_get_estimated_rent_amount",
                                          store=True)

From 2a61bd5c8c33388c66830de0d3832367fe982834 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Wed, 21 Jan 2026 13:22:51 +0100
Subject: [PATCH 19/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po    | 13 +++++++++-
 odex25_benefit/odex_benefit/models/benefit.py |  2 +-
 .../odex_benefit/models/family_members.py     | 25 ++++++++++++++-----
 .../odex_benefit/security/security_view.xml   |  6 +++++
 .../odex_benefit/views/family_members.xml     |  6 +++--
 5 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index af665f4e0..3aa937ee0 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -18535,4 +18535,15 @@ msgstr "الجنسيات المسموح بها"
 msgid ""
 "Countries where this service is available. Leave empty to allow all "
 "countries."
-msgstr "الجنسيات التي تتوفر فيها هذه الخدمة. اتركها فارغة للسماح بجميع الجنسيات."
\ No newline at end of file
+msgstr "الجنسيات التي تتوفر فيها هذه الخدمة. اتركها فارغة للسماح بجميع الجنسيات."
+
+#. module: odex_benefit
+#: model:res.groups,name:odex_benefit.group_family_member_exception
+msgid "Family Member Exception"
+msgstr "استثناء أفراد الأسرة"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/benefit.py:0
+#, python-format
+msgid "Non-Saudi mothers and fathers cannot register."
+msgstr "الأمهات والآباء غير السعوديين."
\ No newline at end of file
diff --git a/odex25_benefit/odex_benefit/models/benefit.py b/odex25_benefit/odex_benefit/models/benefit.py
index e044d4481..6b4e20d74 100644
--- a/odex25_benefit/odex_benefit/models/benefit.py
+++ b/odex25_benefit/odex_benefit/models/benefit.py
@@ -2321,7 +2321,7 @@ class GrantBenefitProfile(models.Model):
                 income = family_income
             ben.member_income = round(income, 0)
 
-    @api.depends("member_income")
+    @api.depends("member_income", "benefit_member_count")
     def get_benefit_category(self):
         default_category = self.env['benefit.category'].sudo().search(
             [('is_benefit', '=', False)], limit=1
diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py
index 99c4ec0dd..dc0551e41 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -64,6 +64,7 @@ class FamilyMemberProfile(models.Model):
     # member_location = fields.Many2one('member.location', string="Member Location")
     birth_date = fields.Date(string="Birth Date")
     age = fields.Integer(string="Age", compute='_compute_get_age_date', store=True)
+    full_age = fields.Char(string="Full Age",compute='_compute_get_age_date',store=True)
     age_status = fields.Selection(
         [('minor', 'Minor'), ('non_minor', 'Non-Minor')],
         string='Age Status',
@@ -871,14 +872,26 @@ class FamilyMemberProfile(models.Model):
 
     @api.depends('birth_date')
     def _compute_get_age_date(self):
+        today = date.today()
         for rec in self:
-            if rec.birth_date:
-                today = date.today()
-                day = datetime.strptime(str(rec.birth_date), DEFAULT_SERVER_DATE_FORMAT)
-                age = rd(today, day)
-                rec.age = age.years
-            else:
+            if not rec.birth_date:
                 rec.age = 0
+                rec.full_age = _("0 years, 0 months, 0 days")
+                continue
+            birth = fields.Date.from_string(rec.birth_date)
+            delta = rd(today, birth)
+
+            years = delta.years
+            months = delta.months
+            days = delta.days
+
+            rec.age = years
+            parts = []
+            parts.append(_("%s year(s)") % years if years == 1 else _("%s years") % years)
+            parts.append(_("%s month(s)") % months if months == 1 else _("%s months") % months)
+            parts.append(_("%s day(s)") % days if days == 1 else _("%s days") % days)
+
+            rec.full_age = ", ".join(parts) if parts else _("0 days")
 
     @api.onchange("member_id_number")
     def onchange_member_id_number(self):
diff --git a/odex25_benefit/odex_benefit/security/security_view.xml b/odex25_benefit/odex_benefit/security/security_view.xml
index 0b76b3b7b..6ce2284f4 100644
--- a/odex25_benefit/odex_benefit/security/security_view.xml
+++ b/odex25_benefit/odex_benefit/security/security_view.xml
@@ -67,6 +67,12 @@
             <field name="implied_ids" eval="[(4, ref('group_benefit_researcher'))]"/>
         </record>
 
+        <record id="group_family_member_exception" model="res.groups">
+            <field name="name">Family Member Exception</field>
+            <field name="category_id" ref="module_category_benefit"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
+
         <record id="group_benefit_woman_commitee" model="res.groups">
             <field name="name">Head of the Women's Committee</field>
             <field name="category_id" ref="module_category_benefit"/>
diff --git a/odex25_benefit/odex_benefit/views/family_members.xml b/odex25_benefit/odex_benefit/views/family_members.xml
index 94643ebbf..93d773ed9 100644
--- a/odex25_benefit/odex_benefit/views/family_members.xml
+++ b/odex25_benefit/odex_benefit/views/family_members.xml
@@ -56,12 +56,12 @@
                         <button name="action_exception" type="object"
                                 string="Temporarily Exception" class="oe_highlight"
                                 confirm="Are you sure you want to move  to Temporarily Exception ?"
-                                groups="!odex_benefit.group_benefit_supervisor"
+                                groups="!odex_benefit.group_family_member_exception"
                                 attrs="{'invisible': ['|',('member_status','=','benefit'),('can_request_temporary_exception','=',False)]}"/>
                         <button name="action_exception" type="object"
                                 string="Temporarily Exception" class="oe_highlight"
                                 confirm="Are you sure you want to move  to Temporarily Exception ?"
-                                groups="odex_benefit.group_benefit_supervisor"
+                                groups="odex_benefit.group_family_member_exception"
                                 attrs="{'invisible': [('member_status','=','benefit')]}"/>
                         <button name="action_exception_first_accept" type="object"
                                 string="Exception First Approve" class="oe_highlight"
@@ -151,6 +151,7 @@
                             </group>
                             <group>
                                 <field name="age" readonly="1" required="1" force_save="1"/>
+                                <field name="full_age" force_save="1"/>
                                 <field name="age_status"
                                        attrs="{'invisible':[('relationn_type','not in',('son','daughter'))]}"/>
                                 <field name="member_id_number"
@@ -366,6 +367,7 @@
                     <field name="case_study" optional="show"/>
                     <field name="is_excluded_suspension"/>
                     <field name="age"/>
+                    <field name="full_age"/>
                     <field name="benefit_id" optional="hide"/>
                     <field name="branch_custom_id"/>
                     <field name="state" widget="badge" decoration-success="state in ['first_approve', 'second_approve']"

From 2723917f672bccb9ec16b1ec65daf7454b1a32ea Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Wed, 21 Jan 2026 13:45:58 +0100
Subject: [PATCH 20/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po    | 55 ++++++++++++++++++-
 .../odex_benefit/models/family_members.py     | 28 +++++-----
 .../odex_benefit/views/family_members.xml     |  4 +-
 3 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index 3aa937ee0..ce4f7f5c8 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -18546,4 +18546,57 @@ msgstr "استثناء أفراد الأسرة"
 #: code:addons/odex_benefit/models/benefit.py:0
 #, python-format
 msgid "Non-Saudi mothers and fathers cannot register."
-msgstr "الأمهات والآباء غير السعوديين."
\ No newline at end of file
+msgstr "الأمهات والآباء غير السعوديين."
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_family_member__full_age
+msgid "Full Age"
+msgstr "العمر"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/family_members.py:0
+#, python-format
+msgid "%s years"
+msgstr "%s سنة"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/family_members.py:0
+#, python-format
+msgid "0 years, 0 months, 0 days"
+msgstr "0 سنة، 0 شهر، 0 يوم"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/family_members.py:0
+#, python-format
+msgid "%s months"
+msgstr "%s شهر"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/family_members.py:0
+#, python-format
+msgid "%s day(s)"
+msgstr "%s يوم"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/family_members.py:0
+#, python-format
+msgid "%s days"
+msgstr "%s يوم"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/family_members.py:0
+#, python-format
+msgid "%s month(s)"
+msgstr "%s شهر"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/family_members.py:0
+#, python-format
+msgid "%s year(s)"
+msgstr "%s سنة"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/family_members.py:0
+#, python-format
+msgid "0 days"
+msgstr "0 يوم"
\ 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 dc0551e41..f42b09ed1 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -703,20 +703,20 @@ class FamilyMemberProfile(models.Model):
                                         _("Over %s years old and not enrolled in a scientific or vocational specialization.")
                                         % exceptional_age_scientific_specialty
                                     )
-                    if rec.is_work:
-                        if rec.member_income > max_income_for_benefit:
-                            rec.member_status = 'non_benefit'
-                            reasons.append(_("He is employed with a salary exceeding %s.") % max_income_for_benefit)
-                        if not rec.is_married and rec.education_status in ['illiterate']:
-                            rec.member_status = 'non_benefit'
-                            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 rec.case_study in [
-                            'graduate', 'intermittent']:
-                            rec.member_status = 'non_benefit'
-                            reasons.append(
-                                _("He is over %s years of age and has completed his education.") % male_benefit_age)
+                        if rec.is_work:
+                            if rec.member_income > max_income_for_benefit:
+                                rec.member_status = 'non_benefit'
+                                reasons.append(_("He is employed with a salary exceeding %s.") % max_income_for_benefit)
+                            if not rec.is_married and rec.education_status in ['illiterate']:
+                                rec.member_status = 'non_benefit'
+                                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 rec.case_study in [
+                                'graduate', 'intermittent']:
+                                rec.member_status = 'non_benefit'
+                                reasons.append(
+                                    _("He is over %s years of age and has completed his education.") % male_benefit_age)
                     if not rec.member_location_conf.is_benefit:
                         rec.member_status = 'non_benefit'
                         reasons.append(_("He does not reside with his family."))
diff --git a/odex25_benefit/odex_benefit/views/family_members.xml b/odex25_benefit/odex_benefit/views/family_members.xml
index 93d773ed9..53c0b71a2 100644
--- a/odex25_benefit/odex_benefit/views/family_members.xml
+++ b/odex25_benefit/odex_benefit/views/family_members.xml
@@ -150,7 +150,7 @@
                                 <field name="exit_benefit_date" readonly="1" force_save="1"/>
                             </group>
                             <group>
-                                <field name="age" readonly="1" required="1" force_save="1"/>
+                                <field name="age" invisible="1" readonly="1" required="1" force_save="1"/>
                                 <field name="full_age" force_save="1"/>
                                 <field name="age_status"
                                        attrs="{'invisible':[('relationn_type','not in',('son','daughter'))]}"/>
@@ -366,7 +366,7 @@
                     <field name="last_education_levels" optional="hide"/>
                     <field name="case_study" optional="show"/>
                     <field name="is_excluded_suspension"/>
-                    <field name="age"/>
+                    <field name="age" optional="hide"/>
                     <field name="full_age"/>
                     <field name="benefit_id" optional="hide"/>
                     <field name="branch_custom_id"/>

From 22ea89821d1c12bb9b9d19b1ccd70213a1403416 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Wed, 21 Jan 2026 13:52:27 +0100
Subject: [PATCH 21/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/models/benefit.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/odex25_benefit/odex_benefit/models/benefit.py b/odex25_benefit/odex_benefit/models/benefit.py
index 6b4e20d74..b2fbd4303 100644
--- a/odex25_benefit/odex_benefit/models/benefit.py
+++ b/odex25_benefit/odex_benefit/models/benefit.py
@@ -2698,9 +2698,9 @@ class GrantBenefitProfile(models.Model):
     def update_data_automatically(self):
         obj = self.env["grant.benefit"].search([])
         for member in obj.member_ids:
-            # member._compute_get_age_date()
+            member._compute_get_age_date()
             member.check_member_status()
-        self.action_auto_suspend()
+        #self.action_auto_suspend()
 
 
 class BenefitFollowers(models.Model):

From 4fa290f47e4cf75e9ec1ddc6f3e53e779cf472a7 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Thu, 22 Jan 2026 14:51:34 +0100
Subject: [PATCH 22/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po    |  21 +--
 .../odex_benefit/models/benefit_config.py     |  44 +++++
 .../odex_benefit/models/family_members.py     |  10 +-
 .../odex_benefit/models/service_request.py    | 154 ++++++++++++------
 .../odex_benefit/models/services_settings.py  |   8 +
 .../odex_benefit/security/ir.model.access.csv |   7 +-
 .../views/benefit_config_view.xml             |   1 +
 .../odex_benefit/views/benefit_view.xml       |   4 +-
 .../odex_benefit/views/family_members.xml     |   9 +-
 .../odex_benefit/views/service_request.xml    |  21 ++-
 .../odex_benefit/views/services_settings.xml  |   1 +
 11 files changed, 199 insertions(+), 81 deletions(-)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index ce4f7f5c8..08a04cc93 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -5184,7 +5184,7 @@ msgstr "خدمات استثنائية"
 #: model:ir.model.fields,field_description:odex_benefit.field_family_member__is_excluded_suspension
 #: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__is_excluded_suspension
 msgid "Excluded from suspension?"
-msgstr "مستثنى من إيقاف الخدمة"
+msgstr "استثناء"
 
 #. module: odex_benefit
 #: model:ir.model.fields,field_description:odex_benefit.field_benefit_category__expenses_ids
@@ -16408,12 +16408,6 @@ msgstr "لا يمكنك طلب هذه الخدمة أكثر من مرة."
 msgid "You cannot request more than %s"
 msgstr "لا يمكنك طلب أكثر من %s"
 
-#. module: odex_benefit
-#: code:addons/odex_benefit/models/service_request.py:0
-#, python-format
-msgid "You cannot request this device more than %s times within %s %s."
-msgstr "لا يمكنك طلب هذا الجهاز أكثر من %s مرات خلال %s %s."
-
 #. module: odex_benefit
 #: code:addons/odex_benefit/models/service_request.py:0
 #, python-format
@@ -16880,15 +16874,14 @@ msgid "Has Marriage Course"
 msgstr "الحصول على دورة تأهيلية"
 
 #. module: odex_benefit
-#: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
 #: model_terms:ir.ui.view,arch_db:odex_benefit.seasonal_service_form_view
-#, fuzzy
 msgid "Total Moves"
-msgstr ""
-"#-#-#-#-#  catalog.po (Odoo Server 14.0)  #-#-#-#-#\n"
-"القيد المحاسبي\n"
-"#-#-#-#-#  catalog.po (Odoo Server 14.0)  #-#-#-#-#\n"
-"فاتورة العثيم"
+msgstr "القيد المحاسبي"
+
+#. module: odex_benefit
+#: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
+msgid "Total Moves"
+msgstr "فاتورة"
 
 #. module: odex_benefit
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
diff --git a/odex25_benefit/odex_benefit/models/benefit_config.py b/odex25_benefit/odex_benefit/models/benefit_config.py
index b810e6d41..c2187fb6d 100644
--- a/odex25_benefit/odex_benefit/models/benefit_config.py
+++ b/odex25_benefit/odex_benefit/models/benefit_config.py
@@ -783,6 +783,7 @@ class BranchSettings(models.Model):
         'branch.settings',
         string="Replacement Branch"
     )
+    service_producer_id = fields.Many2one('res.partner', string='Service Producer')
 
 class RelationSettings(models.Model):
     _name = 'relation.settings'
@@ -984,6 +985,49 @@ class HomeFurnishingItems(models.Model):
     price_second_attach = fields.Many2many('ir.attachment','rel_second_price_attachments', 'furnishing_id', 'attach_id',string="Second Price Attachment")
     service_request_id = fields.Many2one('service.request',string='Service Request')
 
+class ElectricalDeviceLine(models.Model):
+    _name = 'electrical.device.line'
+    _description = 'Electrical Device Line'
+
+    service_request_id = fields.Many2one('service.request',string='Service Request',ondelete='cascade',)
+    device_id = fields.Many2one('electrical.devices',string='Device',compute='_compute_device_id',store=True)
+    product_id = fields.Many2one('product.product',string='Product',required=True,)
+    quantity = fields.Integer(string='Quantity',required=True,default=1)
+    unit_price = fields.Float( string='Unit Price',compute='_compute_unit_price',store=True)
+    subtotal = fields.Float(string='Subtotal',compute='_compute_subtotal',store=True)
+
+    @api.depends('device_id')
+    def _compute_unit_price(self):
+        for line in self:
+            if line.device_id:
+                line.unit_price = line.product_id.standard_price
+            else:
+                line.unit_price = 0.0
+
+    @api.depends('quantity', 'unit_price')
+    def _compute_subtotal(self):
+        for line in self:
+            line.subtotal = line.quantity * line.unit_price
+
+    @api.depends('product_id', 'service_request_id.benefit_member_count', 'service_request_id.service_cat')
+    def _compute_device_id(self):
+        for line in self:
+            if not line.product_id or not line.service_request_id or not line.service_request_id.service_cat:
+                line.device_id = False
+                continue
+
+            member_count = line.service_request_id.benefit_member_count or 0
+
+            matching = line.service_request_id.service_cat.electrical_devices_lines.filtered(
+                lambda d: line.product_id in d.product_ids
+                          and (d.min_count_member or 0) <= member_count <= (d.max_count_member or 999999)
+            )
+
+            if matching:
+                line.device_id = matching[0]
+            else:
+                line.device_id = False
+
 class PropertyTypeSettings(models.Model):
     _name = 'property.type.settings'
     _description = 'Property Type Settings'
diff --git a/odex25_benefit/odex_benefit/models/family_members.py b/odex25_benefit/odex_benefit/models/family_members.py
index f42b09ed1..45bb747a8 100644
--- a/odex25_benefit/odex_benefit/models/family_members.py
+++ b/odex25_benefit/odex_benefit/models/family_members.py
@@ -64,7 +64,7 @@ class FamilyMemberProfile(models.Model):
     # member_location = fields.Many2one('member.location', string="Member Location")
     birth_date = fields.Date(string="Birth Date")
     age = fields.Integer(string="Age", compute='_compute_get_age_date', store=True)
-    full_age = fields.Char(string="Full Age",compute='_compute_get_age_date',store=True)
+    full_age = fields.Char(string="Full Age", compute='_compute_get_age_date', store=True)
     age_status = fields.Selection(
         [('minor', 'Minor'), ('non_minor', 'Non-Minor')],
         string='Age Status',
@@ -143,7 +143,7 @@ class FamilyMemberProfile(models.Model):
     last_classroom = fields.Many2one('education.classroom', string='Last Classroom')
     last_educational_certificate = fields.Binary(attachment=True, string='Last Educational Certificate')
     degree = fields.Many2one('education.result', string='Degree')
-    last_degree = fields.Many2one('education.result', string='Last Degree')
+    last_degree = fields.Many2one('education.result', string='Last Degree', compute='_compute_last_education_data', store=True)
     percentage = fields.Float(string="Percentage%")
     last_percentage = fields.Float(string="Last Percentage%")
     education_start_date = fields.Date(string='Education Start Date')
@@ -342,9 +342,11 @@ class FamilyMemberProfile(models.Model):
                 )[:1]
                 rec.last_education_levels = latest_education.education_levels
                 rec.case_study = latest_education.case_study
+                rec.last_degree = latest_education.degree
             else:
                 rec.last_education_levels = False
                 rec.case_study = False
+                rec.last_degree = False
 
     @api.depends(
         'relationn.relation_type',
@@ -613,7 +615,7 @@ class FamilyMemberProfile(models.Model):
                 lambda r: r.education_status_type == 'current')
             if current_education_status_id:
                 current_education_status_id = current_education_status_id.sorted('write_date', reverse=True)[:1]
-            if rec.state == 'second_approve' and rec.is_excluded_suspension:
+            if rec.is_excluded_suspension:
                 rec.member_status = 'benefit'
                 continue
             if rec.birth_date:
@@ -1067,7 +1069,7 @@ class FamilyMemberProfile(models.Model):
 
     def action_exception_second_accept(self):
         for rec in self:
-            rec.is_excluded_suspension = True
+            # rec.is_excluded_suspension = True
             rec.state_a = 'exception_second_approve'
             # rec.is_member_workflow = False
 
diff --git a/odex25_benefit/odex_benefit/models/service_request.py b/odex25_benefit/odex_benefit/models/service_request.py
index 0bad26487..36871d8df 100644
--- a/odex25_benefit/odex_benefit/models/service_request.py
+++ b/odex25_benefit/odex_benefit/models/service_request.py
@@ -22,7 +22,8 @@ class ServiceRequest(models.Model):
     family_category = fields.Many2one('benefit.category', string='Family Category',
                                       related='family_id.benefit_category_id', store=True)
     family_code = fields.Char(string='Family Code', related='family_id.code', store=True)
-    benefit_member_count = fields.Integer(string="Benefit Member count", related='family_id.benefit_member_count',store=True)
+    benefit_member_count = fields.Integer(string="Benefit Member count", related='family_id.benefit_member_count',
+                                          store=True)
     branch_custom_id = fields.Many2one('branch.settings', string="Branch", related='family_id.branch_custom_id',
                                        store=True)
     member_id = fields.Many2one('family.member', string='Member')
@@ -40,7 +41,7 @@ class ServiceRequest(models.Model):
                                               store=True)
     service_attach = fields.Many2many('ir.attachment', 'rel_service_attachment_service_request', 'service_request_id',
                                       'attachment_id', string='Service Attachment')
-    requested_service_amount = fields.Float(string="Requested Service Amount", copy=False,tracking=False)
+    requested_service_amount = fields.Float(string="Requested Service Amount", copy=False, tracking=False)
     # yearly Estimated Rent Amount
     estimated_rent_amount = fields.Float(string="Estimated Rent Amount", compute="_get_estimated_rent_amount",
                                          store=True)
@@ -113,6 +114,8 @@ class ServiceRequest(models.Model):
     # Fields for electrical_devices service
     device_id = fields.Many2one('electrical.devices', string='Device',
                                 domain="[('min_count_member','<=',benefit_member_count),('max_count_member','>=',benefit_member_count)]")
+    electrical_device_line_ids = fields.One2many('electrical.device.line', 'service_request_id',
+                                                 string='Electrical Devices', copy=False)
     vendor_bill = fields.Many2one('account.move', copy=False)
     requested_quantity = fields.Integer(string='Requested Quantity')
     exception_or_steal = fields.Boolean(string='Exception Or Steal?')
@@ -204,6 +207,8 @@ class ServiceRequest(models.Model):
     related_information_html = fields.Html(string="Related Information",
                                            compute='_compute_related_information_html', store=True, )
     researcher_opinion = fields.Html(string='Specialist Opinion', tracking=True)
+    allowed_product_ids = fields.Many2many('product.product', string='Allowed Products',
+                                           compute='_compute_allowed_product_ids', store=True, )
 
     def action_create_project(self):
         pass
@@ -737,18 +742,22 @@ class ServiceRequest(models.Model):
         for rec in self:
             if rec.service_cat:
                 rec.benefit_type = rec.service_cat.benefit_type
-                rec.service_producer_id = rec.service_cat.service_producer_id
-                # rec.payment_method = rec.service_cat.payment_method
+                if rec.family_id.branch_family_id.service_producer_id and rec.service_type == 'electrical_devices':
+                    rec.service_producer_id = rec.family_id.branch_family_id.service_producer_id
+                else:
+                    rec.service_producer_id = rec.service_cat.service_producer_id
             else:
                 rec.benefit_type = False
                 rec.service_producer_id = False
-                # rec.payment_method = 'payment_order'
 
             if not rec.family_id:
                 rec.member_id = False
                 rec.service_cat = False
                 rec.available_service_cats = False
 
+            if rec.electrical_device_line_ids:
+                rec.electrical_device_line_ids = [(5, 0, 0)]
+
     @api.onchange('start', 'end', 'rent_start_date', 'rent_end_date', 'payment_type')
     def _check_date_range(self):
         for rec in self:
@@ -803,20 +812,15 @@ class ServiceRequest(models.Model):
 
     @api.onchange(
         'requested_service_amount',
-        'benefit_type',
-        'date',
-        'service_cat',
-        'family_id',
-        'member_id',
-        'exception_or_steal',
+        'benefit_type', 'date',
+        'service_cat', 'family_id',
+        'member_id', 'exception_or_steal',
         'home_furnishing_exception',
-        'has_marriage_course',
-        'home_age',
-        'device_id',
-        'requested_quantity',
+        'has_marriage_course', 'home_age',
         'amount_for_buy_home_for_member_count',
         'marriage_contract_date',
-        'start', 'end'
+        'start', 'end',
+        'electrical_device_line_ids'
     )
     def onchange_requested_service_amount(self):
         res = {}
@@ -965,31 +969,48 @@ class ServiceRequest(models.Model):
                     else:
                         if service_type in special_services:
                             if service_type == 'electrical_devices':
-                                # rec.service_max_amount = rec.device_id.price_unit if rec.device_id else 0.0
-                                if rec.device_id:
-                                    rec.service_max_amount = rec.device_id.price_unit * rec.requested_quantity
-                                    rec.requested_service_amount = rec.service_max_amount
-                                else:
+                                if not rec.electrical_device_line_ids:
                                     rec.service_max_amount = 0.0
                                     rec.requested_service_amount = 0.0
-                                if rec.device_id:
-                                    delta_kwargs = {period: interval}
-                                    date_before = rec.date - relativedelta(**delta_kwargs)
+                                    continue
+
+                                total_amount = sum(rec.electrical_device_line_ids.mapped('subtotal'))
+                                rec.requested_service_amount = total_amount
+                                rec.service_max_amount = total_amount
+
+                                delta_kwargs = {period: interval}
+                                date_before = rec.date - relativedelta(**delta_kwargs)
+                                device_qty_map = {}
+                                for line in rec.electrical_device_line_ids:
+                                    if line.device_id:
+                                        device_id = line.device_id.id
+                                        device_qty_map[device_id] = device_qty_map.get(device_id, 0) + line.quantity
+
+                                for device_id, current_total_qty in device_qty_map.items():
+                                    device = self.env['electrical.devices'].browse(device_id)
+                                    allowed_qty = device.allowed_quantity
+                                    if current_total_qty > allowed_qty:
+                                        raise ValidationError(_(
+                                            "Device '%s': Total quantity in this request (%s) exceeds the allowed limit of %s units."
+                                        ) % (device.device_name, current_total_qty, allowed_qty))
                                     domain = base_domain + [
-                                        ('device_id', '=', rec.device_id.id),
-                                        ('date', '>', date_before)
+                                        ('date', '>', date_before),
+                                        ('electrical_device_line_ids.device_id', '=', device_id)
                                     ]
                                     existing_requests = Service.search(domain)
-                                    total_previous_qty = sum(existing_requests.mapped('requested_quantity'))
-                                    total_qty = total_previous_qty + rec.requested_quantity
-                                    allowed_line = rec.service_cat.electrical_devices_lines.filtered(
-                                        lambda l: l.id == rec.device_id.id
+                                    existing_device_lines = existing_requests.mapped(
+                                        'electrical_device_line_ids').filtered(
+                                        lambda l: l.device_id.id == device_id
                                     )
-                                    allowed_qty = allowed_line.allowed_quantity if allowed_line else 0
+                                    total_previous_qty = sum(existing_device_lines.mapped('quantity'))
+                                    total_qty = total_previous_qty + current_total_qty
+
                                     if total_qty > allowed_qty:
                                         raise ValidationError(_(
-                                            "You cannot request this device more than %s times within %s %s."
-                                        ) % (allowed_qty, interval, period))
+                                            "Device '%s': You cannot request more than %s units within %s %s. "
+                                            "(Previous requests: %s, Current request: %s, Total: %s)"
+                                        ) % (device.device_name, allowed_qty, interval,
+                                             period, total_previous_qty, current_total_qty, total_qty))
                         else:
                             last_request = Service.search(base_domain, order='date desc', limit=1)
                             if last_request and last_request.date:
@@ -1173,6 +1194,19 @@ class ServiceRequest(models.Model):
 
             rec.available_service_cats = rec.available_service_cats.sudo().search(domain)
 
+    @api.depends('service_cat', 'benefit_member_count')
+    def _compute_allowed_product_ids(self):
+        for rec in self:
+            if not rec.service_cat or not rec.benefit_member_count or rec.service_cat.service_type != 'electrical_devices':
+                rec.allowed_product_ids = False
+                continue
+
+            matching_devices = rec.service_cat.electrical_devices_lines.filtered(
+                lambda dev: (dev.min_count_member or 0) <= rec.benefit_member_count <= (dev.max_count_member or 9999)
+            )
+
+            rec.allowed_product_ids = matching_devices.mapped('product_ids')
+
     def action_set_to_draft(self):
         for rec in self:
             rec.state = 'draft'
@@ -1240,24 +1274,46 @@ class ServiceRequest(models.Model):
                     "• Not be linked to any invoice"
                 ) % names)
 
+            empty_requests = self.filtered(lambda r: not r.electrical_device_line_ids)
+            if empty_requests:
+                names = ", ".join(empty_requests.mapped('name'))
+                raise UserError(_(
+                    "Cannot create invoice: the following requests have no electrical device lines:\n%s\n"
+                    "All selected requests must contain at least one device line."
+                ) % names)
+
             for rec in self:
-                invoice_line = (0, 0, {
-                    'name': f'{rec.family_id.name}/{rec.device_id.device_name}/{rec.description}/{rec.name}',
-                    'account_id': rec.device_account_id.id,
-                    'analytic_account_id': rec.family_id.branch_family_id.branch.analytic_account_id.id,
-                    'quantity': rec.requested_quantity,
-                    'price_unit': rec.requested_service_amount,
-                    'benefit_family_id': rec.family_id.id,
+                line_ids = []
+                for line in rec.electrical_device_line_ids:
+                    invoice_line_vals = {
+                        'name': rec.name or _('Electrical Device Line'),
+                        'product_id': line.product_id.id or False,
+                        'account_id': line.device_id.account_id.id or False,
+                        'analytic_account_id': (
+                            rec.family_id.branch_family_id.branch.analytic_account_id.id
+                            if rec.family_id.branch_family_id
+                               and rec.family_id.branch_family_id.branch
+                               and rec.family_id.branch_family_id.branch.analytic_account_id
+                            else False
+                        ),
+                        'quantity': line.quantity,
+                        'price_unit': line.unit_price,
+                        'benefit_family_id': rec.family_id.id,
+                    }
+                    line_ids.append((0, 0, invoice_line_vals))
+
+                if not line_ids:
+                    raise UserError(_("No invoice lines could be created."))
+                vendor_bill = self.env['account.move'].create({
+                    'move_type': 'in_invoice',
+                    'partner_id': rec.service_producer_id.id,
+                    'partner_shipping_id': rec.family_id.partner_id.id,
+                    'journal_id': validation_setting.journal_id.id,
+                    # 'accountant_id': self.accountant_id.id,
+                    'invoice_line_ids': line_ids,
+                    'ref': rec.name or False,
                 })
-                line_ids.append(invoice_line)
-            vendor_bill = self.env['account.move'].create({
-                'move_type': 'in_invoice',
-                'partner_id': self[0].service_producer_id.id,
-                'journal_id': validation_setting.journal_id.id,
-                # 'accountant_id': self.accountant_id.id,
-                'invoice_line_ids': line_ids,
-            })
-            self.vendor_bill = vendor_bill
+                rec.vendor_bill = vendor_bill
 
     def _get_total_move_lines(self):
         for rec in self:
diff --git a/odex25_benefit/odex_benefit/models/services_settings.py b/odex25_benefit/odex_benefit/models/services_settings.py
index 42ccee3cf..0c381c6d2 100644
--- a/odex25_benefit/odex_benefit/models/services_settings.py
+++ b/odex25_benefit/odex_benefit/models/services_settings.py
@@ -211,6 +211,14 @@ class ElectricalDevices(models.Model):
     account_id = fields.Many2one('account.account', string='Expenses Account', domain="[('user_type_id.id','=',15)]")
     services_settings_id = fields.Many2one('services.settings')
     price_unit = fields.Float()
+    product_ids = fields.Many2many(
+        comodel_name='product.product',
+        relation='electrical_device_product_rel',
+        column1='electrical_device_id',
+        column2='product_id',
+        string='Allowed Products',
+        domain = "[('type', '=', 'product')]"
+    )
 
 
 class HomeFurnishingLines(models.Model):
diff --git a/odex25_benefit/odex_benefit/security/ir.model.access.csv b/odex25_benefit/odex_benefit/security/ir.model.access.csv
index a6c89971f..11cf3b686 100644
--- a/odex25_benefit/odex_benefit/security/ir.model.access.csv
+++ b/odex25_benefit/odex_benefit/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_benefit_researcher_record,access_benefit_researcher_record,model_grant_benefit,odex_benefit.group_benefit_researcher,1,1,1,0
-access_benefit_woman_commitee_record,access_benefit_record,model_grant_benefit,odex_benefit.group_benefit_woman_commitee,1,1,1,1
-access_benefit_branch_manager_record,access_benefit_branch_manager_record,model_grant_benefit,odex_benefit.group_benefit_branch_manager,1,1,1,1
+access_benefit_researcher_record,access_benefit_researcher_record,model_grant_benefit,odex_benefit.group_benefit_researcher,1,1,0,0
+access_benefit_woman_commitee_record,access_benefit_record,model_grant_benefit,odex_benefit.group_benefit_woman_commitee,1,1,0,1
+access_benefit_branch_manager_record,access_benefit_branch_manager_record,model_grant_benefit,odex_benefit.group_benefit_branch_manager,1,1,0,1
 access_benefit_manager_record,access_benefit_manager_record,model_grant_benefit,odex_benefit.group_benefit_manager,1,1,1,1
 access_benefit_family_services_manager,access_benefit_family_services_manager,model_grant_benefit,odex_benefit.group_family_services_manager,1,1,1,1
 access_education_status_all,education_status,model_education_status,odex_benefit.group_benefit_info,1,1,1,1
@@ -201,4 +201,5 @@ access_return_reason_wizard,access_return_reason_wizard,model_return_reason_wiza
 access_property_type_settings,access_property_type_settings,model_property_type_settings,base.group_user,1,0,0,0
 access_property_type_benefit_settings,access_property_type_benefit_settings,model_property_type_settings,odex_benefit.group_benefit_settings,1,1,1,1
 access_rent_contract,access_rent_contract,model_rent_contract,base.group_user,1,1,1,1
+access_electrical_device_line,access_electrical_device_line,model_electrical_device_line,base.group_user,1,1,1,1
 access_seasonal_service_payment_accountant_accept,access_seasonal_service_payment_accountant_accept,model_seasonal_service,odex_benefit.group_benefit_payment_accountant_accept,1,0,0,0
\ No newline at end of file
diff --git a/odex25_benefit/odex_benefit/views/benefit_config_view.xml b/odex25_benefit/odex_benefit/views/benefit_config_view.xml
index 6f804938a..00b803db5 100644
--- a/odex25_benefit/odex_benefit/views/benefit_config_view.xml
+++ b/odex25_benefit/odex_benefit/views/benefit_config_view.xml
@@ -956,6 +956,7 @@
                                 <field name="has_employees"/>
                                 <field name="replacement_branch_id" domain="[('has_employees','=',True)]"
                                        attrs="{'invisible':[('has_employees','=',True)],'required':[('has_employees','=',False)]}"/>
+                                <field name="service_producer_id"/>
                             </group>
                         </group>
                     </sheet>
diff --git a/odex25_benefit/odex_benefit/views/benefit_view.xml b/odex25_benefit/odex_benefit/views/benefit_view.xml
index 93cd70f4a..5dbbd358e 100644
--- a/odex25_benefit/odex_benefit/views/benefit_view.xml
+++ b/odex25_benefit/odex_benefit/views/benefit_view.xml
@@ -362,7 +362,7 @@
             <field name="name">grant.benefit.form</field>
             <field name="model">grant.benefit</field>
             <field name="arch" type="xml">
-                <form string="Benefit" create="0">
+                <form string="Benefit" create="1">
                     <header>
                         <button name="action_first_accepted" type="object"
                                 string="First Accept" class="oe_highlight"
@@ -2106,7 +2106,7 @@
             <field name="name">grant.benefit.tree</field>
             <field name="model">grant.benefit</field>
             <field name="arch" type="xml">
-                <tree string=" Benefit" create="0" decoration-danger="decoration_color == 'danger'"
+                <tree string=" Benefit" create="1" decoration-danger="decoration_color == 'danger'"
                       decoration-success="decoration_color == 'success'"
                       decoration-warning="decoration_color == 'warning'"
                       decoration-info="decoration_color == 'info'"
diff --git a/odex25_benefit/odex_benefit/views/family_members.xml b/odex25_benefit/odex_benefit/views/family_members.xml
index 53c0b71a2..74e7ed486 100644
--- a/odex25_benefit/odex_benefit/views/family_members.xml
+++ b/odex25_benefit/odex_benefit/views/family_members.xml
@@ -4,7 +4,7 @@
             <field name="name">family.member.form</field>
             <field name="model">family.member</field>
             <field name="arch" type="xml">
-                <form string="Family Member" create="false">
+                <form string="Family Member" create="1">
                     <header>
                         <!-- Suspend -->
                         <button name="action_suspend" type="object"
@@ -75,7 +75,7 @@
                         <button name="action_exception_final_accept" type="object"
                                 string="Exception Final Approve" class="oe_highlight"
                                 attrs="{'invisible': [('state','not in',['exception_second_approve'])]}"
-                                groups="odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
+                                groups="odex_benefit.group_benefit_manager"/>
                         <button name="action_exception_refuse" type="object"
                                 string="Exception Refuse" class="btn btn-danger"
                                 attrs="{'invisible': ['|',('action_type','!=','exception'),('state', 'not in', ['waiting_approve','first_approve','family_services_manager','exception_second_approve'])]}"
@@ -308,7 +308,8 @@
                                 </group>
                             </page>
                             <page string="Exception"
-                                  attrs="{'invisible': [('action_type','not in',['exception'])]}">
+                                  attrs="{'invisible': ['&amp;', ('action_type', '!=', 'exception'), ('is_excluded_suspension', '!=', True)]}"
+                            >
                                 <group>
                                     <group>
                                         <field name="exception_start_date"/>
@@ -353,7 +354,7 @@
             <field name="name">family.member.tree</field>
             <field name="model">family.member</field>
             <field name="arch" type="xml">
-                <tree string="Family Members" create="false">
+                <tree string="Family Members" create="1">
                     <field name="benefit_code"/>
                     <field name="member_id_number"/>
                     <field name="name" force_save="1"/>
diff --git a/odex25_benefit/odex_benefit/views/service_request.xml b/odex25_benefit/odex_benefit/views/service_request.xml
index b3580f9ce..8b80ed3d0 100644
--- a/odex25_benefit/odex_benefit/views/service_request.xml
+++ b/odex25_benefit/odex_benefit/views/service_request.xml
@@ -180,7 +180,7 @@
                                     class="oe_stat_button"
                                     icon="fa-file-text-o"
                                     type="object"
-                                    attrs="{'invisible': ['|',('total_moves', '=', 0),('payment_order_count','!=','0')]}">
+                                    attrs="{'invisible': ['|',('total_moves', '=', 0),('payment_order_count','!=',0)]}">
                                 <field name="total_moves" widget="statinfo" string="Total Moves"/>
                             </button>
                         </div>
@@ -234,6 +234,7 @@
                             </group>
                             <group>
                                 <field name="available_service_cats" invisible="1"/>
+                                <field name="allowed_product_ids" widget="many2many_tags" invisible="1"/>
                                 <field name="max_limit_period" invisible="1"/>
                                 <field name="payment_method" force_save="1" invisible="1"/>
                                 <field name="service_cat"
@@ -392,14 +393,24 @@
                             <page string="Electrical Devices Service"
                                   attrs="{'invisible':[('service_type', '!=', 'electrical_devices')],'readonly':[('state','not in',['draft','researcher'])]}">
                                 <group>
-                                    <field name="device_id"
-                                           attrs="{'required':[('service_type', '=', 'electrical_devices')]}"/>
-                                    <field name="requested_quantity"
-                                           attrs="{'required':[('service_type', '=', 'electrical_devices')]}"/>
+                                    <field name="device_id" invisible="1"/>
+                                    <field name="requested_quantity" invisible="1"/>
                                     <field name="exception_or_steal" widget="boolean_toggle"/>
                                     <field name="exception_or_steal_attach" widget="many2many_attachment_preview"
                                            attrs="{'invisible':[('exception_or_steal', '=', False)]}"/>
                                 </group>
+                                <group>
+                                    <field name="electrical_device_line_ids" nolabel="1" >
+                                        <tree editable="bottom">
+                                            <field name="product_id" domain="[('id', 'in', parent.allowed_product_ids)]"
+                                                   options="{'no_create': True}"/>
+                                            <field name="device_id" options="{'no_create': True}"/>
+                                            <field name="quantity"/>
+                                            <field name="unit_price" readonly="1" sum="Total"/>
+                                            <field name="subtotal" sum="Total Amount"/>
+                                        </tree>
+                                    </field>
+                                </group>
                             </page>
                             <page string="Home Furnishing Service"
                                   attrs="{'invisible':[('service_type', '!=', 'home_furnishing')]}">
diff --git a/odex25_benefit/odex_benefit/views/services_settings.xml b/odex25_benefit/odex_benefit/views/services_settings.xml
index 745bc7fa6..71882e9c1 100644
--- a/odex25_benefit/odex_benefit/views/services_settings.xml
+++ b/odex25_benefit/odex_benefit/views/services_settings.xml
@@ -171,6 +171,7 @@
                                         <field name="min_count_member"/>
                                         <field name="max_count_member"/>
                                         <field name="device_name"/>
+                                        <field name="product_ids" widget="many2many_tags"/>
                                         <field name="price_unit"/>
                                         <field name="allowed_quantity"/>
                                         <field name="account_id"/>

From 59524b515e30300d783444e467dc1395c66215c3 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Thu, 22 Jan 2026 15:26:00 +0100
Subject: [PATCH 23/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po    | 68 ++++++++++++++++++-
 .../odex_benefit/models/service_request.py    | 36 +++++-----
 2 files changed, 86 insertions(+), 18 deletions(-)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index 08a04cc93..247e92f45 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -9562,6 +9562,7 @@ msgstr "هل الأسرة منتجة؟"
 #: model:ir.model.fields,field_description:odex_benefit.field_receive_appliances_furniture__prod_id
 #: model:ir.model.fields,field_description:odex_benefit.field_receive_benefit_zkat__product_id
 #: model:ir.model.fields,field_description:odex_benefit.field_receive_food_basket__product_id
+#: model:ir.model.fields,field_description:odex_benefit.field_electrical_device_line__product_id
 msgid "Product"
 msgstr "المنتج"
 
@@ -9691,6 +9692,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:odex_benefit.field_service_request__service_qty
 #: model:ir.model.fields,field_description:odex_benefit.field_zkat_line__quantity
 #: model_terms:ir.ui.view,arch_db:odex_benefit.benefit_food_surplus_form
+#: model:ir.model.fields,field_description:odex_benefit.field_electrical_device_line__quantity
 msgid "Quantity"
 msgstr "الكمية"
 
@@ -10734,12 +10736,14 @@ msgid "Service Name"
 msgstr "اسم الخدمة"
 
 #. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_branch_settings__service_producer_id
 #: model:ir.model.fields,field_description:odex_benefit.field_service_request__service_producer_id
 #: model:ir.model.fields,field_description:odex_benefit.field_services_settings__service_producer_id
 msgid "Service Producer"
 msgstr "جهة الدفع"
 
 #. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_electrical_device_line__service_request_id
 #: model:ir.model.fields,field_description:odex_benefit.field_home_furnishing_items__service_request_id
 #: model:ir.model.fields,field_description:odex_benefit.field_service_attachments_settings__service_request_id
 #: model_terms:ir.ui.view,arch_db:odex_benefit.service_request_form
@@ -16344,6 +16348,7 @@ msgid "Electrical Devices Service"
 msgstr "الأجهزة الكهربائية"
 
 #. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_electrical_device_line__device_id
 #: model:ir.model.fields,field_description:odex_benefit.field_service_request__device_id
 msgid "Device"
 msgstr "الجهاز"
@@ -18592,4 +18597,65 @@ msgstr "%s سنة"
 #: code:addons/odex_benefit/models/family_members.py:0
 #, python-format
 msgid "0 days"
-msgstr "0 يوم"
\ No newline at end of file
+msgstr "0 يوم"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/service_request.py:0
+#: model:ir.model,name:odex_benefit.model_electrical_device_line
+#, python-format
+msgid "Electrical Device Line"
+msgstr "جهاز كهربائي"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_electrical_device_line__unit_price
+msgid "Unit Price"
+msgstr "سعر الوحدة"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_electrical_device_line__subtotal
+msgid "Subtotal"
+msgstr "المجموع"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_service_request__electrical_device_line_ids
+#: model:ir.model.fields.selection,name:odex_benefit.selection__services_settings__service_type__electrical_devices
+msgid "Electrical Devices"
+msgstr "أجهزة كهربائية"
+
+#. module: odex_benefit
+#: model:ir.model.fields,field_description:odex_benefit.field_electrical_devices__product_ids
+#: model:ir.model.fields,field_description:odex_benefit.field_service_request__allowed_product_ids
+msgid "Allowed Products"
+msgstr "المنتجات المسموح بها"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/service_request.py:0
+#, python-format
+msgid ""
+"Device '%s': Total quantity in this request (%s) exceeds the allowed limit "
+"of %s units."
+msgstr "الجهاز '%s': إجمالي الكمية في هذا الطلب (%s) يتجاوز الحد المسموح به وهو %s وحدة."
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/service_request.py:0
+#, python-format
+msgid ""
+"Device '%s': You cannot request more than %s units within %s %s. (Previous "
+"requests: %s, Current request: %s, Total: %s)"
+msgstr "الجهاز '%s': لا يمكنك طلب أكثر من %s وحدة خلال %s %s. (الطلبات السابقة: %s، الطلب الحالي: %s، المجموع: %s)"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/service_request.py:0
+#, python-format
+msgid ""
+"Cannot create invoice: the following requests have no electrical device lines:\n"
+"%s\n"
+"All selected requests must contain at least one device line."
+msgstr "لا يمكن إنشاء الفاتورة: الطلبات التالية لا تحتوي على أجهزة كهربائية:\n"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/service_request.py:0
+#, python-format
+msgid "No invoice lines could be created."
+msgstr "لم يتم إنشاء أي بنود في الفاتورة."
+
diff --git a/odex25_benefit/odex_benefit/models/service_request.py b/odex25_benefit/odex_benefit/models/service_request.py
index 36871d8df..3bca6d480 100644
--- a/odex25_benefit/odex_benefit/models/service_request.py
+++ b/odex25_benefit/odex_benefit/models/service_request.py
@@ -993,24 +993,26 @@ class ServiceRequest(models.Model):
                                         raise ValidationError(_(
                                             "Device '%s': Total quantity in this request (%s) exceeds the allowed limit of %s units."
                                         ) % (device.device_name, current_total_qty, allowed_qty))
-                                    domain = base_domain + [
-                                        ('date', '>', date_before),
-                                        ('electrical_device_line_ids.device_id', '=', device_id)
-                                    ]
-                                    existing_requests = Service.search(domain)
-                                    existing_device_lines = existing_requests.mapped(
-                                        'electrical_device_line_ids').filtered(
-                                        lambda l: l.device_id.id == device_id
-                                    )
-                                    total_previous_qty = sum(existing_device_lines.mapped('quantity'))
-                                    total_qty = total_previous_qty + current_total_qty
+                                    if not rec.exception_or_steal:
+                                        domain = base_domain + [
+                                            ('date', '>', date_before),
+                                            ('electrical_device_line_ids.device_id', '=', device_id),
+                                            ('exception_or_steal', '=', False)
+                                        ]
+                                        existing_requests = Service.search(domain)
+                                        existing_device_lines = existing_requests.mapped(
+                                            'electrical_device_line_ids').filtered(
+                                            lambda l: l.device_id.id == device_id
+                                        )
+                                        total_previous_qty = sum(existing_device_lines.mapped('quantity'))
+                                        total_qty = total_previous_qty + current_total_qty
 
-                                    if total_qty > allowed_qty:
-                                        raise ValidationError(_(
-                                            "Device '%s': You cannot request more than %s units within %s %s. "
-                                            "(Previous requests: %s, Current request: %s, Total: %s)"
-                                        ) % (device.device_name, allowed_qty, interval,
-                                             period, total_previous_qty, current_total_qty, total_qty))
+                                        if total_qty > allowed_qty:
+                                            raise ValidationError(_(
+                                                "Device '%s': You cannot request more than %s units within %s %s. "
+                                                "(Previous requests: %s, Current request: %s, Total: %s)"
+                                            ) % (device.device_name, allowed_qty, interval,
+                                                 period, total_previous_qty, current_total_qty, total_qty))
                         else:
                             last_request = Service.search(base_domain, order='date desc', limit=1)
                             if last_request and last_request.date:

From 9d591ddc069c674eec89d2bff8ce0620b1f7cb6e Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Thu, 22 Jan 2026 15:37:13 +0100
Subject: [PATCH 24/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/views/service_request.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_benefit/odex_benefit/views/service_request.xml b/odex25_benefit/odex_benefit/views/service_request.xml
index 8b80ed3d0..35a69272f 100644
--- a/odex25_benefit/odex_benefit/views/service_request.xml
+++ b/odex25_benefit/odex_benefit/views/service_request.xml
@@ -404,7 +404,7 @@
                                         <tree editable="bottom">
                                             <field name="product_id" domain="[('id', 'in', parent.allowed_product_ids)]"
                                                    options="{'no_create': True}"/>
-                                            <field name="device_id" options="{'no_create': True}"/>
+                                            <field name="device_id" invisible="1" options="{'no_create': True}"/>
                                             <field name="quantity"/>
                                             <field name="unit_price" readonly="1" sum="Total"/>
                                             <field name="subtotal" sum="Total Amount"/>

From 0ad6a5f6cb64965b2da4d758998a26d9ad82cbac Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Sun, 25 Jan 2026 10:14:42 +0100
Subject: [PATCH 25/27] [IMP] odex_benefit: IMP benefit

---
 .../odex_benefit/models/account_move_line.py        | 13 ++++++++++++-
 .../odex_benefit/models/family_expense.py           |  2 +-
 odex25_benefit/odex_benefit/views/benefit_view.xml  |  6 ++++--
 .../odex_benefit/views/service_request.xml          |  6 +++---
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/odex25_benefit/odex_benefit/models/account_move_line.py b/odex25_benefit/odex_benefit/models/account_move_line.py
index 3d6114822..3af199d46 100644
--- a/odex25_benefit/odex_benefit/models/account_move_line.py
+++ b/odex25_benefit/odex_benefit/models/account_move_line.py
@@ -49,4 +49,15 @@ class AccountMove(models.Model):
             'domain': [('id', 'in', attachment_ids)],
             'context': ctx,
             'target': 'current',
-        }
\ No newline at end of file
+        }
+
+    def _get_name_invoice_report(self):
+        self.ensure_one()
+        has_benefit_family = any(
+            line.benefit_family_id or line.family_confirm_id
+            for line in self.invoice_line_ids
+        )
+
+        if has_benefit_family or self.benefit_family_ids or self.family_confirm_id:
+            return 'account.report_invoice_document'
+        return super()._get_name_invoice_report()
\ No newline at end of file
diff --git a/odex25_benefit/odex_benefit/models/family_expense.py b/odex25_benefit/odex_benefit/models/family_expense.py
index 60aa7655c..ed094b80d 100644
--- a/odex25_benefit/odex_benefit/models/family_expense.py
+++ b/odex25_benefit/odex_benefit/models/family_expense.py
@@ -273,7 +273,7 @@ class ConfirmBenefitExpense(models.Model):
                 # Define base domain for family selection
 
                 base_domain = ['|', ('state', '=', 'second_approve'), '&',
-                               ('state', 'in', ('waiting_approve', 'first_approve')), ('action_type', '=', 'suspended')]
+                               ('state', 'not in', ('temporary_suspended', 'suspended_second_approve')), ('action_type', '=', 'suspended')]
                 if rec.branch_custom_ids:
                     base_domain.append(('branch_custom_id', 'in', rec.branch_custom_ids.ids))
                 min_income = validation_setting.benefit_category_ids.mapped('mini_income_amount')
diff --git a/odex25_benefit/odex_benefit/views/benefit_view.xml b/odex25_benefit/odex_benefit/views/benefit_view.xml
index 5dbbd358e..5a6131ce0 100644
--- a/odex25_benefit/odex_benefit/views/benefit_view.xml
+++ b/odex25_benefit/odex_benefit/views/benefit_view.xml
@@ -1251,7 +1251,8 @@
                                                            attrs="{'invisible':[('is_mother','=',False)],'required':[('is_mother','=',True)]}"/>
                                                     <field name="mother_family_name" force_save="1"
                                                            attrs="{'invisible':[('is_mother','=',False)],'required':[('is_mother','=',True)]}"/>
-                                                    <field name="age" required="1"/>
+                                                    <field name="age" invisible="1"/>
+                                                    <field name="full_age" force_save="1"/>
                                                     <field name="age_status"
                                                            attrs="{'invisible':[('relationn_type','not in',('son','daughter'))]}"/>
                                                     <field name="member_id_number" required="1"/>
@@ -1428,7 +1429,8 @@
                                     <tree string="Family Members">
                                         <field name="name" force_save="1"/>
                                         <field name="relationn"/>
-                                        <field name="age"/>
+                                        <field name="age" optional="hide"/>
+                                        <field name="full_age"/>
                                         <field name="member_location_conf"/>
                                         <field name="education_status"/>
                                         <field name="last_education_levels" optional="hide"/>
diff --git a/odex25_benefit/odex_benefit/views/service_request.xml b/odex25_benefit/odex_benefit/views/service_request.xml
index 35a69272f..bd30a7539 100644
--- a/odex25_benefit/odex_benefit/views/service_request.xml
+++ b/odex25_benefit/odex_benefit/views/service_request.xml
@@ -152,16 +152,16 @@
                                 string="Beneficiary Approve" class="oe_highlight"
                                 confirm="Are you sure you want to approve  ?"
                                 states="gm_assistant"
-                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"/>
+                                groups="odex_benefit.group_benefit_manager"/>
                         <button name="action_first_refuse" type="object"
                                 string="Return the request to the specialist" class="btn btn-warning"
                                 states="gm_assistant"
-                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
+                                groups="odex_benefit.group_benefit_manager"
                         />
                         <button name="action_refuse" type="object"
                                 string="Refuse" class="btn btn-danger"
                                 states="gm_assistant"
-                                groups="odex_benefit.group_benefit_branch_manager,odex_benefit.group_benefit_manager,odex_benefit.group_family_services_manager"
+                                groups="odex_benefit.group_benefit_manager"
                         />
                         <field name="state" widget="statusbar"
                                statusbar_visible="draft,researcher,waiting_approve,first_approve,accounting_approve,send_request_to_supplier,family_received_device,refused"/>

From 03a51194839ee3911ebbb83c21a1c8fb1cfb9361 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Sun, 25 Jan 2026 12:48:03 +0100
Subject: [PATCH 26/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po    | 15 ----
 .../odex_benefit/models/service_request.py    | 81 ++++++++++++-------
 .../odex_benefit/security/ir.model.access.csv |  5 ++
 .../odex_benefit/security/security_view.xml   | 16 ++--
 4 files changed, 68 insertions(+), 49 deletions(-)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index 247e92f45..5dd6806b3 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -18644,18 +18644,3 @@ msgid ""
 "requests: %s, Current request: %s, Total: %s)"
 msgstr "الجهاز '%s': لا يمكنك طلب أكثر من %s وحدة خلال %s %s. (الطلبات السابقة: %s، الطلب الحالي: %s، المجموع: %s)"
 
-#. module: odex_benefit
-#: code:addons/odex_benefit/models/service_request.py:0
-#, python-format
-msgid ""
-"Cannot create invoice: the following requests have no electrical device lines:\n"
-"%s\n"
-"All selected requests must contain at least one device line."
-msgstr "لا يمكن إنشاء الفاتورة: الطلبات التالية لا تحتوي على أجهزة كهربائية:\n"
-
-#. module: odex_benefit
-#: code:addons/odex_benefit/models/service_request.py:0
-#, python-format
-msgid "No invoice lines could be created."
-msgstr "لم يتم إنشاء أي بنود في الفاتورة."
-
diff --git a/odex25_benefit/odex_benefit/models/service_request.py b/odex25_benefit/odex_benefit/models/service_request.py
index 3bca6d480..ff2b9856c 100644
--- a/odex25_benefit/odex_benefit/models/service_request.py
+++ b/odex25_benefit/odex_benefit/models/service_request.py
@@ -1276,47 +1276,70 @@ class ServiceRequest(models.Model):
                     "• Not be linked to any invoice"
                 ) % names)
 
-            empty_requests = self.filtered(lambda r: not r.electrical_device_line_ids)
-            if empty_requests:
-                names = ", ".join(empty_requests.mapped('name'))
-                raise UserError(_(
-                    "Cannot create invoice: the following requests have no electrical device lines:\n%s\n"
-                    "All selected requests must contain at least one device line."
-                ) % names)
 
             for rec in self:
-                line_ids = []
-                for line in rec.electrical_device_line_ids:
-                    invoice_line_vals = {
-                        'name': rec.name or _('Electrical Device Line'),
-                        'product_id': line.product_id.id or False,
-                        'account_id': line.device_id.account_id.id or False,
-                        'analytic_account_id': (
-                            rec.family_id.branch_family_id.branch.analytic_account_id.id
-                            if rec.family_id.branch_family_id
-                               and rec.family_id.branch_family_id.branch
-                               and rec.family_id.branch_family_id.branch.analytic_account_id
-                            else False
-                        ),
-                        'quantity': line.quantity,
-                        'price_unit': line.unit_price,
-                        'benefit_family_id': rec.family_id.id,
-                    }
-                    line_ids.append((0, 0, invoice_line_vals))
-
-                if not line_ids:
-                    raise UserError(_("No invoice lines could be created."))
+                invoice_lines = rec._prepare_invoice_lines()
+                if not invoice_lines:
+                    raise UserError(_(
+                        "Cannot create invoice for request '%s': No invoice lines could be created."
+                    ) % rec.name)
                 vendor_bill = self.env['account.move'].create({
                     'move_type': 'in_invoice',
                     'partner_id': rec.service_producer_id.id,
                     'partner_shipping_id': rec.family_id.partner_id.id,
                     'journal_id': validation_setting.journal_id.id,
                     # 'accountant_id': self.accountant_id.id,
-                    'invoice_line_ids': line_ids,
+                    'invoice_line_ids': invoice_lines,
                     'ref': rec.name or False,
                 })
                 rec.vendor_bill = vendor_bill
 
+    def _prepare_invoice_lines(self):
+        self.ensure_one()
+        line_ids = []
+        if self.service_type == 'electrical_devices':
+            if not self.electrical_device_line_ids:
+                return line_ids
+
+            for line in self.electrical_device_line_ids:
+                line_ids.append((0, 0, {
+                    'name': self.name or _('Electrical Device Line'),
+                    'product_id': line.product_id.id or False,
+                    'account_id': line.device_id.account_id.id or False,
+                    'analytic_account_id': self._get_analytic_account_id(),
+                    'quantity': line.quantity,
+                    'price_unit': line.unit_price,
+                    'benefit_family_id': self.family_id.id,
+                }))
+        else:
+            description_parts = []
+            if self.family_id and self.family_id.name:
+                description_parts.append(self.family_id.name)
+            if self.description:
+                description_parts.append(self.description)
+            if self.name:
+                description_parts.append(self.name)
+
+            line_name = '/'.join(description_parts) if description_parts else _('Service')
+            line_ids.append((0, 0, {
+                'name': line_name,
+                'account_id': self.account_id.id or False,
+                'analytic_account_id': self._get_analytic_account_id(),
+                'quantity': self.service_qty or 1,
+                'price_unit': self.requested_service_amount,
+                'benefit_family_id': self.family_id.id,
+            }))
+
+        return line_ids
+
+    def _get_analytic_account_id(self):
+        self.ensure_one()
+        if (self.family_id.branch_family_id and
+                self.family_id.branch_family_id.branch and
+                self.family_id.branch_family_id.branch.analytic_account_id):
+            return self.family_id.branch_family_id.branch.analytic_account_id.id
+        return False
+
     def _get_total_move_lines(self):
         for rec in self:
             if self.service_cat.payment_method == "payment_order":
diff --git a/odex25_benefit/odex_benefit/security/ir.model.access.csv b/odex25_benefit/odex_benefit/security/ir.model.access.csv
index 11cf3b686..5476cb3d2 100644
--- a/odex25_benefit/odex_benefit/security/ir.model.access.csv
+++ b/odex25_benefit/odex_benefit/security/ir.model.access.csv
@@ -4,6 +4,7 @@ access_benefit_woman_commitee_record,access_benefit_record,model_grant_benefit,o
 access_benefit_branch_manager_record,access_benefit_branch_manager_record,model_grant_benefit,odex_benefit.group_benefit_branch_manager,1,1,0,1
 access_benefit_manager_record,access_benefit_manager_record,model_grant_benefit,odex_benefit.group_benefit_manager,1,1,1,1
 access_benefit_family_services_manager,access_benefit_family_services_manager,model_grant_benefit,odex_benefit.group_family_services_manager,1,1,1,1
+access_benefit_family_services_department_manager,access_benefit_family_services_department_manager,model_grant_benefit,odex_benefit.group_family_services_department_manager,1,1,1,1
 access_education_status_all,education_status,model_education_status,odex_benefit.group_benefit_info,1,1,1,1
 access_education_status_all_users,education_status_all_users,model_education_status,,1,0,0,0
 access_weak_course_all,weak_course,model_weak_course,odex_benefit.group_benefit_info,1,1,1,1
@@ -126,6 +127,8 @@ access_suspend_reason,access_suspend_reason,model_suspend_reason,,1,0,0,0
 access_suspend_reason_settings,access_suspend_reason_settings,model_suspend_reason,odex_benefit.group_benefit_settings,1,1,1,1
 access_suspend_reason_wizard,access_suspend_reason_wizard,model_suspend_reason_wizard,,1,1,1,1
 access_expense_family_services_manager,access_expense_family_services_manager,model_confirm_benefit_expense,odex_benefit.group_family_services_manager,1,1,1,1
+access_expense_family_services_department_manager,access_expense_family_services_department_manager,model_confirm_benefit_expense,odex_benefit.group_family_services_department_manager,1,1,1,1
+
 access_expense_benefit_manager,access_expense_benefit_manager,model_confirm_benefit_expense,odex_benefit.group_benefit_manager,1,1,1,1
 access_expense_researcher,access_expense_researcher,model_confirm_benefit_expense,odex_benefit.group_benefit_info,1,0,0,0
 access_branch_settings,access_branch_settings,model_branch_settings,base.group_user,1,0,0,0
@@ -154,6 +157,7 @@ access_exception_reason,access_exception_reason,model_exception_reason,base.grou
 access_exception_reason_settings,access_exception_reason_settings,model_exception_reason,odex_benefit.group_benefit_settings,1,1,1,1
 access_service_request,access_service_request,model_service_request,base.group_user,1,1,1,1
 access_seasonal_service_family_services_manager,access_seasonal_service_family_services_manager,model_seasonal_service,odex_benefit.group_family_services_manager,1,1,1,1
+access_seasonal_service_family_services_department_manager,access_seasonal_service_family_services_department_manager,model_seasonal_service,odex_benefit.group_family_services_department_manager,1,1,1,1
 access_seasonal_service_benefit_manager,access_seasonal_service_benefit_manager,model_seasonal_service,odex_benefit.group_benefit_manager,1,1,1,1
 access_seasonal_service_researcher,access_seasonal_service_researcher,model_seasonal_service,odex_benefit.group_benefit_info,1,0,0,0
 access_marital_status,access_marital_status,model_marital_status,base.group_user,1,0,0,0
@@ -192,6 +196,7 @@ access_survey_user_input_line_group_benefit_info,survey.user_input.line.group_be
 access_grant_benefit_account_move_line,access_grant_benefit_account_move_line,model_account_move_line,odex_benefit.group_benefit_info,1,0,0,0
 access_grant_benefit_account_move,access_grant_benefit_account_move,model_account_move,odex_benefit.group_benefit_info,1,0,0,0
 access_expense_line_family_services_manager,access_expense_line_family_services_manager,model_benefit_expense_line,odex_benefit.group_family_services_manager,1,1,1,1
+access_expense_line_family_services_department_manager,access_expense_line_family_services_department_manager,model_benefit_expense_line,odex_benefit.group_family_services_department_manager,1,1,1,1
 access_expense_line_benefit_manager,access_expense_line_benefit_manager,model_benefit_expense_line,odex_benefit.group_benefit_manager,1,1,1,1
 access_expense_researcher,access_expense_researcher,model_benefit_expense_line,odex_benefit.group_benefit_info,1,1,0,0
 access_expense_line_payment_accountant_accept,access_expense_line_payment_accountant_accept,model_benefit_expense_line,odex_benefit.group_benefit_payment_accountant_accept,1,1,0,0
diff --git a/odex25_benefit/odex_benefit/security/security_view.xml b/odex25_benefit/odex_benefit/security/security_view.xml
index 6ce2284f4..e4d43313e 100644
--- a/odex25_benefit/odex_benefit/security/security_view.xml
+++ b/odex25_benefit/odex_benefit/security/security_view.xml
@@ -115,6 +115,12 @@
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
+        <record id="group_family_services_department_manager" model="res.groups">
+            <field name="name">Family Services Department Manager</field>
+            <field name="category_id" ref="module_category_benefit"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
+
         <record id="group_service_legal_department" model="res.groups">
             <field name="name">Services - Legal Department</field>
             <field name="category_id" ref="module_category_benefit"/>
@@ -138,7 +144,7 @@
             <field name="name">Show All Benefits Profiles</field>
             <field name="model_id" ref="model_grant_benefit"/>
             <field name="domain_force">[(1, '=', 1)]</field>
-            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager'))]"/>
+            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager')),(4, ref('group_family_services_department_manager'))]"/>
             <field name="active" eval="True" />
         </record>
 
@@ -171,7 +177,7 @@
             <field name="name">Show All Visit Location</field>
             <field name="model_id" ref="model_visit_location"/>
             <field name="domain_force">[(1, '=', 1)]</field>
-            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager'))]"/>
+            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager')),(4, ref('group_family_services_department_manager'))]"/>
             <field name="active" eval="True" />
         </record>
 
@@ -220,7 +226,7 @@
             <field name="name">Show All Family Complaints</field>
             <field name="model_id" ref="model_family_complaints"/>
             <field name="domain_force">[(1, '=', 1)]</field>
-            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager'))]"/>
+            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager')),(4, ref('group_family_services_department_manager'))]"/>
             <field name="active" eval="True" />
         </record>
 
@@ -300,7 +306,7 @@
             <field name="name">Show All Family Members</field>
             <field name="model_id" ref="model_family_member"/>
             <field name="domain_force">[(1, '=', 1)]</field>
-            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager'))]"/>
+            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager')),(4, ref('group_family_services_department_manager'))]"/>
             <field name="active" eval="True" />
         </record>
 
@@ -344,7 +350,7 @@
             <field name="name">Show All Bank Return Line</field>
             <field name="model_id" ref="model_benefit_expense_line"/>
             <field name="domain_force">[(1, '=', 1)]</field>
-            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager'))]"/>
+            <field name="groups" eval="[(4, ref('group_benefit_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_family_services_manager')),(4, ref('group_family_services_department_manager'))]"/>
             <field name="active" eval="True" />
         </record>
 

From 577a79428075cc09182eda2a080453f76f215f81 Mon Sep 17 00:00:00 2001
From: younes <Y.Ketfi_cherif@exp-sa.com>
Date: Sun, 25 Jan 2026 12:55:16 +0100
Subject: [PATCH 27/27] [IMP] odex_benefit: IMP benefit

---
 odex25_benefit/odex_benefit/i18n/ar_001.po | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/odex25_benefit/odex_benefit/i18n/ar_001.po b/odex25_benefit/odex_benefit/i18n/ar_001.po
index 5dd6806b3..34f5ebd3e 100644
--- a/odex25_benefit/odex_benefit/i18n/ar_001.po
+++ b/odex25_benefit/odex_benefit/i18n/ar_001.po
@@ -10693,8 +10693,10 @@ msgid "Seo name"
 msgstr "اسم محسنات محرك البحث "
 
 #. module: odex_benefit
+#: code:addons/odex_benefit/models/service_request.py:0
 #: model:ir.model.fields,field_description:odex_benefit.field_service_attachments_settings__service_id
 #: model:ir.model.fields.selection,name:odex_benefit.selection__main_service__service_type__service
+#, python-format
 msgid "Service"
 msgstr "خدمة"
 
@@ -18644,3 +18646,14 @@ msgid ""
 "requests: %s, Current request: %s, Total: %s)"
 msgstr "الجهاز '%s': لا يمكنك طلب أكثر من %s وحدة خلال %s %s. (الطلبات السابقة: %s، الطلب الحالي: %s، المجموع: %s)"
 
+#. module: odex_benefit
+#: model:res.groups,name:odex_benefit.group_family_services_department_manager
+msgid "Family Services Department Manager"
+msgstr "مدير قسم الخدمات الاسرية"
+
+#. module: odex_benefit
+#: code:addons/odex_benefit/models/service_request.py:0
+#, python-format
+msgid ""
+"Cannot create invoice for request '%s': No invoice lines could be created."
+msgstr "لا يمكن إنشاء فاتورة للطلب '%s': لم يتم إنشاء أي بنود في الفاتورة."
\ No newline at end of file