From 885437ee217b135055bdea6014fe1973c03ed9ca Mon Sep 17 00:00:00 2001 From: Nasreddin Boulif Date: Wed, 10 Jun 2020 10:21:19 +0000 Subject: [PATCH] [IMP] event: add payment status in barcode / attendee kanban view PURPOSE Introduce a clearer way of handling registrations for multiple events occurring at the same time and place by * improve attendess kanban view; * introducing a Registration Desk menu item; SPECIFICATIONS Introduce a computed "payment_status" selection field, allowing to display status of a registration, based on its SO and ``is_paid```field. It is better fro UX and display. It is not stored as currently stored fields are sufficient for current requirement. Add it to the kanban view. Prepare barcode improvements by improving _get_registration_summary returned data dict, adding some information to display in event_barcode. Reorganize registrations actions, and prepare a generic one leading to attendees kanban view for registration desk. LINKS Task ID #2214290 Community PR odoo/odoo#47511 Enterprise PR odoo/enterprise#9190 --- addons/event/models/event_registration.py | 6 ++-- addons/event/views/event_views.xml | 23 +++++++++---- .../event_sale/models/event_registration.py | 32 ++++++++++++------- .../views/event_registration_views.xml | 18 +++++++++++ addons/event_sale/views/sale_order_views.xml | 2 +- .../views/event_track_views.xml | 1 + 6 files changed, 61 insertions(+), 21 deletions(-) diff --git a/addons/event/models/event_registration.py b/addons/event/models/event_registration.py index d1cadb4c8c5..6425f2cc065 100644 --- a/addons/event/models/event_registration.py +++ b/addons/event/models/event_registration.py @@ -268,8 +268,10 @@ class EventRegistration(models.Model): self.ensure_one() return { 'id': self.id, + 'name': self.name, 'partner_id': self.partner_id.id, 'ticket_name': self.event_ticket_id.name or _('None'), - 'name': self.name, - 'event_name': self.event_id.name, + 'event_id': self.event_id.id, + 'event_display_name': self.event_id.display_name, + 'company_name': self.event_id.company_id and self.event_id.company_id.name or False, } diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml index d572dd671c3..555941ffeb7 100644 --- a/addons/event/views/event_views.xml +++ b/addons/event/views/event_views.xml @@ -161,6 +161,17 @@ + + event.registration + Attendees + kanban,tree,form,calendar,graph + +

+ Create an Attendee +

+
+
+ Event registrations ir.actions.act_window @@ -702,12 +713,12 @@ - Attendees - event.registration - - pivot,graph,kanban,tree,form - {} - + Attendees + event.registration + + pivot,graph,kanban,tree,form + {} + + + event.registration.kanban.inherit.event.sale + event.registration + + + +
+ +
+
+ +
+ +
+
+
+
+ event.registration.form.inherit event.registration diff --git a/addons/event_sale/views/sale_order_views.xml b/addons/event_sale/views/sale_order_views.xml index c05774168e8..5895fc79c78 100644 --- a/addons/event_sale/views/sale_order_views.xml +++ b/addons/event_sale/views/sale_order_views.xml @@ -5,7 +5,7 @@ sale.order - +