diff --git a/addons/event/models/event_event.py b/addons/event/models/event_event.py index 496db204dc8..1028b512fa1 100644 --- a/addons/event/models/event_event.py +++ b/addons/event/models/event_event.py @@ -131,22 +131,22 @@ class EventEvent(models.Model): legend_normal = fields.Char(related='stage_id.legend_normal', string='Kanban Ongoing Explanation', readonly=True) # Seats and computation seats_max = fields.Integer( - string='Maximum Attendees Number', + string='Maximum Attendees', compute='_compute_seats_max', readonly=False, store=True, help="For each event you can define a maximum registration of seats(number of attendees), above this numbers the registrations are not accepted.") - seats_limited = fields.Boolean('Maximum Attendees', required=True, compute='_compute_seats_limited', + seats_limited = fields.Boolean('Limit Attendees', required=True, compute='_compute_seats_limited', readonly=False, store=True) seats_reserved = fields.Integer( - string='Reserved Seats', + string='Number of Registrations', store=True, readonly=True, compute='_compute_seats') seats_available = fields.Integer( string='Available Seats', store=True, readonly=True, compute='_compute_seats') seats_unconfirmed = fields.Integer( - string='Unconfirmed Seat Reservations', + string='Unconfirmed Registrations', store=True, readonly=True, compute='_compute_seats') seats_used = fields.Integer( - string='Number of Participants', + string='Number of Attendees', store=True, readonly=True, compute='_compute_seats') seats_expected = fields.Integer( string='Number of Expected Attendees', diff --git a/addons/event/models/event_ticket.py b/addons/event/models/event_ticket.py index b4852a1e56f..61ef734e96c 100644 --- a/addons/event/models/event_ticket.py +++ b/addons/event/models/event_ticket.py @@ -19,10 +19,10 @@ class EventTemplateTicket(models.Model): event_type_id = fields.Many2one( 'event.type', string='Event Category', ondelete='cascade', required=True) # seats - seats_limited = fields.Boolean(string='Seats Limit', readonly=True, store=True, + seats_limited = fields.Boolean(string='Limit Attendees', readonly=True, store=True, compute='_compute_seats_limited') seats_max = fields.Integer( - string='Maximum Seats', + string='Maximum Attendees', help="Define the number of available tickets. If you have too many registrations you will " "not be able to sell tickets anymore. Set 0 to ignore this rule set as unlimited.") diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml index 96f24a78545..712a6d2b174 100644 --- a/addons/event/views/event_views.xml +++ b/addons/event/views/event_views.xml @@ -63,10 +63,16 @@ - - -
- + +
@@ -246,10 +252,14 @@ - @@ -408,8 +418,6 @@ - - @@ -672,8 +680,6 @@ - - diff --git a/addons/event_booth/views/event_booth_category_views.xml b/addons/event_booth/views/event_booth_category_views.xml index d9756862466..e05b84a1e43 100644 --- a/addons/event_booth/views/event_booth_category_views.xml +++ b/addons/event_booth/views/event_booth_category_views.xml @@ -18,7 +18,7 @@ - + diff --git a/addons/website_event/views/event_event_views.xml b/addons/website_event/views/event_event_views.xml index 42736b97e1d..7d9b1382bf6 100644 --- a/addons/website_event/views/event_event_views.xml +++ b/addons/website_event/views/event_event_views.xml @@ -42,4 +42,15 @@ + + event.event.search.inherit.website + event.event + + + + + + + + diff --git a/addons/website_event/views/event_templates_list.xml b/addons/website_event/views/event_templates_list.xml index da531318bb7..0ba22217e57 100644 --- a/addons/website_event/views/event_templates_list.xml +++ b/addons/website_event/views/event_templates_list.xml @@ -261,14 +261,14 @@
About us
-

Use this paragrah to write a short text about your events or company.

+

Use this paragraph to write a short text about your events or company.

-