diff --git a/odex25_benefit/odex25_program_activity/__manifest__.py b/odex25_benefit/odex25_program_activity/__manifest__.py
index fcc41be23..ba2a7dfed 100644
--- a/odex25_benefit/odex25_program_activity/__manifest__.py
+++ b/odex25_benefit/odex25_program_activity/__manifest__.py
@@ -4,7 +4,7 @@
'author': 'Expert Co. Ltd.',
'website': 'http://exp-sa.com',
'category': 'Odex25-Ensan activity',
- 'depends': ['mail','odex_benefit'],
+ 'depends': ['mail','odex_takaful'],
'data': [
'security/security.xml',
'security/ir.model.access.csv',
diff --git a/odex25_benefit/odex_benefit/models/benefit.py b/odex25_benefit/odex_benefit/models/benefit.py
index c7416e259..7b322de6a 100644
--- a/odex25_benefit/odex_benefit/models/benefit.py
+++ b/odex25_benefit/odex_benefit/models/benefit.py
@@ -976,8 +976,7 @@ class GrantBenefitProfile(models.Model):
def _get_total_seasonal_service_requests(self):
for rec in self:
- #rec.total_seasonal_service_requests = len(self.env['seasonal.service'].search([('service_requests_ids', '!=', False)]).filtered(lambda r: rec.id in r.service_requests_ids.family_id.ids))
- rec.total_seasonal_service_requests = 1
+ rec.total_seasonal_service_requests = len(self.env['seasonal.service'].search([('service_requests_ids', '!=', False)]).filtered(lambda r: rec.id in r.service_requests_ids.family_id.ids))
def action_open_related_seasonal_service_requests(self):
""" Opens a tree view with related records filtered by a dynamic domain """
diff --git a/odex25_benefit/odex_benefit/security/ir.model.access.csv b/odex25_benefit/odex_benefit/security/ir.model.access.csv
index 57fedfe01..c165668fb 100644
--- a/odex25_benefit/odex_benefit/security/ir.model.access.csv
+++ b/odex25_benefit/odex_benefit/security/ir.model.access.csv
@@ -132,7 +132,8 @@ access_diseases_settings,access_diseases_settings,model_diseases_settings,base.g
access_exception_wizard,access_exception_wizard,model_exception_wizard,base.group_user,1,1,1,1
access_exception_reason,access_exception_reason,model_exception_reason,base.group_user,1,1,1,1
access_service_request,access_service_request,model_service_request,base.group_user,1,1,1,1
-access_seasonal_service,access_seasonal_services,model_seasonal_service,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_benefit_manager,access_seasonal_service_benefit_manager,model_seasonal_service,odex_benefit.group_benefit_manager,1,1,1,1
access_marital_status,access_marital_status,model_marital_status,base.group_user,1,1,1,1
access_service_attachments_settings,access_service_attachments_settings,model_service_attachments_settings,base.group_user,1,1,1,1
access_category_amount_line,access_category_amount_line,model_category_amount_line,base.group_user,1,1,1,1
@@ -165,7 +166,8 @@ access_survey_user_input_group_benefit_info,survey.user_input.group_benefit_info
access_survey_user_input_line_group_benefit_info,survey.user_input.line.group_benefit_info,survey.model_survey_user_input_line,odex_benefit.group_benefit_info,1,0,0,0
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_benefit_expense_line,access_benefit_expense_line,model_benefit_expense_line,base.group_user,1,1,1,1
+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_benefit_manager,access_expense_line_benefit_manager,model_benefit_expense_line,odex_benefit.group_benefit_manager,1,1,1,1
access_family_bank_report_wizard,access_family_bank_report_wizard,model_family_bank_report_wizard,base.group_user,1,1,1,1
access_return_reason,access_return_reason,model_return_reason,base.group_user,1,1,1,1
access_return_reason_wizard,access_return_reason_wizard,model_return_reason_wizard,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/odex25_benefit/odex_benefit/views/actions_and_menus.xml b/odex25_benefit/odex_benefit/views/actions_and_menus.xml
index 04d12e363..af89785a4 100644
--- a/odex25_benefit/odex_benefit/views/actions_and_menus.xml
+++ b/odex25_benefit/odex_benefit/views/actions_and_menus.xml
@@ -1054,7 +1054,7 @@
-