diff --git a/odex25_benefit/odex_benefit/models/benefit.py b/odex25_benefit/odex_benefit/models/benefit.py index 7b322de6a..98aebe0d1 100644 --- a/odex25_benefit/odex_benefit/models/benefit.py +++ b/odex25_benefit/odex_benefit/models/benefit.py @@ -892,7 +892,7 @@ class GrantBenefitProfile(models.Model): def _get_total_move_lines(self): for rec in self: - move_lines = self.env['account.move.line'].search([('benefit_family_id', '=', rec.id)]) + move_lines = self.env['account.move.line'].search([('benefit_family_id', '=', rec.id),('family_confirm_id','!=', False)]) rec.total_move_lines = sum(move_lines.mapped('debit')) - sum(move_lines.mapped('credit')) def _compute_visit_location_count(self): @@ -927,7 +927,7 @@ class GrantBenefitProfile(models.Model): def action_open_related_move_line_records(self): """ Opens a tree view with related records filtered by a dynamic domain """ move_lines = self.env['account.move.line'].search([ - ('benefit_family_id', '=', self.id) + ('benefit_family_id', '=', self.id),('family_confirm_id','!=', False) ]).ids action = { diff --git a/odex25_benefit/odex_benefit/models/family_expense.py b/odex25_benefit/odex_benefit/models/family_expense.py index 51ddcc36b..9dc808119 100644 --- a/odex25_benefit/odex_benefit/models/family_expense.py +++ b/odex25_benefit/odex_benefit/models/family_expense.py @@ -385,6 +385,7 @@ class ConfirmBenefitExpense(models.Model): 'quantity': 1, 'benefit_family_id': family.id, 'price_unit': line.family_monthly_othaime, + 'family_confirm_id': rec.id, 'analytic_account_id': family.branch_family_id.branch.analytic_account_id.id })) invoice_vals = { diff --git a/odex25_benefit/odex_benefit/security/ir.model.access.csv b/odex25_benefit/odex_benefit/security/ir.model.access.csv index e37d7e872..d5036e1ec 100644 --- a/odex25_benefit/odex_benefit/security/ir.model.access.csv +++ b/odex25_benefit/odex_benefit/security/ir.model.access.csv @@ -116,6 +116,7 @@ access_suspend_reason,access_suspend_reason,model_suspend_reason,,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_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,1,1,1 access_services_settings,access_services_settings,model_services_settings,base.group_user,1,1,1,1 access_rent_lines,access_rent_lines,model_rent_lines,base.group_user,1,1,1,1 @@ -134,6 +135,7 @@ access_exception_reason,access_exception_reason,model_exception_reason,base.grou 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_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,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 @@ -167,6 +169,7 @@ access_grant_benefit_account_move_line,access_grant_benefit_account_move_line,mo 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_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,0,0,0 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