diff --git a/addons/web/models/ir_qweb_fields.py b/addons/web/models/ir_qweb_fields.py index 57f39c7a404..f3625e9f967 100644 --- a/addons/web/models/ir_qweb_fields.py +++ b/addons/web/models/ir_qweb_fields.py @@ -45,7 +45,7 @@ class Image(models.AbstractModel): filename = options['filename'] else: filename = record.display_name - filename = filename.replace('/', '-').replace('\\', '-').replace('..', '--') + filename = (filename or 'name').replace('/', '-').replace('\\', '-').replace('..', '--') src = '/web/image/%s/%s/%s%s/%s?unique=%s' % (record._name, record.id, options.get('preview_image', field_name), max_size, url_quote(filename), sha) diff --git a/addons/website_event_booth_exhibitor/models/event_booth.py b/addons/website_event_booth_exhibitor/models/event_booth.py index 8e9d7f99381..48bac22fe6e 100644 --- a/addons/website_event_booth_exhibitor/models/event_booth.py +++ b/addons/website_event_booth_exhibitor/models/event_booth.py @@ -40,6 +40,9 @@ class EventBooth(models.Model): 'partner_id': self.partner_id.id, **{key.partition('sponsor_')[2]: value for key, value in vals.items() if key.startswith('sponsor_')}, } + # If confirmed from backend, we don't have _prepare_booth_registration_values + if not values.get('name'): + values['name'] = self.partner_id.name if self.booth_category_id.exhibitor_type == 'online': values.update({ 'room_name': 'odoo-exhibitor-%s' % self.partner_id.name, diff --git a/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml b/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml index ee237d93b16..843c17d2862 100644 --- a/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml +++ b/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml @@ -100,10 +100,10 @@
- - + +
diff --git a/addons/website_event_exhibitor/views/event_templates_sponsor.xml b/addons/website_event_exhibitor/views/event_templates_sponsor.xml index 8919bab350e..eae65320af8 100644 --- a/addons/website_event_exhibitor/views/event_templates_sponsor.xml +++ b/addons/website_event_exhibitor/views/event_templates_sponsor.xml @@ -30,7 +30,7 @@