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] [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"/>