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)]}"/>
-
+
+
@@ -1428,7 +1429,8 @@
-
+
+
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"/>