diff --git a/odex25_benefit/odex_benefit/models/service_request.py b/odex25_benefit/odex_benefit/models/service_request.py
index 4c3bc0f8c..f5de0d448 100644
--- a/odex25_benefit/odex_benefit/models/service_request.py
+++ b/odex25_benefit/odex_benefit/models/service_request.py
@@ -92,8 +92,7 @@ class ServiceRequest(models.Model):
compute="_compute_account_id"
)
device_account_id = fields.Many2one('account.account', string='Expenses Account', related='device_id.account_id')
- accountant_id = fields.Many2one('res.users', string='Accountant', related='service_cat.accountant_id',
- readonly=False)
+ accountant_id = fields.Many2one('res.users', string='Accountant', related='service_cat.accountant_id', store=True)
service_producer_id = fields.Many2one('res.partner', string='Service Producer', )
is_service_producer = fields.Boolean(string='Is Service Producer?', related='service_cat.is_service_producer')
# maintenance_items_id = fields.Many2one('home.maintenance.lines', string="Maintenance Items")
@@ -213,7 +212,8 @@ class ServiceRequest(models.Model):
required_docs = self.attachment_lines.filtered(lambda l: l.state == current_state)
missing_docs = required_docs.filtered(lambda l: not l.service_attach)
if missing_docs:
- missing_names = ", ".join(missing_docs.mapped('name'))
+ #missing_names = ", ".join(missing_docs.mapped('name'))
+ missing_names = ", ".join([doc.name for doc in missing_docs if doc.name])
raise UserError(
_("Cannot proceed with approval. The following required documents for status '%(status)s' are missing: %(missing)s") % {
'status': dict(self._fields['state'].selection).get(current_state, current_state),
@@ -525,7 +525,7 @@ class ServiceRequest(models.Model):
def _get_rent_for_alternative_housing(self):
for rec in self:
if rec.service_cat.service_type == 'alternative_housing':
- rec.rent_for_alternative_housing = self.env['services.settings'].sudo().search([('service_type', '=', 'rent')],
+ rec.rent_for_alternative_housing = self.env['services.settings'].search([('service_type', '=', 'rent')],
limit=1).id
else:
rec.rent_for_alternative_housing = False
diff --git a/odex25_benefit/odex_benefit/views/service_request.xml b/odex25_benefit/odex_benefit/views/service_request.xml
index eb37c503a..56b3eff22 100644
--- a/odex25_benefit/odex_benefit/views/service_request.xml
+++ b/odex25_benefit/odex_benefit/views/service_request.xml
@@ -319,7 +319,7 @@
-
+