diff --git a/addons/event/models/event_registration.py b/addons/event/models/event_registration.py index 3f13a2917c9..d1cadb4c8c5 100644 --- a/addons/event/models/event_registration.py +++ b/addons/event/models/event_registration.py @@ -28,7 +28,7 @@ class EventRegistration(models.Model): utm_medium_id = fields.Many2one('utm.medium', 'Medium', index=True, ondelete='set null') # attendee partner_id = fields.Many2one( - 'res.partner', string='Contact', + 'res.partner', string='Booked by', states={'done': [('readonly', True)]}) name = fields.Char( string='Attendee Name', index=True, diff --git a/addons/event/static/src/scss/event.scss b/addons/event/static/src/scss/event.scss index 821ad23e09c..ec8ff7be2d0 100644 --- a/addons/event/static/src/scss/event.scss +++ b/addons/event/static/src/scss/event.scss @@ -16,3 +16,11 @@ } } } + +.o_kanban_view.o_event_attendee_kanban_view { + @media (max-width: 768px) { + .o_event_registration_kanban { + min-height: 80px; + } + } +} diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml index 743f570ac42..d572dd671c3 100644 --- a/addons/event/views/event_views.xml +++ b/addons/event/views/event_views.xml @@ -152,10 +152,11 @@ event.registration Attendees kanban,tree,form,calendar,graph - {'search_default_event_id': active_id, 'default_event_id': active_id} + [('event_id', '=', active_id)] + {'default_event_id': active_id}

- Add a new attendee + Create an Attendee

@@ -560,28 +561,65 @@ event.registration 10 - + + - -
-
- + +
+
+ - - + + + Attended + Canceled
-
-
- +
+ + +
+ + + + + + +
+ Attended + Canceled +
+
+
+ +
+
+
+
+
+ + + Booked by +
+ +
+ +
+
+
+
+
-
- +
+ +
@@ -667,7 +705,7 @@ Attendees event.registration - pivot,graph,tree,form + pivot,graph,kanban,tree,form {} diff --git a/addons/event_sale/views/event_registration_views.xml b/addons/event_sale/views/event_registration_views.xml index 5365c7d1e77..3d409b804e6 100644 --- a/addons/event_sale/views/event_registration_views.xml +++ b/addons/event_sale/views/event_registration_views.xml @@ -12,18 +12,6 @@ - - event.registration.kanban.inherit - event.registration - - - -
- -
-
-
- event.registration.form.inherit event.registration