diff --git a/odex25_benefit/odex_benefit/models/benefit.py b/odex25_benefit/odex_benefit/models/benefit.py index 4a8f20328..84d12b33c 100644 --- a/odex25_benefit/odex_benefit/models/benefit.py +++ b/odex25_benefit/odex_benefit/models/benefit.py @@ -828,7 +828,7 @@ class GrantBenefitProfile(models.Model): def get_attached_domain(self): visit_location = self.env['visit.location'].search([('benefit_id', '=', self.id)]).ids - service_requests = self.env['service.request'].search([('benefit_type', '=', 'family'),('family_id', '=', self.id)]).ids + service_requests = self.env['service.request'].search([('family_id', '=', self.id)]).ids family_complaints = self.env['family.complaints'].search([('family_id', '=', self.id)]).ids hobby_ids = self.member_ids.mapped('hobbies_ids').ids member_education_status_ids = self.member_ids.mapped('member_education_status_ids').ids @@ -958,14 +958,11 @@ class GrantBenefitProfile(models.Model): def _get_total_service_requests(self): for rec in self: - rec.total_service_requests = self.env['service.request'].search_count([('benefit_type', '=', 'family'), ('family_id', '=', rec.id)]) + rec.total_service_requests = self.env['service.request'].search_count([('family_id', '=', rec.id),('is_seasonal','=',False)]) def action_open_related_service_requests(self): """ Opens a tree view with related records filtered by a dynamic domain """ - service_requests = self.env['service.request'].search([ - ('benefit_type', '=', 'family'), - ('family_id', '=', self.id) - ]).ids + service_requests = self.env['service.request'].search([('family_id', '=', self.id),('is_seasonal','=',False)]).ids action = { 'type': 'ir.actions.act_window', @@ -979,16 +976,16 @@ 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 = len(self.env['service.request'].search([('family_id', '=', self.id), ('is_seasonal', '=', True)])) def action_open_related_seasonal_service_requests(self): """ Opens a tree view with related records filtered by a dynamic domain """ - seasonal_service_requests = self.env['seasonal.service'].search([('service_requests_ids', '!=', False)]).filtered(lambda r: self.id in r.service_requests_ids.family_id.ids).ids + seasonal_service_requests = self.env['service.request'].search([('family_id', '=', self.id), ('is_seasonal', '=', True)]).ids action = { 'type': 'ir.actions.act_window', 'name': _('Seasonal Service Requests'), - 'res_model': 'seasonal.service', + 'res_model': 'service.request', 'view_mode': 'tree,form', 'domain': [('id', 'in', seasonal_service_requests)], 'target': 'current',