19.0 vanilla

odoo-bringout-oca-ocb-event/README.md

@@ -21,38 +21,19 @@ pip install odoo-bringout-oca-ocb-event
 
 ## Dependencies
 
-This addon depends on:
+- barcodes
 - base_setup
 - mail
+- phone_validation
 - portal
 - utm
 
-## Manifest Information
-
-- **Name**: Events Organization
-- **Version**: 1.7
-- **Category**: Marketing/Events
-- **License**: LGPL-3
-- **Installable**: True
-
 ## Source
 
-Based on [OCA/OCB](https://github.com/OCA/OCB) branch 16.0, addon `event`.
+- Repository: https://github.com/OCA/OCB
+- Branch: 19.0
+- Path: addons/event
 
 ## License
 
-This package maintains the original LGPL-3 license from the upstream Odoo project.
-
-## Documentation
-
-- Overview: doc/OVERVIEW.md
-- Architecture: doc/ARCHITECTURE.md
-- Models: doc/MODELS.md
-- Controllers: doc/CONTROLLERS.md
-- Wizards: doc/WIZARDS.md
-- Install: doc/INSTALL.md
-- Usage: doc/USAGE.md
-- Configuration: doc/CONFIGURATION.md
-- Dependencies: doc/DEPENDENCIES.md
-- Troubleshooting: doc/TROUBLESHOOTING.md
-- FAQ: doc/FAQ.md
+This package preserves the original LGPL-3 license.

odoo-bringout-oca-ocb-event/event/__manifest__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 {
     'name': 'Events Organization',
-    'version': '1.7',
+    'version': '1.9',
     'website': 'https://www.odoo.com/app/events',
     'category': 'Marketing/Events',
     'summary': 'Trainings, Conferences, Meetings, Exhibitions, Registrations',
@@ -17,7 +17,7 @@ Key Features
 * Manage your Events and Registrations
 * Use emails to automatically confirm and send acknowledgments for any event registration
 """,
-    'depends': ['base_setup', 'mail', 'portal', 'utm'],
+    'depends': ['barcodes', 'base_setup', 'mail', 'phone_validation', 'portal', 'utm'],
     'data': [
         'security/event_security.xml',
         'security/ir.model.access.csv',
@@ -25,18 +25,24 @@ Key Features
         'views/event_ticket_views.xml',
         'views/event_mail_views.xml',
         'views/event_registration_views.xml',
+        'views/event_slot_views.xml',
         'views/event_type_views.xml',
         'views/event_event_views.xml',
         'views/event_stage_views.xml',
         'report/event_event_templates.xml',
         'report/event_event_reports.xml',
+        'report/event_registration_report.xml',
         'data/ir_cron_data.xml',
         'data/mail_template_data.xml',
         'data/event_data.xml',
+        'data/event_tour.xml',
         'views/res_config_settings_views.xml',
         'views/event_templates.xml',
         'views/res_partner_views.xml',
-        'views/event_tag_views.xml'
+        'views/event_tag_views.xml',
+        'views/event_question_views.xml',
+        'views/event_registration_answer_views.xml',
+        'data/event_question_data.xml',
     ],
     'demo': [
         'data/res_users_demo.xml',
@@ -48,23 +54,27 @@ Key Features
     'installable': True,
     'assets': {
         'web.assets_backend': [
+            'event/static/src/client_action/**/*',
             'event/static/src/scss/event.scss',
+            'event/static/src/event_state_selection_field/*',
             'event/static/src/icon_selection_field/icon_selection_field.js',
             'event/static/src/icon_selection_field/icon_selection_field.xml',
-        ],
-        'web.assets_common': [
+            'event/static/src/template_reference_field/*',
             'event/static/src/js/tours/**/*',
+            'event/static/src/views/**/*',
         ],
         'web.assets_frontend': [
             'event/static/src/js/tours/**/*',
         ],
         'web.report_assets_common': [
-            '/event/static/src/scss/event_foldable_badge_report.scss',
+            '/event/static/src/scss/event_badge_report.scss',
             '/event/static/src/scss/event_full_page_ticket_report.scss',
+            '/event/static/src/scss/event_full_page_ticket_responsive_html_report.scss',
         ],
         'web.report_assets_pdf': [
             '/event/static/src/scss/event_full_page_ticket_report_pdf.scss',
         ],
     },
+    'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }

odoo-bringout-oca-ocb-event/event/controllers/main.py

@@ -1,20 +1,24 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+import json
 from werkzeug.exceptions import NotFound
 
+from odoo import http, _
 from odoo.http import Controller, request, route, content_disposition
+from odoo.tools import consteq, format_datetime
 
 
 class EventController(Controller):
 
     @route(['''/event/<model("event.event"):event>/ics'''], type='http', auth="public")
     def event_ics_file(self, event, **kwargs):
-        lang = request.context.get('lang', request.env.user.lang)
+        lang = request.env.context.get('lang', request.env.user.lang)
         if request.env.user._is_public():
-            lang = request.httprequest.cookies.get('frontend_lang')
+            lang = request.cookies.get('frontend_lang')
         event = event.with_context(lang=lang)
-        files = event._get_ics_file()
+        slot_id = int(kwargs['slot_id']) if kwargs.get('slot_id') else False
+        files = event._get_ics_file(slot=request.env['event.slot'].sudo().browse(slot_id))
         if not event.id in files:
             return NotFound()
         content = files[event.id]
@@ -23,3 +27,73 @@ class EventController(Controller):
             ('Content-Length', len(content)),
             ('Content-Disposition', content_disposition('%s.ics' % event.name))
         ])
+
+    @route(['/event/<int:event_id>/my_tickets'], type='http', auth='public')
+    def event_my_tickets(self, event_id, registration_ids, tickets_hash, badge_mode=False, responsive_html=False):
+        """ Returns a pdf response, containing all tickets for attendees in registration_ids for event_id.
+
+        Throw Forbidden if no registration is valid / hash is invalid / parameters are missing.
+        This route is used in links in emails to attendees, as well as in registration confirmation screens.
+
+        :param event: the id of prompted event. Only its attendees will be considered.
+        :param registration_ids: ids of event.registrations of which tickets are generated
+        :param tickets_hash: string hash used to access the tickets.
+        :param badge_mode: boolean, True to use template of foldable badge instead of full page ticket.
+        :param responsive_html: boolean, True if we want to see the a responsive html ticket.
+        """
+        registration_ids = json.loads(registration_ids or '[]')
+        if not event_id or not tickets_hash or not registration_ids:
+            raise NotFound()
+
+        # We sudo the event in case of invitations sent before publishing it.
+        event_sudo = request.env['event.event'].browse(event_id).exists().sudo()
+        hash_truth = event_sudo and event_sudo._get_tickets_access_hash(registration_ids)
+        if not hash_truth or not consteq(tickets_hash, hash_truth):
+            raise NotFound()
+
+        event_registrations_sudo = event_sudo.registration_ids.filtered(lambda reg: reg.id in registration_ids)
+        report_name_prefix = _("Ticket") if responsive_html else _("Badges") if badge_mode else _("Tickets")
+        report_date = format_datetime(request.env, event_registrations_sudo[0].event_begin_date, tz=event_sudo.date_tz, dt_format='medium')
+        report_name = f"{report_name_prefix} - {event_sudo.name} ({report_date})"
+        if len(event_registrations_sudo) == 1:
+            report_name += f" - {event_registrations_sudo[0].name}"
+
+        # sudo is necessary for accesses in templates.
+        if responsive_html:
+            html = request.env['ir.actions.report'].sudo()._render_qweb_html(
+                'event.action_report_event_registration_responsive_html_ticket',
+                event_registrations_sudo.ids,
+            )[0]
+            return request.make_response(html)
+
+        pdf = request.env['ir.actions.report'].sudo()._render_qweb_pdf(
+            'event.action_report_event_registration_badge' if badge_mode else
+            'event.action_report_event_registration_full_page_ticket',
+            event_registrations_sudo.ids,
+        )[0]
+        pdfhttpheaders = [
+            ('Content-Type', 'application/pdf'),
+            ('Content-Length', len(pdf)),
+            ('Content-Disposition', content_disposition(f'{report_name}.pdf')),
+        ]
+        return request.make_response(pdf, headers=pdfhttpheaders)
+
+    @http.route(['/event/init_barcode_interface'], type='jsonrpc', auth="user")
+    def init_barcode_interface(self, event_id):
+        event = request.env['event.event'].browse(event_id).exists() if event_id else False
+        if event:
+            return {
+                'name': event.name,
+                'country': event.address_id.country_id.name,
+                'city': event.address_id.city,
+                'company_name': event.company_id.name,
+                'company_id': event.company_id.id
+            }
+        else:
+            return {
+                'name': _('Event Registrations'),
+                'country': False,
+                'city': False,
+                'company_name': request.env.company.name,
+                'company_id': request.env.company.id
+            }

odoo-bringout-oca-ocb-event/event/data/event_data.xml

@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        <!-- Event Categories -->
-        <record id="event_type_data_ticket" model="event.type">
-            <field name="name">Ticketing</field>
-            <field name="auto_confirm" eval="False"/>
-        </record>
-        <record id="event_type_data_conference" model="event.type">
-            <field name="name">Conference</field>
-            <field name="auto_confirm" eval="True"/>
-        </record>
-
         <!-- Event stages -->
         <record id="event_stage_new" model="event.stage">
             <field name="name">New</field>
@@ -19,7 +9,7 @@
         </record>
         <record id="event_stage_booked" model="event.stage">
             <field name="name">Booked</field>
-            <field name="description">The place has been reserved</field>
+            <field name="description"></field> <!-- Necessary to set a void value to clear the previous value when module `event` is upgraded to 17.4 -->
             <field name="sequence">2</field>
         </record>
         <record id="event_stage_announced" model="event.stage">
@@ -29,17 +19,10 @@
         </record>
         <record id="event_stage_done" model="event.stage">
             <field name="name">Ended</field>
-            <field name="description">Fully ended</field>
+            <field name="description">Finished events. Odoo will automatically move them to this stage once their end date has passed.</field>
             <field name="sequence">5</field>
             <field name="pipe_end" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
-        <record id="event_stage_cancelled" model="event.stage">
-            <field name="name">Cancelled</field>
-            <field name="description">The event has been cancelled</field>
-            <field name="sequence">6</field>
-            <field name="pipe_end" eval="True"/>
-            <field name="fold" eval="True"/>
-        </record>
     </data>
 </odoo>

odoo-bringout-oca-ocb-event/event/data/event_demo.xml

@@ -1,5 +1,14 @@
 <?xml version="1.0"?>
-<odoo><data>
+<odoo>
+    <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field name="group_ids" eval="[(3, ref('event.group_event_manager'))]"/>
+        </record>
+
+        <record id="base.default_user_group" model="res.groups">
+            <field name="implied_ids" eval="[(4, ref('event.group_event_manager'))]"/>
+        </record>
+    </data>
 
     <!-- Event -->
     <record id="event.event_0" model="event.event">
@@ -22,14 +31,19 @@
     <li>If you don't have this ticket, you will <b>not</b> be allowed entry!</li>
 </ul>
         </field>
+        <field name="question_ids" eval="[
+            (4, ref('event.event_question_name')),
+            (4, ref('event.event_question_email')),
+            (4, ref('event.event_question_phone'))]"/>
     </record>
     <record id="event_0_ticket_0" model="event.event.ticket">
         <field name="name">Free</field>
-        <field name="description">Free entrance, no food !</field>
+        <field name="description">Free entrance, no food!</field>
         <field name="event_id" ref="event.event_0"/>
         <field name="start_sale_datetime" eval="(DateTime.today() + timedelta(days=5)).strftime('%Y-%m-%d 00:00:00')"/>
         <field name="end_sale_datetime" eval="(DateTime.today() + timedelta(days=10)).strftime('%Y-%m-%d 23:00:00')"/>
         <field name="seats_max">0</field>
+        <field name="sequence">1</field>
     </record>
     <record id="event_0_ticket_1" model="event.event.ticket">
         <field name="name">Standard</field>
@@ -38,6 +52,7 @@
         <field name="start_sale_datetime" eval="(DateTime.today() + timedelta(days=5)).strftime('%Y-%m-%d 00:00:00')"/>
         <field name="end_sale_datetime" eval="(DateTime.today() + timedelta(days=10)).strftime('%Y-%m-%d 23:00:00')"/>
         <field name="seats_max">50</field>
+        <field name="sequence">2</field>
     </record>
     <record id="event_0_ticket_2" model="event.event.ticket">
         <field name="name">VIP</field>
@@ -46,6 +61,7 @@
         <field name="start_sale_datetime" eval="(DateTime.today() + timedelta(days=5)).strftime('%Y-%m-%d 00:00:00')"/>
         <field name="end_sale_datetime" eval="(DateTime.today() + timedelta(days=10)).strftime('%Y-%m-%d 23:00:00')"/>
         <field name="seats_max">10</field>
+        <field name="sequence">3</field>
     </record>
 
     <record id="event.event_1" model="event.event">
@@ -58,6 +74,10 @@
         <field name="stage_id" ref="event_stage_booked"/>
         <field name="kanban_state">blocked</field>
         <field name="tag_ids" eval="[(4, ref('event.event_tag_category_1_tag_4')), (4, ref('event.event_tag_category_2_tag_3'))]"/>
+        <field name="question_ids" eval="[
+            (4, ref('event.event_question_name')),
+            (4, ref('event.event_question_email')),
+            (4, ref('event.event_question_phone'))]"/>
     </record>
 
     <record id="message_event_1_0" model="mail.message">
@@ -65,7 +85,7 @@
         <field name="res_id" ref="event.event_1"/>
         <field name="body" type="html"><p>Hello Marc Demo,<br/>
             Our flight authorizations have been revoked due to insurance issues.<br/>
-            Could you take care of it as soon as possible ?</p>
+            Could you take care of it as soon as possible?</p>
         </field>
         <field name="message_type">comment</field>
         <field name="subtype_id" ref="mail.mt_comment"/>
@@ -75,7 +95,7 @@
         <field name="model">event.event</field>
         <field name="res_id" ref="event.event_1"/>
         <field name="parent_id" ref="message_event_1_0"/>
-        <field name="body" type="html"><p>Hi Mitchell Admin,<br/>I will take care of it today !</p></field>
+        <field name="body" type="html"><p>Hi Mitchell Admin,<br/>I will take care of it today!</p></field>
         <field name="message_type">comment</field>
         <field name="subtype_id" ref="mail.mt_comment"/>
         <field name="author_id" ref="base.partner_demo"/>
@@ -84,7 +104,7 @@
         <field name="model">event.event</field>
         <field name="res_id" ref="event.event_1"/>
         <field name="parent_id" ref="message_event_1_1"/>
-        <field name="body" type="html"><p>Great ! This event will stay "blocked" until it is fixed.<br/>
+        <field name="body" type="html"><p>Great! This event will stay "blocked" until it is fixed.<br/>
         Feel free to green it once everything is in order.</p>
         </field>
         <field name="message_type">comment</field>
@@ -106,24 +126,29 @@
         <field name="user_id" ref="base.user_admin"/>
         <field eval="(DateTime.today()+ timedelta(days=5)).strftime('%Y-%m-%d 07:00:00')" name="date_begin"/>
         <field eval="(DateTime.today()+ timedelta(days=5)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
-        <field name="event_type_id" ref="event_type_data_conference"/>
         <field name="address_id" ref="event.res_partner_location_2"/>
         <field name="seats_limited">True</field>
         <field name="seats_max">200</field>
         <field name="stage_id" ref="event_stage_booked"/>
         <field name="tag_ids" eval="[(4, ref('event.event_tag_category_1_tag_4')), (4, ref('event.event_tag_category_2_tag_1'))]"/>
+        <field name="question_ids" eval="[
+            (4, ref('event.event_question_name')),
+            (4, ref('event.event_question_email')),
+            (4, ref('event.event_question_phone'))]"/>
     </record>
     <record id="event_2_ticket_1" model="event.event.ticket">
         <field name="name">Standard</field>
         <field name="event_id" ref="event.event_2"/>
         <field name="end_sale_datetime" eval="(DateTime.today() + timedelta(90)).strftime('%Y-%m-%d 23:00:00')"/>
         <field name="seats_max">50</field>
+        <field name="sequence">4</field>
     </record>
     <record id="event_2_ticket_2" model="event.event.ticket">
         <field name="name">VIP</field>
         <field name="event_id" ref="event.event_2"/>
         <field name="end_sale_datetime" eval="(DateTime.today() + timedelta(60)).strftime('%Y-%m-%d 23:00:00')"/>
         <field name="seats_max">5</field>
+        <field name="sequence">5</field>
     </record>
     <record id="activity_event_2_0" model="mail.activity">
         <field name="res_id" ref="event.event_2" />
@@ -149,18 +174,24 @@
         <field name="address_id" ref="event.res_partner_location_1"/>
         <field name="stage_id" ref="event_stage_announced"/>
         <field name="tag_ids" eval="[(4, ref('event.event_tag_category_1_tag_3')), (4, ref('event.event_tag_category_2_tag_2'))]"/>
+        <field name="question_ids" eval="[
+            (4, ref('event.event_question_name')),
+            (4, ref('event.event_question_email')),
+            (4, ref('event.event_question_phone'))]"/>
     </record>
     <record id="event_3_ticket_0" model="event.event.ticket">
         <field name="name">Standard</field>
         <field name="event_id" ref="event.event_3"/>
         <field name="end_sale_datetime" eval="(DateTime.today() + timedelta(days=20)).strftime('%Y-%m-%d 23:00:00')"/>
         <field name="seats_max">1200</field>
+        <field name="sequence">6</field>
     </record>
     <record id="event_3_ticket_1" model="event.event.ticket">
         <field name="name">VIP</field>
         <field name="event_id" ref="event.event_3"/>
         <field name="end_sale_datetime" eval="(DateTime.today() + timedelta(days=20)).strftime('%Y-%m-%d 23:00:00')"/>
         <field name="seats_max">50</field>
+        <field name="sequence">7</field>
     </record>
     <record id="activity_event_3_0" model="mail.activity">
         <field name="res_id" ref="event.event_3" />
@@ -190,12 +221,17 @@
         <field name="stage_id" ref="event_stage_done"/>
         <field name="kanban_state">done</field>
         <field name="tag_ids" eval="[(4, ref('event.event_tag_category_1_tag_4')), (4, ref('event.event_tag_category_2_tag_1'))]"/>
+        <field name="question_ids" eval="[
+            (4, ref('event.event_question_name')),
+            (4, ref('event.event_question_email')),
+            (4, ref('event.event_question_phone'))]"/>
     </record>
     <record id="event_4_ticket_0" model="event.event.ticket">
         <field name="name">General Admission</field>
         <field name="event_id" ref="event.event_4"/>
         <field name="end_sale_datetime" eval="(DateTime.today() - timedelta(30)).strftime('%Y-%m-%d 23:00:00')"/>
         <field name="seats_max">4</field>
+        <field name="sequence">8</field>
     </record>
     <record id="activity_event_4_0" model="mail.activity">
         <field name="res_id" ref="event.event_4" />
@@ -215,6 +251,10 @@
         <field name="event_type_id" ref="event_type_2"/>
         <field name="address_id" ref="event.res_partner_location_1"/>
         <field name="tag_ids" eval="[(6, 0, [ref('event.event_tag_category_1_tag_2'), ref('event.event_tag_category_2_tag_3')])]"/>
+        <field name="question_ids" eval="[
+            (4, ref('event.event_question_name')),
+            (4, ref('event.event_question_email')),
+            (4, ref('event.event_question_phone'))]"/>
     </record>
 
     <record id="event.event_6" model="event.event">
@@ -224,6 +264,10 @@
         <field eval="(DateTime.today()+ timedelta(days=30)).strftime('%Y-%m-%d 17:30:00')" name="date_end"/>
         <field name="event_type_id" ref="event_type_0"/>
         <field name="address_id" ref="event.res_partner_location_1"/>
+        <field name="question_ids" eval="[
+            (4, ref('event.event_question_name')),
+            (4, ref('event.event_question_email')),
+            (4, ref('event.event_question_phone'))]"/>
     </record>
 
     <record id="event.event_7" model="event.event">
@@ -232,7 +276,6 @@
         <field name="event_type_id" ref="event_type_0"/>
         <field name="stage_id" ref="event.event_stage_booked"/>
         <field name="user_id" ref="base.user_demo"/>
-        <field name="auto_confirm" eval="True"/>
         <field name="date_begin" eval="(DateTime.now() - timedelta(days=1)).strftime('%Y-%m-%d 05:00:00')"/>
         <field name="date_end" eval="(DateTime.now() + timedelta(days=1)).strftime('%Y-%m-%d 15:00:00')"/>
         <field name="address_id" eval="False"/>
@@ -249,17 +292,22 @@
     </div>
 </div>
         </field>
+        <field name="question_ids" eval="[
+            (4, ref('event.event_question_name')),
+            (4, ref('event.event_question_email')),
+            (4, ref('event.event_question_phone'))]"/>
     </record>
     <record id="event_7_ticket_1" model="event.event.ticket">
         <field name="name">Standard</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="end_sale_datetime" eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 15:00:00')"/>
+        <field name="sequence">9</field>
     </record>
     <record id="event_7_ticket_2" model="event.event.ticket">
         <field name="name">VIP</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="end_sale_datetime" eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 15:00:00')"/>
         <field name="seats_max">10</field>
+        <field name="sequence">10</field>
     </record>
-
-</data></odoo>
+</odoo>

odoo-bringout-oca-ocb-event/event/data/event_demo_misc.xml

@@ -4,19 +4,16 @@
     <!-- Event Type -->
     <record id="event_type_0" model="event.type">
         <field name="name">Exhibition</field>
-        <field name="auto_confirm" eval="False"/>
+        <field name="sequence">3</field>
     </record>
     <record id="event_type_1" model="event.type">
         <field name="name">Training</field>
-        <field name="auto_confirm" eval="False"/>
+        <field name="sequence">4</field>
     </record>
     <record id="event_type_2" model="event.type">
         <field name="name">Sport</field>
-        <field name="auto_confirm" eval="False"/>
         <field name="default_timezone">America/Los_Angeles</field>
-    </record>
-    <record id="event_type_data_conference" model="event.type">
-        <field name="default_timezone">Europe/Brussels</field>
+        <field name="sequence">5</field>
     </record>
 
     <!-- Category and Tags -->

odoo-bringout-oca-ocb-event/event/data/event_question_data.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="event_question_name" model="event.question">
+            <field name="title">Name</field>
+            <field name="question_type">name</field>
+            <field name="is_mandatory_answer">True</field>
+            <field name="is_default">True</field>
+            <field name="is_reusable">True</field>
+        </record>
+        <record id="event_question_email" model="event.question">
+            <field name="title">Email</field>
+            <field name="question_type">email</field>
+            <field name="is_mandatory_answer">True</field>
+            <field name="is_default">True</field>
+            <field name="is_reusable">True</field>
+        </record>
+        <record id="event_question_phone" model="event.question">
+            <field name="title">Phone</field>
+            <field name="question_type">phone</field>
+            <field name="is_default">True</field>
+            <field name="is_reusable">True</field>
+        </record>
+    </data>
+</odoo>

odoo-bringout-oca-ocb-event/event/data/event_registration_demo.xml

@@ -17,8 +17,8 @@
         <field name="create_date" eval="DateTime.now() - relativedelta(days=2)"/>
         <field name="event_id" ref="event.event_0"/>
         <field name="event_ticket_id" ref="event.event_0_ticket_0"/>
-        <field name="name">Tucker Carlson</field>
-        <field name="email">tuck@test.example.com</field>
+        <field name="name">Samar Basra</field>
+        <field name="email">Samar@test.example.com</field>
         <field name="partner_id" eval="False"/>
     </record>
 
@@ -158,15 +158,6 @@
         <field name="partner_id" ref="base.res_partner_address_25"/>
     </record>
 
-    <function model="event.registration"
-        name="action_confirm"
-        context="{'install_mode' : True}"
-        eval="[[ref('event_registration_0_0'), ref('event_registration_0_1'),
-                ref('event_registration_1_0'), ref('event_registration_1_1'), ref('event_registration_1_2'),
-                ref('event_registration_2_0'), ref('event_registration_2_1'), ref('event_registration_2_2'), ref('event_registration_2_3'),
-                ref('event_registration_4_2')]]"
-    />
-
     <function model="event.registration"
         name="action_set_done"
         eval="[[ref('event_registration_4_0'), ref('event_registration_4_1')]]"

odoo-bringout-oca-ocb-event/event/data/event_tour.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="event_tour" model="web_tour.tour">
+        <field name="name">event_tour</field>
+        <field name="sequence">210</field>
+        <field name="rainbow_man_message">Great! Now all you have to do is wait for your attendees to show up!</field>
+    </record>
+</odoo>

odoo-bringout-oca-ocb-event/event/data/ir_cron_data.xml

@@ -7,9 +7,8 @@
         <field name="state">code</field>
         <field name="code">model.schedule_communications(autocommit=True)</field>
         <field name="user_id" ref="base.user_root"/>
-        <field name="interval_number">1</field>
+        <field name="interval_number">24</field>
         <field name="interval_type">hours</field>
-        <field name="numbercall">-1</field>
-        <field name="doall" eval="False" />
+        <field name="nextcall" eval="(DateTime.now() + timedelta(minutes=15)).strftime('%Y-%m-%d %H:%M:%S')" />
     </record>
 </data></odoo>

odoo-bringout-oca-ocb-event/event/data/mail_template_data.xml

@@ -6,42 +6,19 @@
             <field name="name">Event: Registration Badge</field>
             <field name="model_id" ref="event.model_event_registration"/>
             <field name="subject">Your badge for {{ object.event_id.name }}</field>
-            <field name="email_from">{{ (object.event_id.organizer_id.email_formatted or object.event_id.user_id.email_formatted or '') }}</field>
-            <field name="email_to">{{ (object.email and '"%s" &lt;%s&gt;' % (object.name, object.email) or object.partner_id.email_formatted or '') }}</field>
+            <field name="email_from">{{ (object.event_id.organizer_id.email_formatted or object.event_id.company_id.email_formatted or user.email_formatted or '') }}</field>
+            <field name="email_to" eval="False"/>
+            <field name="use_default_to" eval="True"/>
             <field name="description">Sent automatically to someone after they registered to an event</field>
             <field name="body_html" type="html">
-<div>
-    Dear <t t-out="object.name or ''">Oscar Morgan</t>,<br/>
-    Thank you for your inquiry.<br/>
-    Here is your badge for the event <t t-out="object.event_id.name or ''">OpenWood Collection Online Reveal</t>.<br/>
-    If you have any questions, please let us know.
-    <br/><br/>
-    Thank you,
-    <t t-if="object.event_id.user_id.signature">
-        <br />
-        <t t-out="object.event_id.user_id.signature or ''">--<br/>Mitchell Admin</t>
-    </t>
-</div></field>
-            <field name="report_template" ref="action_report_event_registration_foldable_badge"/>
-            <field name="report_name">Foldable Badge - {{ (object.event_id.name or 'Event').replace('/','_') }}</field>
-            <field name="lang">{{ object.partner_id.lang }}</field>
-            <field name="auto_delete" eval="True"/>
-        </record>
-
-        <record id="event_subscription" model="mail.template">
-            <field name="name">Event: Registration Confirmation</field>
-            <field name="model_id" ref="event.model_event_registration"/>
-            <field name="subject">Your registration at {{ object.event_id.name }}</field>
-            <field name="email_from">{{ (object.event_id.organizer_id.email_formatted or object.event_id.user_id.email_formatted or '') }}</field>
-            <field name="email_to">{{ (object.email and '"%s" &lt;%s&gt;' % (object.name, object.email) or object.partner_id.email_formatted or '') }}</field>
-            <field name="description">Sent to attendees after registering to an event</field>
-            <field name="body_html" type="html">
 <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;"><tr><td align="center">
-<t t-set="date_begin" t-value="format_datetime(object.event_id.date_begin, tz='UTC', dt_format=&quot;yyyyMMdd'T'HHmmss'Z'&quot;)"/>
-<t t-set="date_end" t-value="format_datetime(object.event_id.date_end, tz='UTC', dt_format=&quot;yyyyMMdd'T'HHmmss'Z'&quot;)"/>
+<t t-set="date_begin" t-value="format_datetime(object.event_begin_date, tz='UTC', dt_format=&quot;yyyyMMdd'T'HHmmss'Z'&quot;)"/>
+<t t-set="date_end" t-value="format_datetime(object.event_end_date, tz='UTC', dt_format=&quot;yyyyMMdd'T'HHmmss'Z'&quot;)"/>
 <t t-set="is_online" t-value="'is_published' in object.event_id and object.event_id.is_published"/>
 <t t-set="event_organizer" t-value="object.event_id.organizer_id"/>
 <t t-set="event_address" t-value="object.event_id.address_id"/>
+<t t-set="event_website_url" t-value="object.event_id.event_share_url"/>
+<t t-set="registration_ids" t-value="object.ids if not is_sale else object._get_event_registration_ids_from_order()"/>
 <table border="0" cellpadding="0" cellspacing="0" width="590" style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
 <tbody>
     <!-- HEADER -->
@@ -51,16 +28,15 @@
                 <tr><td valign="middle">
                     <span style="font-size: 10px;">Your registration</span><br/>
                     <span style="font-size: 20px; font-weight: bold;">
-                        <t t-out="object.name or ''">Oscar Morgan</t>
+                        <t t-set="default_name">Guest</t>
+                        <t t-out="object.name or default_name"/>
                     </span>
                 </td><td valign="middle" align="right">
-                    <t t-if="is_online">
-                        <a t-att-href="object.event_id.website_url"
-                            style="padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #875A7B; border: 0px solid #875A7B; border-radius:3px">
-                            View Event
-                        </a>
-                    </t>
-                    <t t-else="">
+                    <a t-attf-href="/event/{{ object.event_id.id }}/my_tickets?badge_mode=1&amp;registration_ids={{ registration_ids }}&amp;tickets_hash={{ object.event_id._get_tickets_access_hash(registration_ids) }}"
+                        target="_blank" t-attf-style="padding: 8px 12px; font-size: 12px; color: {{object.event_id.company_id.email_primary_color or '#FFFFFF'}}; text-decoration: none !important; font-weight: 400; background-color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}}; border-radius:3px">
+                        Download Badges
+                    </a>
+                    <t t-if="not object.company_id.uses_default_logo">
                         <img t-att-src="'/logo.png?company=%s' % object.company_id.id" style="padding: 0px; margin: 0px; height: auto; width: 80px;" t-att-alt="'%s' % object.company_id.name"/>
                     </t>
                 </td></tr>
@@ -76,26 +52,44 @@
             <table width="590" border="0" cellpadding="0" cellspacing="0" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
                 <tr><td valign="top" style="font-size: 14px;">
                     <div>
-                        Hello <t t-out="object.name or ''">Oscar Morgan</t>,<br/>
-                        We are happy to confirm your registration to the event
-                        <t t-if="is_online">
-                            <a t-att-href="object.event_id.website_url" style="color:#875A7B;text-decoration:none;" t-out="object.event_id.name or ''">OpenWood Collection Online Reveal</a>
+                        <t t-set="default_name">Guest</t>
+                        Hello <t t-out="object.name or default_name"/>,<br/><br/>
+                        Please find attached your badge for
+                        <t t-if="event_website_url">
+                            <a t-att-href="event_website_url" t-attf-style="font-weight:bold;color:{{object.event_id.company_id.email_secondary_color or '#875A7B'}}; text-decoration:none;"
+                                t-out="object.event_id.name or ''">OpenWood Collection Online Reveal</a>
                         </t>
                         <t t-else="">
-                            <strong t-out="object.event_id.name or ''">OpenWood Collection Online Reveal</strong>
+                            <strong t-out="object.event_id.name or ''">OpenWood Collection Online Reveal</strong>.
                         </t>
-                        for attendee <t t-out="object.name or ''">Oscar Morgan</t>.
-                    </div>
-                    <div>
-                        <br />
-                        <strong>Add this event to your calendar</strong>
-                        <a t-attf-href="https://www.google.com/calendar/render?action=TEMPLATE&amp;text={{ object.event_id.name }}&amp;dates={{ date_begin }}/{{ date_end }}&amp;location={{ location }}" style="padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;" target="new"><img src="/web_editor/font_to_img/61525/rgb(135,90,123)/16" style="vertical-align:middle;" height="16" alt=""/> Google</a>
-                        <a t-attf-href="/event/{{ slug(object.event_id) }}/ics" style="padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;"><img src="/web_editor/font_to_img/61525/rgb(135,90,123)/16" style="vertical-align:middle;" height="16" alt=""/> iCal/Outlook</a>
-                        <a t-attf-href="https://calendar.yahoo.com/?v=60&amp;view=d&amp;type=20&amp;title={{ object.event_id.name }}&amp;in_loc={{ location }}&amp;st={{ format_datetime(object.event_id.date_begin, tz='UTC', dt_format='yyyyMMdd\'T\'HHmmss') }}&amp;et={{ format_datetime(object.event_id.date_end, tz='UTC', dt_format='yyyyMMdd\'T\'HHmmss') }}" style="padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;" target="new">
-                            <img src="/web_editor/font_to_img/61525/rgb(135,90,123)/16" style="vertical-align:middle;" height="16" alt=""/> Yahoo
-                        </a>
-                        <br /><br />
                     </div>
+                    <br/>
+                    <table style="width: auto;">
+                        <tr>
+                            <td>
+                                <strong>Add this event to your calendar</strong>
+                            </td>
+                            <td>
+                                <a t-attf-href="/event/{{ slug(object.event_id) }}/ics?slot_id={{ object.event_slot_id.id }}"
+                                    style="padding-top: 10px; padding-right:8px; padding-bottom:2px; padding-left:8px; margin-left: 8px; border-radius: 3px; background-color: #E7E9ED;">
+                                    <img src="/event/static/src/img/apple-calendar-128.png" alt="iCal" title="iCal" style="height: 20px; vertical-align: baseline;"/>
+                                </a>
+                            </td>
+                            <td>
+                                <a t-attf-href="/event/{{ slug(object.event_id) }}/ics?slot_id={{ object.event_slot_id.id }}"
+                                    style="padding-top: 10px; padding-right:8px; padding-bottom:2px; padding-left:8px; margin-left: 8px; border-radius: 3px; background-color: #E7E9ED;">
+                                    <img src="/event/static/src/img/outlook-calendar-128.png" alt="Outlook" title="Outlook" style="height: 20px; vertical-align: baseline;"/>
+                                </a>
+                            </td>
+                            <td>
+                                <a t-attf-href="https://www.google.com/calendar/render?action=TEMPLATE&amp;text={{ object.event_id.name }}&amp;dates={{ date_begin }}/{{ date_end }}&amp;location={{ location }}&amp;details={{ object.event_id._get_external_description_url_encoded() }}" target="new"
+                                    style="padding-top: 10px; padding-right:8px; padding-bottom:2px; padding-left:8px; margin-left: 8px; border-radius: 3px; background-color: #E7E9ED;">
+                                    <img src="/event/static/src/img/google-calendar-128.png" alt="Google" title="Google" style="height: 20px; vertical-align: baseline;"/>
+                                </a>
+                            </td>
+                        </tr>
+                    </table>
+                    <br/><br/>
                     <div>
                         See you soon,<br/>
                         <span style="color: #454748;">
@@ -123,49 +117,59 @@
                     <table style="width:100%;">
                         <tr>
                             <td style="vertical-align:top;">
-                                <img src="/web_editor/font_to_img/61555/rgb(81,81,102)/34" style="padding:4px;max-width:inherit;" height="34" alt=""/>
+                                <img src="/mail/font_to_img/61555/rgb(81,81,102)/34" style="padding:4px;max-width:inherit;" height="34" alt=""/>
                             </td>
                             <td style="padding: 0px 10px 0px 10px;width:50%;line-height:20px;vertical-align:top;">
-                                <div><strong>From</strong> <t t-out="object.event_id.date_begin_located or ''">May 4, 2021, 7:00:00 AM</t></div>
-                                <div><strong>To</strong> <t t-out="object.event_id.date_end_located or ''">May 6, 2021, 5:00:00 PM</t></div>
+                                <div t-if="object.event_id.is_one_day">
+                                    <t t-out="object.event_begin_date" t-options='{"widget": "datetime", "date_only": True, "tz_name": object.event_id.date_tz, "format": "long"}'>May 4, 2021</t>
+                                    <t t-out="object.event_begin_date" t-options='{"widget": "datetime", "time_only": True, "tz_name": object.event_id.date_tz, "hide_seconds": True, "format": "short"}'>7:00 AM</t>
+                                     - <t t-out="object.event_end_date" t-options='{"widget": "datetime", "time_only": True, "tz_name": object.event_id.date_tz, "hide_seconds": True, "format": "short"}'>5:00 PM</t>
+                                </div>
+                                <div t-else="">
+                                    <strong>From</strong>
+                                    <t t-out="object.event_begin_date" t-options='{"widget": "datetime", "show_seconds": False, "tz_name": object.event_id.date_tz, "format": "medium"}'>May 4, 2021 - 7:00 AM</t>
+                                    <br/>
+                                    <strong>To</strong>
+                                    <t t-out="object.event_end_date" t-options='{"widget": "datetime", "show_seconds": False, "tz_name": object.event_id.date_tz, "format": "medium"}'>May 6, 2021 - 5:00 PM</t>
+                                </div>
                                 <div style="font-size:12px;color:#9e9e9e"><i>(<t t-out="object.event_id.date_tz or ''">Europe/Brussels</t>)</i></div>
                             </td>
                             <td style="vertical-align:top;">
                                 <t t-if="event_address">
-                                    <img src="/web_editor/font_to_img/61505/rgb(81,81,102)/34" style="padding:4px;max-width:inherit;" height="34" alt=""/>
+                                    <img src="/mail/font_to_img/61505/rgb(81,81,102)/34" style="padding:4px;max-width:inherit;" height="34" alt=""/>
                                 </t>
                             </td>
                             <td style="padding: 0px 10px 0px 10px;width:50%;vertical-align:top;">
                                 <t t-if="event_address">
                                     <t t-set="location" t-value="''"/>
                                     <t t-if="object.event_id.address_id.name">
-                                        <div t-out="object.event_id.address_id.name or ''">Teksa SpA</div>
+                                        <div t-out="object.event_id.address_id.name">Teksa SpA</div>
                                     </t>
                                     <t t-if="object.event_id.address_id.street">
-                                        <div t-out="object.event_id.address_id.street or ''">Puerto Madero 9710</div>
+                                        <div t-out="object.event_id.address_id.street">Puerto Madero 9710</div>
                                         <t t-set="location" t-value="object.event_id.address_id.street"/>
                                     </t>
                                     <t t-if="object.event_id.address_id.street2">
-                                        <div t-out="object.event_id.address_id.street2 or ''">Of A15, Santiago (RM)</div>
-                                        <t t-set="location" t-value="'%s, %s' % (location, object.event_id.address_id.street2)"/>
+                                        <div t-out="object.event_id.address_id.street2">Of A15, Santiago (RM)</div>
+                                        <t t-set="location" t-valuef="{{location}}, {{object.event_id.address_id.street2}}"/>
                                     </t>
                                     <div>
                                     <t t-if="object.event_id.address_id.city">
-                                        <t t-out="object.event_id.address_id.city or ''">Pudahuel</t>,
-                                        <t t-set="location" t-value="'%s, %s' % (location, object.event_id.address_id.city)"/>
+                                        <t t-out="object.event_id.address_id.city">Pudahuel</t>,
+                                        <t t-set="location" t-valuef="{{location}}, {{object.event_id.address_id.city}}"/>
                                     </t>
                                     <t t-if="object.event_id.address_id.state_id.name">
-                                        <t t-out="object.event_id.address_id.state_id.name or ''">C1</t>,
-                                        <t t-set="location" t-value="'%s, %s' % (location, object.event_id.address_id.state_id.name)"/>
+                                        <t t-out="object.event_id.address_id.state_id.name">C1</t>,
+                                        <t t-set="location" t-valuef="{{location}}, {{object.event_id.address_id.state_id.name}}"/>
                                     </t>
                                     <t t-if="object.event_id.address_id.zip">
-                                        <t t-out="object.event_id.address_id.zip or ''">98450</t>
-                                        <t t-set="location" t-value="'%s, %s' % (location, object.event_id.address_id.zip)"/>
+                                        <t t-out="object.event_id.address_id.zip">98450</t>
+                                        <t t-set="location" t-valuef="{{location}}, {{object.event_id.address_id.zip}}"/>
                                     </t>
                                     </div>
                                     <t t-if="object.event_id.address_id.country_id.name">
-                                        <div t-out="object.event_id.address_id.country_id.name or ''">Argentina</div>
-                                        <t t-set="location" t-value="'%s, %s' % (location, object.event_id.address_id.country_id.name)"/>
+                                        <div t-out="object.event_id.address_id.country_id.name">Argentina</div>
+                                        <t t-set="location" t-valuef="{{location}}, {{object.event_id.address_id.country_id.name}}"/>
                                     </t>
                                 </t>
                             </td>
@@ -187,10 +191,10 @@
                             <ul>
                                 <li><t t-out="event_organizer.name or ''">YourCompany</t></li>
                                 <t t-if="event_organizer.email">
-                                    <li>Mail: <a t-attf-href="mailto:{{ event_organizer.email }}" style="text-decoration:none;color:#875A7B;" t-out="event_organizer.email or ''">info@yourcompany.com</a></li>
+                                    <li>Mail: <a t-attf-href="mailto:{{ event_organizer.email }}" t-attf-style="text-decoration:none;color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}};" t-out="event_organizer.email">info@yourcompany.com</a></li>
                                 </t>
                                 <t t-if="event_organizer.phone">
-                                    <li>Phone: <t t-out="event_organizer.phone or ''">+1 650-123-4567</t></li>
+                                    <li>Phone: <t t-out="event_organizer.phone">+1 650-123-4567</t></li>
                                 </t>
                             </ul>
                         </div>
@@ -224,9 +228,12 @@
                     <t t-if="event_address and location">
                         <table style="width:100%;"><tr><td>
                             <div>
-                                <i class="fa fa-map-marker"/>
+                                <img src="/web_editor/font_to_img/61505/rgb(81,81,102)/20" height="20" style="vertical-align: bottom;"/>
                                 <a t-attf-href="https://maps.google.com/maps?q={{ location }}" target="new">
-                                    See location on Google Maps
+                                    <img t-if="event_address.static_map_url and event_address.static_map_url_is_valid"
+                                         t-att-src="event_address.static_map_url"
+                                         style="vertical-align:bottom; width: 100%;" alt="Google Maps"/>
+                                    <t t-else="">See location on Google Maps</t>
                                 </a>
                             </div>
                         </td></tr></table>
@@ -243,10 +250,10 @@
     <t t-if="object.company_id">
         <table width="590" border="0" cellpadding="0" cellspacing="0" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
         <tr><td style="text-align: center; font-size: 14px;">
-            Sent by <a target="_blank" t-attf-href="{{ object.company_id.website }}" style="color: #875A7B;" t-out="object.company_id.name or ''">YourCompany</a>
+            Sent by <a target="_blank" t-attf-href="{{ object.company_id.website }}" t-attf-style="color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}};" t-out="object.company_id.name or ''">YourCompany</a>
             <t t-if="is_online">
                 <br />
-                Discover <a href="/event" style="color:#875A7B;">all our events</a>.
+                Discover <a href="/event" t-attf-style="color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}};">all our events</a>.
             </t>
         </td></tr>
         </table>
@@ -254,26 +261,30 @@
 </td></tr>
 </table>
             </field>
-            <field name="report_template" ref="action_report_event_registration_full_page_ticket"/>
-            <field name="report_name">Full Page Ticket - {{ (object.event_id.name or 'Event').replace('/','') }}</field>
-            <field name="lang">{{ object.partner_id.lang }}</field>
+            <field name="report_template_ids" eval="[(4, ref('event.action_report_event_registration_badge'))]"/>
+            <field name="lang">{{ object.event_id.lang or object.partner_id.lang }}</field>
+            <field name="auto_delete" eval="True"/>
         </record>
 
-        <record id="event_reminder" model="mail.template">
-            <field name="name">Event: Reminder</field>
+        <record id="event_subscription" model="mail.template">
+            <field name="name">Event: Registration Confirmation</field>
             <field name="model_id" ref="event.model_event_registration"/>
-            <field name="subject">{{ object.event_id.name }}: {{ object.get_date_range_str() }}</field>
-            <field name="email_from">{{ (object.event_id.organizer_id.email_formatted or object.event_id.user_id.email_formatted or '') }}</field>
-            <field name="email_to">{{ (object.email and '"%s" &lt;%s&gt;' % (object.name, object.email) or object.partner_id.email_formatted or '') }}</field>
-            <field name="description">Sent automatically to attendees if there is a reminder defined on the event</field>
+            <field name="subject">Your registration at {{ object.event_id.name }}</field>
+            <field name="email_from">{{ (object.event_id.organizer_id.email_formatted or object.event_id.company_id.email_formatted or user.email_formatted or '') }}</field>
+            <field name="email_to" eval="False"/>
+            <field name="use_default_to" eval="True"/>
+            <field name="description">Sent to attendees after registering to an event</field>
             <field name="body_html" type="html">
 <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;"><tr><td align="center">
-<t t-set="date_begin" t-value="format_datetime(object.event_id.date_begin, tz='UTC', dt_format=&quot;yyyyMMdd'T'HHmmss'Z'&quot;)"/>
-<t t-set="date_end" t-value="format_datetime(object.event_id.date_end, tz='UTC', dt_format=&quot;yyyyMMdd'T'HHmmss'Z'&quot;)"/>
+<t t-set="date_begin" t-value="format_datetime(object.event_begin_date, tz='UTC', dt_format=&quot;yyyyMMdd'T'HHmmss'Z'&quot;)"/>
+<t t-set="date_end" t-value="format_datetime(object.event_end_date, tz='UTC', dt_format=&quot;yyyyMMdd'T'HHmmss'Z'&quot;)"/>
 <t t-set="is_online" t-value="'is_published' in object.event_id and object.event_id.is_published"/>
+<t t-set="is_sale" t-value="'sale_order_id' in object and object.sale_order_id"/>
 <t t-set="event_organizer" t-value="object.event_id.organizer_id"/>
 <t t-set="event_address" t-value="object.event_id.address_id"/>
-<table border="0" cellpadding="0" cellspacing="0"  width="590" style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
+<t t-set="event_website_url" t-value="object.event_id.event_share_url"/>
+<t t-set="registration_ids" t-value="object.ids if not is_sale else object._get_event_registration_ids_from_order()"/>
+<table border="0" cellpadding="0" cellspacing="0" width="590" style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
 <tbody>
     <!-- HEADER -->
     <tr>
@@ -281,16 +292,29 @@
             <table width="590" border="0" cellpadding="0" cellspacing="0" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
                 <tr><td valign="middle">
                     <span style="font-size: 10px;">Your registration</span><br/>
-                    <span style="font-size: 20px; font-weight: bold;" t-out="object.name or ''">Oscar Morgan</span>
-                </td><td valign="middle" align="right">
-                    <t t-if="is_online">
-                        <a t-attf-href="{{ object.event_id.website_url }}"
-                            style="padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #875A7B; border: 0px solid #875A7B; border-radius:3px">
-                            View Event
+                    <span style="font-size: 20px; font-weight: bold;">
+                        <t t-set="default_name">Guest</t>
+                        <t t-out="object.name or default_name"/>
+                    </span>
+                    <div style="margin-bottom: 5px;margin-top: 18px;">
+                        <a t-if="object.event_id.address_id" t-attf-href="/event/{{ object.event_id.id }}/my_tickets?registration_ids={{ object.ids }}&amp;tickets_hash={{ object.event_id._get_tickets_access_hash(object.ids) }}&amp;responsive_html=1"
+                            target="_blank" t-attf-style="padding: 8px 12px; font-size: 12px; color: {{object.event_id.company_id.email_primary_color or '#FFFFFF'}}; text-decoration: none !important; font-weight: 400; background-color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}}; border-radius:3px">
+                            View Tickets
                         </a>
+                        <a t-else="event_website_url" t-att-href="event_website_url"
+                            target="_blank" style="padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #875A7B; border: 0px solid #875A7B; border-radius:3px">
+                            View Online
+                        </a>
+                    </div>
+                </td><td valign="middle" align="right">
+                    <t t-if="object.barcode"> 
+                        <div style="margin-bottom: 5px;">
+                            <img t-attf-src="/report/barcode/QR/{{object.barcode}}?&amp;width=100&amp;height=100&amp;quiet=0" width="100" height="100" alt="QR Code"
+                            t-att-style="'height: 100px !important;'"/>
+                        </div>
                     </t>
-                    <t t-else="">
-                        <img t-att-src="'/logo.png?company=%s' % object.company_id.id" style="padding: 0px; margin: 0px; height: auto; width: 80px;" t-att-alt="'%s' % object.company_id.name"/>
+                    <t t-if="not object.company_id.uses_default_logo">
+                        <img t-att-src="'/logo.png?company=%s' % object.company_id.id" style="padding: 0px; margin: 0px; margin-right: 10px; height: auto; width: 80px;" t-att-alt="'%s' % object.company_id.name"/>
                     </t>
                 </td></tr>
                 <tr><td colspan="2" style="text-align:center;">
@@ -305,26 +329,330 @@
             <table width="590" border="0" cellpadding="0" cellspacing="0" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
                 <tr><td valign="top" style="font-size: 14px;">
                     <div>
-                        Hello <t t-out="object.name or ''">Oscar Morgan</t>,<br/>
+                        <t t-set="default_name">Guest</t>
+                        Hello <t t-out="object.name or default_name"/>,<br/><br/>
+                        We are happy to confirm your registration to the event
+                        <t t-if="event_website_url">
+                            <a t-att-href="event_website_url" t-attf-style="color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}}; text-decoration:none;font-weight:bold;"
+                                t-out="object.event_id.name or ''">OpenWood Collection Online Reveal</a>
+                        </t>
+                        <t t-else="">
+                            <strong t-out="object.event_id.name or ''">OpenWood Collection Online Reveal</strong>
+                        </t>.
+                        <t t-if="object.partner_id and object.partner_id.name and object.partner_id.name != object.name">
+                            This ticket was registered by <t t-out="object.partner_id.name"/>.
+                        </t>
+                    </div>
+                    <div t-if="is_sale">
+                        <br/>
+                        The order for this ticket has reference <t t-out="object.sale_order_id.name"/>
+                        and was placed on <t t-out="object.sale_order_id.date_order.date()"/>
+                        <t t-if="object.sale_order_line_id.price_total"> for an amount of
+                            <t t-out="object.sale_order_line_id.price_total" t-options="{'widget': 'monetary', 'display_currency': object.sale_order_line_id.currency_id}"/>
+                        </t>.
+                    </div>
+                    <br/>
+                    <table style="width: auto;">
+                        <tr>
+                            <td>
+                                <strong>Add this event to your calendar</strong>
+                            </td>
+                            <td>
+                                <a t-attf-href="/event/{{ slug(object.event_id) }}/ics?slot_id={{ object.event_slot_id.id }}"
+                                    style="padding-top: 10px; padding-right:8px; padding-bottom:2px; padding-left:8px; margin-left: 8px; border-radius: 3px; background-color: #E7E9ED;">
+                                    <img src="/event/static/src/img/apple-calendar-128.png" alt="iCal" title="iCal" style="height: 20px; vertical-align: baseline;"/>
+                                </a>
+                            </td>
+                            <td>
+                                <a t-attf-href="/event/{{ slug(object.event_id) }}/ics?slot_id={{ object.event_slot_id.id }}"
+                                    style="padding-top: 10px; padding-right:8px; padding-bottom:2px; padding-left:8px; margin-left: 8px; border-radius: 3px; background-color: #E7E9ED;">
+                                    <img src="/event/static/src/img/outlook-calendar-128.png" alt="Outlook" title="Outlook" style="height: 20px; vertical-align: baseline;"/>
+                                </a>
+                            </td>
+                            <td>
+                                <a t-attf-href="https://www.google.com/calendar/render?action=TEMPLATE&amp;text={{ object.event_id.name }}&amp;dates={{ date_begin }}/{{ date_end }}&amp;location={{ location }}&amp;details={{ object.event_id._get_external_description_url_encoded() }}" target="new"
+                                    style="padding-top: 10px; padding-right:8px; padding-bottom:2px; padding-left:8px; margin-left: 8px; border-radius: 3px; background-color: #E7E9ED;">
+                                    <img src="/event/static/src/img/google-calendar-128.png" alt="Google" title="Google" style="height: 20px; vertical-align: baseline;"/>
+                                </a>
+                            </td>
+                        </tr>
+                    </table>
+                    <br/><br/>
+                    <div>
+                        See you soon,<br/>
+                        <span style="color: #454748;">
+                        -- <br/>
+                        <t t-if="event_organizer">
+                            <t t-out="event_organizer.name">YourCompany</t>
+                        </t>
+                        <t t-else="">
+                            The <t t-out="object.event_id.name or ''">OpenWood Collection Online Reveal</t> Team
+                        </t>
+                        </span>
+                    </div>
+                </td></tr>
+                <tr><td style="text-align:center;">
+                  <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;"/>
+                </td></tr>
+            </table>
+        </td>
+    </tr>
+    <!-- DETAILS -->
+    <tr>
+        <td align="center" style="min-width: 590px;">
+            <table width="590" border="0" cellpadding="0" cellspacing="0" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                <tr><td valign="top" style="font-size: 14px;">
+                    <table style="width:100%;">
+                        <tr>
+                            <td style="vertical-align:top;">
+                                <img src="/mail/font_to_img/61555/rgb(81,81,102)/34" style="padding:4px;max-width:inherit;" height="34" alt=""/>
+                            </td>
+                            <td style="padding: 0px 10px 0px 10px;width:50%;line-height:20px;vertical-align:top;">
+                                <div t-if="object.event_id.is_one_day">
+                                    <t t-out="object.event_begin_date" t-options='{"widget": "datetime", "date_only": True, "tz_name": object.event_id.date_tz, "format": "long"}'>May 4, 2021</t>
+                                    <t t-out="object.event_begin_date" t-options='{"widget": "datetime", "time_only": True, "tz_name": object.event_id.date_tz, "hide_seconds": True, "format": "short"}'>7:00 AM</t>
+                                     - <t t-out="object.event_end_date" t-options='{"widget": "datetime", "time_only": True, "tz_name": object.event_id.date_tz, "hide_seconds": True, "format": "short"}'>5:00 PM</t>
+                                </div>
+                                <div t-else="">
+                                    <strong>From</strong>
+                                    <t t-out="object.event_begin_date" t-options='{"widget": "datetime", "show_seconds": False, "tz_name": object.event_id.date_tz, "format": "medium"}'>May 4, 2021 - 7:00 AM</t>
+                                    <br/>
+                                    <strong>To</strong>
+                                    <t t-out="object.event_end_date" t-options='{"widget": "datetime", "show_seconds": False, "tz_name": object.event_id.date_tz, "format": "medium"}'>May 6, 2021 - 5:00 PM</t>
+                                </div>
+                                <div style="font-size:12px;color:#9e9e9e"><i>(<t t-out="object.event_id.date_tz or ''">Europe/Brussels</t>)</i></div>
+                            </td>
+                            <td style="vertical-align:top;">
+                                <t t-if="event_address">
+                                    <img src="/mail/font_to_img/61505/rgb(81,81,102)/34" style="padding:4px;max-width:inherit;" height="34" alt=""/>
+                                </t>
+                            </td>
+                            <td style="padding: 0px 10px 0px 10px;width:50%;vertical-align:top;">
+                                <t t-if="event_address">
+                                    <t t-set="location" t-value="''"/>
+                                    <t t-if="object.event_id.address_id.name">
+                                        <div t-out="object.event_id.address_id.name">Teksa SpA</div>
+                                    </t>
+                                    <t t-if="object.event_id.address_id.street">
+                                        <div t-out="object.event_id.address_id.street">Puerto Madero 9710</div>
+                                        <t t-set="location" t-value="object.event_id.address_id.street"/>
+                                    </t>
+                                    <t t-if="object.event_id.address_id.street2">
+                                        <div t-out="object.event_id.address_id.street2">Of A15, Santiago (RM)</div>
+                                        <t t-set="location" t-valuef="{{location}}, {{object.event_id.address_id.street2}}"/>
+                                    </t>
+                                    <div>
+                                    <t t-if="object.event_id.address_id.city">
+                                        <t t-out="object.event_id.address_id.city">Pudahuel</t>,
+                                        <t t-set="location" t-valuef="{{location}}, {{object.event_id.address_id.city}}"/>
+                                    </t>
+                                    <t t-if="object.event_id.address_id.state_id.name">
+                                        <t t-out="object.event_id.address_id.state_id.name">C1</t>,
+                                        <t t-set="location" t-valuef="{{location}}, {{object.event_id.address_id.state_id.name}}"/>
+                                    </t>
+                                    <t t-if="object.event_id.address_id.zip">
+                                        <t t-out="object.event_id.address_id.zip">98450</t>
+                                        <t t-set="location" t-valuef="{{location}}, {{object.event_id.address_id.zip}}"/>
+                                    </t>
+                                    </div>
+                                    <t t-if="object.event_id.address_id.country_id.name">
+                                        <div t-out="object.event_id.address_id.country_id.name">Argentina</div>
+                                        <t t-set="location" t-valuef="{{location}}, {{object.event_id.address_id.country_id.name}}"/>
+                                    </t>
+                                </t>
+                            </td>
+                        </tr>
+                    </table>
+                </td></tr>
+                <tr><td style="text-align:center;">
+                    <t t-if="event_organizer">
+                        <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;"/>
+                    </t>
+                </td></tr>
+
+                <tr><td valign="top" style="font-size: 14px;">
+                    <!-- CONTACT ORGANIZER -->
+                    <t t-if="event_organizer">
+                        <div>
+                            <span style="font-weight:300;margin:10px 0px">Questions about this event?</span>
+                            <div>Please contact the organizer:</div>
+                            <ul>
+                                <li><t t-out="event_organizer.name or ''">YourCompany</t></li>
+                                <t t-if="event_organizer.email">
+                                    <li>Mail: <a t-attf-href="mailto:{{ event_organizer.email }}" t-attf-style="text-decoration:none; color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}};" t-out="event_organizer.email or ''">info@yourcompany.com</a></li>
+                                </t>
+                                <t t-if="event_organizer.phone">
+                                    <li>Phone: <t t-out="event_organizer.phone">+1 650-123-4567</t></li>
+                                </t>
+                            </ul>
+                        </div>
+                    </t>
+                </td></tr>
+                <tr><td style="text-align:center;">
+                    <!-- CONTACT ORGANIZER SEPARATION -->
+                    <t t-if="is_online or event_address">
+                        <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;"/>
+                    </t>
+                </td></tr>
+
+                <tr><td valign="top" style="font-size: 14px;">
+                    <!-- PWA MARKGETING -->
+                    <t t-if="is_online">
+                        <div>
+                            <strong>Get the best mobile experience.</strong>
+                            <a href="/event">Install our mobile app</a>
+                        </div>
+                    </t>
+                </td></tr>
+                <tr><td style="text-align:center;">
+                    <!-- PWA MARKGETING SEPARATION-->
+                    <t t-if="is_online and event_address">
+                        <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;"/>
+                    </t>
+                </td></tr>
+
+                <tr><td valign="top" style="font-size: 14px;">
+                    <!-- GOOGLE MAPS LINK -->
+                    <t t-if="event_address and location">
+                        <table style="width:100%;"><tr><td>
+                            <div>
+                                <img src="/web_editor/font_to_img/61505/rgb(81,81,102)/20" height="20" style="vertical-align: bottom;"/>
+                                <a t-attf-href="https://maps.google.com/maps?q={{ location }}" target="new">
+                                    <img t-if="event_address.static_map_url and event_address.static_map_url_is_valid"
+                                         t-att-src="event_address.static_map_url"
+                                         style="vertical-align:bottom; width: 100%;" alt="Google Maps"/>
+                                    <t t-else="">See location on Google Maps</t>
+                                </a>
+                            </div>
+                        </td></tr></table>
+                    </t>
+                </td></tr>
+            </table>
+        </td>
+    </tr>
+</tbody>
+</table>
+</td></tr>
+<!-- FOOTER BY -->
+<tr><td align="center" style="min-width: 590px;">
+    <t t-if="object.company_id">
+        <table width="590" border="0" cellpadding="0" cellspacing="0" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
+        <tr><td style="text-align: center; font-size: 14px;">
+            Sent by <a target="_blank" t-attf-href="{{ object.company_id.website }}" t-attf-style="color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}};" t-out="object.company_id.name or ''">YourCompany</a>
+            <t t-if="is_online">
+                <br />
+                Discover <a href="/event" t-attf-style="color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}};">all our events</a>.
+            </t>
+        </td></tr>
+        </table>
+    </t>
+</td></tr>
+</table>
+            </field>
+            <field name="report_template_ids" eval="[(4, ref('event.action_report_event_registration_full_page_ticket'))]"/>
+            <field name="lang">{{ object.event_id.lang or object.partner_id.lang }}</field>
+        </record>
+
+        <record id="event_reminder" model="mail.template">
+            <field name="name">Event: Reminder</field>
+            <field name="model_id" ref="event.model_event_registration"/>
+            <field name="subject">{{ object.event_id.name }}: {{ object.event_date_range }}</field>
+            <field name="email_from">{{ (object.event_id.organizer_id.email_formatted or object.event_id.company_id.email_formatted or user.email_formatted or '') }}</field>
+            <field name="email_to" eval="False"/>
+            <field name="use_default_to" eval="True"/>
+            <field name="description">Sent automatically to attendees if there is a reminder defined on the event</field>
+            <field name="body_html" type="html">
+<table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;"><tr><td align="center">
+<t t-set="date_begin" t-value="format_datetime(object.event_begin_date, tz='UTC', dt_format=&quot;yyyyMMdd'T'HHmmss'Z'&quot;)"/>
+<t t-set="date_end" t-value="format_datetime(object.event_end_date, tz='UTC', dt_format=&quot;yyyyMMdd'T'HHmmss'Z'&quot;)"/>
+<t t-set="is_online" t-value="'is_published' in object.event_id and object.event_id.is_published"/>
+<t t-set="is_sale" t-value="'sale_order_id' in object and object.sale_order_id"/>
+<t t-set="event_organizer" t-value="object.event_id.organizer_id"/>
+<t t-set="event_address" t-value="object.event_id.address_id"/>
+<t t-set="event_website_url" t-value="is_online and object.event_id.website_url"/>
+<t t-set="registration_ids" t-value="object.ids if not is_sale else object._get_event_registration_ids_from_order()"/>
+<table border="0" cellpadding="0" cellspacing="0"  width="590" style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
+<tbody>
+    <!-- HEADER -->
+    <tr>
+        <td align="center" style="min-width: 590px;">
+            <table width="590" border="0" cellpadding="0" cellspacing="0" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                <tr><td valign="middle">
+                    <span style="font-size: 10px;">Your registration</span><br/>
+                    <t t-set="default_name">Guest</t>
+                    <span style="font-size: 20px; font-weight: bold;" t-out="object.name or default_name"/>
+                    <div style="margin-bottom: 5px;margin-top: 18px;">
+                        <a t-if="object.event_id.address_id" t-attf-href="/event/{{ object.event_id.id }}/my_tickets?registration_ids={{ object.ids }}&amp;tickets_hash={{ object.event_id._get_tickets_access_hash(object.ids) }}&amp;responsive_html=1"
+                            target="_blank" style="padding: 8px 12px; font-size: 12px; color: {{object.event_id.company_id.email_primary_color or '#FFFFFF'}}; text-decoration: none !important; font-weight: 400; background-color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}}; border-radius:3px">
+                            View Tickets
+                        </a>
+                        <a t-else="event_website_url" t-att-href="event_website_url"
+                            target="_blank" style="padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #875A7B; border: 0px solid #875A7B; border-radius:3px">
+                            View Online
+                        </a>
+                    </div>
+                </td><td valign="middle" align="right">
+                    <t t-if="object.barcode">
+                        <div style="margin-bottom: 5px;">
+                            <img t-attf-src="/report/barcode/QR/{{object.barcode}}?&amp;width=100&amp;height=100&amp;quiet=0" width="100" height="100" alt="QR Code"
+                            t-att-style="'height: 100px !important;'"/>
+                        </div>
+                    </t>
+                    <t t-if="not object.company_id.uses_default_logo">
+                        <img t-att-src="'/logo.png?company=%s' % object.company_id.id" style="padding: 0px; margin: 0px; margin-right: 10px; height: auto; width: 80px;" t-att-alt="'%s' % object.company_id.name"/>
+                    </t>
+                </td></tr>
+                <tr><td colspan="2" style="text-align:center;">
+                  <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;"/>
+                </td></tr>
+            </table>
+        </td>
+    </tr>
+    <!-- EVENT DESCRIPTION -->
+    <tr>
+        <td align="center" style="min-width: 590px;">
+            <table width="590" border="0" cellpadding="0" cellspacing="0" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                <tr><td valign="top" style="font-size: 14px;">
+                    <div>
+                        <t t-set="default_name">Guest</t>
+                        Hello <t t-out="object.name or default_name"/>,<br/><br/>
                         We are excited to remind you that the event
-                        <t t-if="is_online">
-                            <a t-att-href="object.event_id.website_url" style="color:#875A7B;text-decoration:none;" t-out="object.event_id.name or ''">OpenWood Collection Online Reveal</a>
+                        <t t-if="event_website_url">
+                            <a t-att-href="event_website_url" t-attf-style="font-weight:bold;color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}}; text-decoration:none;"
+                                t-out="object.event_id.name or ''">OpenWood Collection Online Reveal</a>
                         </t>
                         <t t-else="">
                             <strong t-out="object.event_id.name or ''">OpenWood Collection Online Reveal</strong>
                         </t>
-                        is starting <strong t-out="object.get_date_range_str() or ''">today</strong>.
-                    </div>
-                    <div>
-                        <br />
-                        <strong>Add this event to your calendar</strong>
-                        <a t-attf-href="https://www.google.com/calendar/render?action=TEMPLATE&amp;text={{ object.event_id.name }}&amp;dates={{ date_begin }}/{{ date_end }}&amp;location={{ location }}" style="padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;" target="new"><img src="/web_editor/font_to_img/61525/rgb(135,90,123)/16" style="vertical-align:middle;" height="16" alt=""/> Google</a>
-                        <a t-attf-href="/event/{{ slug(object.event_id) }}/ics" style="padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;"><img src="/web_editor/font_to_img/61525/rgb(135,90,123)/16" style="vertical-align:middle;" height="16" alt=""/> iCal/Outlook</a>
-                        <a t-attf-href="https://calendar.yahoo.com/?v=60&amp;view=d&amp;type=20&amp;title={{ object.event_id.name }}&amp;in_loc={{ location }}&amp;st={{ format_datetime(object.event_id.date_begin, tz='UTC', dt_format='yyyyMMdd\'T\'HHmmss') }}&amp;et={{ format_datetime(object.event_id.date_end, tz='UTC', dt_format='yyyyMMdd\'T\'HHmmss') }}" style="padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;" target="new">
-                            <img src="/web_editor/font_to_img/61525/rgb(135,90,123)/16" style="vertical-align:middle;" height="16" alt=""/> Yahoo
-                        </a>
-                        <br /><br />
+                        is starting <strong t-out="object.event_date_range or ''">today</strong>.
                     </div>
+                    <br/>
+                    <table style="width: auto;">
+                        <tr>
+                            <td>
+                                <strong>Add this event to your calendar</strong>
+                            </td>
+                            <td>
+                                <a t-attf-href="/event/{{ slug(object.event_id) }}/ics?slot_id={{ object.event_slot_id.id }}"
+                                    style="padding-top: 10px; padding-right:8px; padding-bottom:2px; padding-left:8px; margin-left: 8px; border-radius: 3px; background-color: #E7E9ED;">
+                                    <img src="/event/static/src/img/apple-calendar-128.png" alt="iCal" title="iCal" style="height: 20px; vertical-align: baseline;"/>
+                                </a>
+                            </td>
+                            <td>
+                                <a t-attf-href="/event/{{ slug(object.event_id) }}/ics?slot_id={{ object.event_slot_id.id }}"
+                                    style="padding-top: 10px; padding-right:8px; padding-bottom:2px; padding-left:8px; margin-left: 8px; border-radius: 3px; background-color: #E7E9ED;">
+                                    <img src="/event/static/src/img/outlook-calendar-128.png" alt="Outlook" title="Outlook" style="height: 20px; vertical-align: baseline;"/>
+                                </a>
+                            </td>
+                            <td>
+                                <a t-attf-href="https://www.google.com/calendar/render?action=TEMPLATE&amp;text={{ object.event_id.name }}&amp;dates={{ date_begin }}/{{ date_end }}&amp;location={{ location }}&amp;details={{ object.event_id._get_external_description_url_encoded() }}" target="new"
+                                    style="padding-top: 10px; padding-right:8px; padding-bottom:2px; padding-left:8px; margin-left: 8px; border-radius: 3px; background-color: #E7E9ED;">
+                                    <img src="/event/static/src/img/google-calendar-128.png" alt="Google" title="Google" style="height: 20px; vertical-align: baseline;"/>
+                                </a>
+                            </td>
+                        </tr>
+                    </table>
+                    <br/><br/>
                     <div>
                         We confirm your registration and hope to meet you there,<br/>
                         <span style="color: #454748;">
@@ -352,16 +680,26 @@
                     <table style="width:100%;">
                         <tr>
                             <td style="vertical-align:top;">
-                                <img src="/web_editor/font_to_img/61555/rgb(81,81,102)/34" style="padding:4px;max-width:inherit;" height="34" alt=""/>
+                                <img src="/mail/font_to_img/61555/rgb(81,81,102)/34" style="padding:4px;max-width:inherit;" height="34" alt=""/>
                             </td>
                             <td style="padding: 0px 10px 0px 10px;width:50%;line-height:20px;vertical-align:top;">
-                                <div><strong>From</strong> <t t-out="object.event_id.date_begin_located or ''">May 4, 2021, 7:00:00 AM</t></div>
-                                <div><strong>To</strong> <t t-out="object.event_id.date_end_located or ''">May 6, 2021, 5:00:00 PM</t></div>
-                                <div style="font-size:12px;color:#9e9e9e"><i><t t-out="object.event_id.date_tz or ''">Europe/Brussels</t></i></div>
+                                <div t-if="object.event_id.is_one_day">
+                                    <t t-out="object.event_begin_date" t-options='{"widget": "datetime", "date_only": True, "tz_name": object.event_id.date_tz, "format": "long"}'>May 4, 2021</t>
+                                    <t t-out="object.event_begin_date" t-options='{"widget": "datetime", "time_only": True, "tz_name": object.event_id.date_tz, "hide_seconds": True, "format": "short"}'>7:00 AM</t>
+                                     - <t t-out="object.event_end_date" t-options='{"widget": "datetime", "time_only": True, "tz_name": object.event_id.date_tz, "hide_seconds": True, "format": "short"}'>5:00 PM</t>
+                                </div>
+                                <div t-else="">
+                                    <strong>From</strong>
+                                    <t t-out="object.event_begin_date" t-options='{"widget": "datetime", "show_seconds": False, "tz_name": object.event_id.date_tz, "format": "medium"}'>May 4, 2021 - 7:00 AM</t>
+                                    <br/>
+                                    <strong>To</strong>
+                                    <t t-out="object.event_end_date" t-options='{"widget": "datetime", "show_seconds": False, "tz_name": object.event_id.date_tz, "format": "medium"}'>May 6, 2021 - 5:00 PM</t>
+                                </div>
+                                <div style="font-size:12px;color:#9e9e9e"><i>(<t t-out="object.event_id.date_tz or ''">Europe/Brussels</t>)</i></div>
                             </td>
                             <td style="vertical-align:top;">
                                 <t t-if="event_address">
-                                    <img src="/web_editor/font_to_img/61505/rgb(81,81,102)/34" style="padding:4px;max-width:inherit;" height="34" alt=""/>
+                                    <img src="/mail/font_to_img/61505/rgb(81,81,102)/34" style="padding:4px;max-width:inherit;" height="34" alt=""/>
                                 </t>
                             </td>
                             <td style="padding: 0px 10px 0px 10px;width:50%;vertical-align:top;">
@@ -416,7 +754,7 @@
                             <ul>
                                 <li t-out="event_organizer.name or ''">YourCompany</li>
                                 <t t-if="event_organizer.email">
-                                    <li>Mail: <a t-attf-href="mailto:{{ event_organizer.email }}" style="text-decoration:none;color:#875A7B;" t-out="event_organizer.email or ''"></a></li>
+                                    <li>Mail: <a t-attf-href="mailto:{{ event_organizer.email }}" t-attf-style="text-decoration:none; color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}};" t-out="event_organizer.email or ''"></a></li>
                                 </t>
                                 <t t-if="event_organizer.phone">
                                     <li>Phone: <t t-out="event_organizer.phone or ''"></t></li>
@@ -444,11 +782,14 @@
 
                 <tr><td valign="top" style="font-size: 14px;">
                     <!-- GOOGLE MAPS LINK -->
-                    <table t-if="event_address" style="width:100%;"><tr><td>
+                    <table t-if="event_address and location" style="width:100%;"><tr><td>
                         <div>
-                            <i class="fa fa-map-marker"/>
+                            <img src="/web_editor/font_to_img/61505/rgb(81,81,102)/20" height="20" style="vertical-align: bottom;"/>
                             <a t-attf-href="https://maps.google.com/maps?q={{ location }}" target="new">
-                                See location on Google Maps
+                                <img t-if="event_address.static_map_url and event_address.static_map_url_is_valid"
+                                     t-attf-src="{{ event_address.static_map_url }}"
+                                     style="vertical-align:bottom; width: 100%;" alt="Google Maps"/>
+                                <span t-else="">See location on Google Maps</span>
                             </a>
                         </div>
                     </td></tr></table>
@@ -463,17 +804,17 @@
 <tr><td align="center" style="min-width: 590px;">
     <table t-if="object.company_id" width="590" border="0" cellpadding="0" cellspacing="0" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
       <tr><td style="text-align: center; font-size: 14px;">
-        Sent by <a target="_blank" t-attf-href="{{ object.company_id.website }}" style="color: #875A7B;" t-out="object.company_id.name or ''">YourCompany</a>
+        Sent by <a target="_blank" t-attf-href="{{ object.company_id.website }}" t-attf-style="color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}};" t-out="object.company_id.name or ''">YourCompany</a>
         <t t-if="'website_url' in object.event_id and object.event_id.website_url">
             <br />
-            Discover <a href="/event" style="color:#875A7B;">all our events</a>.
+            Discover <a href="/event" t-attf-style="color: {{object.event_id.company_id.email_secondary_color or '#875A7B'}};">all our events</a>.
         </t>
       </td></tr>
     </table>
 </td></tr>
 </table>
             </field>
-            <field name="lang">{{ object.partner_id.lang }}</field>
+            <field name="lang">{{ object.event_id.lang or object.partner_id.lang }}</field>
         </record>
 
     </data>

odoo-bringout-oca-ocb-event/event/data/res_partner_demo.xml

@@ -41,23 +41,10 @@
         <field name="city">Berlin</field>
         <field name="country_id" ref="base.de"/>
         <field name="phone">+49 30 12345678</field>
-        <field name="mobile">+49 30 87654321</field>
         <field name="email">flower@example.com</field>
         <field name="website">www.flower.example.com</field>
     </record>
-    <record id="res_partner_event_2" model="res.partner">
-        <field name="name">OpenWood</field>
-        <field name="is_company" eval="True"/>
-        <field name="image_1920" type="base64" file="event/static/src/img/partner_open_wood.png"/>
-        <field name="street">Orval 1</field>
-        <field name="zip">6823</field>
-        <field name="city">Florenville</field>
-        <field name="country_id" ref="base.be"/>
-        <field name="phone">+32 987 65 43 21</field>
-        <field name="mobile">+32 987 65 43 21</field>
-        <field name="email">wow@example.com</field>
-        <field name="website">www.openwood.example.com</field>
-    </record>
+
     <record id="res_partner_event_3" model="res.partner">
         <field name="name">Tree Dealers SP</field>
         <field name="is_company" eval="True"/>
@@ -67,7 +54,6 @@
         <field name="city">Ville de Quebec</field>
         <field name="country_id" ref="base.ca"/>
         <field name="phone">+1 418 123 4567</field>
-        <field name="mobile">+1 418 765 4321</field>
         <field name="email">tree@example.com</field>
         <field name="website">www.tree.example.com</field>
     </record>
@@ -80,7 +66,6 @@
         <field name="city">Shanghai Shi</field>
         <field name="country_id" ref="base.cn"/>
         <field name="phone">+86 21 1234 5678</field>
-        <field name="mobile">+86 21 8765 4321</field>
         <field name="email">ptero@example.com</field>
         <field name="website">www.pterocarpus.example.com</field>
     </record>

odoo-bringout-oca-ocb-event/event/data/res_users_demo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <odoo>
     <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4, ref('event.group_event_user'))]"/>
+        <field name="group_ids" eval="[(4, ref('event.group_event_user'))]"/>
     </record>
  </odoo>

odoo-bringout-oca-ocb-event/event/models/__init__.py

@@ -1,12 +1,23 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+# some inherit require to define those models first
+from . import event_type
+from . import event_type_mail
+from . import event_type_ticket
+
 from . import event_event
 from . import event_mail
+from . import event_mail_registration
+from . import event_mail_slot
 from . import event_registration
+from . import event_slot
 from . import event_stage
 from . import event_tag
 from . import event_ticket
 from . import mail_template
 from . import res_config_settings
 from . import res_partner
+from . import event_question_answer
+from . import event_registration_answer
+from . import event_question

odoo-bringout-oca-ocb-event/event/models/event_event.py

@@ -1,15 +1,21 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import logging
 import pytz
+import textwrap
+import urllib.parse
+from datetime import datetime, timedelta
 
-from datetime import timedelta
+from dateutil.relativedelta import relativedelta
+from markupsafe import escape
+from urllib.parse import urlparse
 
-from odoo import _, api, Command, fields, models
+from odoo import _, api, Command, fields, models, tools
 from odoo.addons.base.models.res_partner import _tz_get
-from odoo.tools import format_datetime, is_html_empty
-from odoo.exceptions import UserError, ValidationError
+from odoo.exceptions import ValidationError
+from odoo.fields import Datetime, Domain
+from odoo.tools import format_date, format_datetime, format_time, frozendict
+from odoo.tools.mail import is_html_empty, html_to_inner_content
 from odoo.tools.misc import formatLang
 from odoo.tools.translate import html_translate
 
@@ -22,85 +28,30 @@ except ImportError:
     vobject = None
 
 
-class EventType(models.Model):
-    _name = 'event.type'
-    _description = 'Event Template'
-    _order = 'sequence, id'
-
-    def _default_event_mail_type_ids(self):
-        return [(0, 0,
-                 {'notification_type': 'mail',
-                  'interval_nbr': 0,
-                  'interval_unit': 'now',
-                  'interval_type': 'after_sub',
-                  'template_ref': 'mail.template, %i' % self.env.ref('event.event_subscription').id,
-                 }),
-                (0, 0,
-                 {'notification_type': 'mail',
-                  'interval_nbr': 1,
-                  'interval_unit': 'hours',
-                  'interval_type': 'before_event',
-                  'template_ref': 'mail.template, %i' % self.env.ref('event.event_reminder').id,
-                 }),
-                (0, 0,
-                 {'notification_type': 'mail',
-                  'interval_nbr': 3,
-                  'interval_unit': 'days',
-                  'interval_type': 'before_event',
-                  'template_ref': 'mail.template, %i' % self.env.ref('event.event_reminder').id,
-                 })]
-
-    name = fields.Char('Event Template', required=True, translate=True)
-    note = fields.Html(string='Note')
-    sequence = fields.Integer()
-    # tickets
-    event_type_ticket_ids = fields.One2many('event.type.ticket', 'event_type_id', string='Tickets')
-    tag_ids = fields.Many2many('event.tag', string="Tags")
-    # registration
-    has_seats_limitation = fields.Boolean('Limited Seats')
-    seats_max = fields.Integer(
-        'Maximum Registrations', compute='_compute_seats_max',
-        readonly=False, store=True,
-        help="It will select this default maximum value when you choose this event")
-    auto_confirm = fields.Boolean(
-        'Automatically Confirm Registrations', default=True,
-        help="Events and registrations will automatically be confirmed "
-             "upon creation, easing the flow for simple events.")
-    default_timezone = fields.Selection(
-        _tz_get, string='Timezone', default=lambda self: self.env.user.tz or 'UTC')
-    # communication
-    event_type_mail_ids = fields.One2many(
-        'event.type.mail', 'event_type_id', string='Mail Schedule',
-        default=_default_event_mail_type_ids)
-    # ticket reports
-    ticket_instructions = fields.Html('Ticket Instructions', translate=True,
-        help="This information will be printed on your tickets.")
-
-    @api.depends('has_seats_limitation')
-    def _compute_seats_max(self):
-        for template in self:
-            if not template.has_seats_limitation:
-                template.seats_max = 0
-
-
 class EventEvent(models.Model):
     """Event"""
     _name = 'event.event'
     _description = 'Event'
     _inherit = ['mail.thread', 'mail.activity.mixin']
-    _order = 'date_begin'
+    _order = 'date_begin, id'
+
+    # Maximum number of tickets that can be ordered at one time on a same line
+    EVENT_MAX_TICKETS = 30
 
     @api.model
-    def default_get(self, fields_list):
-        result = super().default_get(fields_list)
-        if 'date_begin' in fields_list and 'date_begin' not in result:
-            now = fields.Datetime.now()
+    def default_get(self, fields):
+        result = super().default_get(fields)
+        if 'date_begin' in fields and 'date_begin' not in result:
+            now = Datetime.now()
             # Round the datetime to the nearest half hour (e.g. 08:17 => 08:30 and 08:37 => 09:00)
             result['date_begin'] = now.replace(second=0, microsecond=0) + timedelta(minutes=-now.minute % 30)
-        if 'date_end' in fields_list and 'date_end' not in result and result.get('date_begin'):
+        if 'date_end' in fields and 'date_end' not in result and result.get('date_begin'):
             result['date_end'] = result['date_begin'] + timedelta(days=1)
         return result
 
+    def get_kiosk_url(self):
+        return self.get_base_url() + "/odoo/registration-desk"
+
     def _get_default_stage_id(self):
         return self.env['event.stage'].search([], limit=1)
 
@@ -112,6 +63,13 @@ class EventEvent(models.Model):
     def _default_event_mail_ids(self):
         return self.env['event.type']._default_event_mail_type_ids()
 
+    @api.model
+    def _lang_get(self):
+        return self.env['res.lang'].get_installed()
+
+    def _default_question_ids(self):
+        return self.env['event.type']._default_question_ids()
+
     name = fields.Char(string='Event', translate=True, required=True)
     note = fields.Html(string='Note', store=True, compute="_compute_note", readonly=False)
     description = fields.Html(string='Description', translate=html_translate, sanitize_attributes=False, sanitize_form=False, default=_default_description)
@@ -119,6 +77,7 @@ class EventEvent(models.Model):
     user_id = fields.Many2one(
         'res.users', string='Responsible', tracking=True,
         default=lambda self: self.env.user)
+    use_barcode = fields.Boolean(compute='_compute_use_barcode')
     company_id = fields.Many2one(
         'res.company', string='Company', change_default=True,
         default=lambda self: self.env.company,
@@ -126,30 +85,34 @@ class EventEvent(models.Model):
     organizer_id = fields.Many2one(
         'res.partner', string='Organizer', tracking=True,
         default=lambda self: self.env.company.partner_id,
-        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]")
-    event_type_id = fields.Many2one('event.type', string='Template', ondelete='set null')
+        check_company=True)
+    event_type_id = fields.Many2one(
+        'event.type', string='Template', ondelete='set null',
+        help="Choose a template to auto-fill tickets, communications, descriptions and other fields.")
     event_mail_ids = fields.One2many(
         'event.mail', 'event_id', string='Mail Schedule', copy=True,
         compute='_compute_event_mail_ids', readonly=False, store=True)
     tag_ids = fields.Many2many(
         'event.tag', string="Tags", readonly=False,
         store=True, compute="_compute_tag_ids")
+    # properties
+    registration_properties_definition = fields.PropertiesDefinition('Registration Properties')
     # Kanban fields
-    kanban_state = fields.Selection([('normal', 'In Progress'), ('done', 'Done'), ('blocked', 'Blocked')], default='normal', copy=False)
-    kanban_state_label = fields.Char(
-        string='Kanban State Label', compute='_compute_kanban_state_label',
-        store=True, tracking=True)
+    kanban_state = fields.Selection([
+        ('normal', 'In Progress'),
+        ('done', 'Ready for Next Stage'),
+        ('blocked', 'Blocked'),
+        ('cancel', 'Cancelled')
+    ], default='normal', copy=False, compute='_compute_kanban_state', readonly=False, store=True, tracking=True)
     stage_id = fields.Many2one(
         'event.stage', ondelete='restrict', default=_get_default_stage_id,
-        group_expand='_read_group_stage_ids', tracking=True, copy=False)
-    legend_blocked = fields.Char(related='stage_id.legend_blocked', string='Kanban Blocked Explanation', readonly=True)
-    legend_done = fields.Char(related='stage_id.legend_done', string='Kanban Valid Explanation', readonly=True)
-    legend_normal = fields.Char(related='stage_id.legend_normal', string='Kanban Ongoing Explanation', readonly=True)
+        group_expand='_read_group_expand_full', tracking=True, copy=False)
     # Seats and computation
     seats_max = fields.Integer(
         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.")
+        help="For each event you can define a maximum registration of seats(number of attendees), above this number the registrations are not accepted. "
+        "If the event has multiple slots, this maximum number is applied per slot.")
     seats_limited = fields.Boolean('Limit Attendees', required=True, compute='_compute_seats_limited',
                                    precompute=True, readonly=False, store=True)
     seats_reserved = fields.Integer(
@@ -158,23 +121,23 @@ class EventEvent(models.Model):
     seats_available = fields.Integer(
         string='Available Seats',
         store=False, readonly=True, compute='_compute_seats')
-    seats_unconfirmed = fields.Integer(
-        string='Unconfirmed Registrations',
-        store=False, readonly=True, compute='_compute_seats')
     seats_used = fields.Integer(
         string='Number of Attendees',
         store=False, readonly=True, compute='_compute_seats')
-    seats_expected = fields.Integer(
-        string='Number of Expected Attendees',
+    seats_taken = fields.Integer(
+        string='Number of Taken Seats',
         store=False, readonly=True, compute='_compute_seats')
     # Registration fields
-    auto_confirm = fields.Boolean(
-        string='Autoconfirmation', compute='_compute_auto_confirm', readonly=False, store=True,
-        help='Autoconfirm Registrations. Registrations will automatically be confirmed upon creation.')
     registration_ids = fields.One2many('event.registration', 'event_id', string='Attendees')
+    is_multi_slots = fields.Boolean("Is Multi Slots", copy=True,
+        help="Allow multiple time slots. "
+        "The communications, the maximum number of attendees and the maximum number of tickets registrations "
+        "are defined for each time slot instead of the whole event.")
+    event_slot_ids = fields.One2many("event.slot", "event_id", "Slots", copy=True)
+    event_slot_count = fields.Integer("Slots Count", compute="_compute_event_slot_count")
     event_ticket_ids = fields.One2many(
         'event.event.ticket', 'event_id', string='Event Ticket', copy=True,
-        compute='_compute_event_ticket_ids', readonly=False, store=True)
+        compute='_compute_event_ticket_ids', readonly=False, store=True, precompute=True)
     event_registrations_started = fields.Boolean(
         'Registrations started', compute='_compute_event_registrations_started',
         help="registrations have started if the current datetime is after the earliest starting date of tickets."
@@ -182,7 +145,7 @@ class EventEvent(models.Model):
     event_registrations_open = fields.Boolean(
         'Registration open', compute='_compute_event_registrations_open', compute_sudo=True,
         help="Registrations are open if:\n"
-        "- the event is not ended\n"
+        "- the event is not ended or not cancelled\n"
         "- there are seats available on event\n"
         "- the tickets are sellable (if ticketing is used)")
     event_registrations_sold_out = fields.Boolean(
@@ -191,7 +154,6 @@ class EventEvent(models.Model):
     start_sale_datetime = fields.Datetime(
         'Start sale date', compute='_compute_start_sale_date',
         help='If ticketing is used, contains the earliest starting sale date of tickets.')
-
     # Date fields
     date_tz = fields.Selection(
         _tz_get, string='Display Timezone', required=True,
@@ -200,15 +162,15 @@ class EventEvent(models.Model):
     date_begin = fields.Datetime(string='Start Date', required=True, tracking=True,
         help="When the event is scheduled to take place (expressed in your local timezone on the form view).")
     date_end = fields.Datetime(string='End Date', required=True, tracking=True)
-    date_begin_located = fields.Char(string='Start Date Located', compute='_compute_date_begin_tz')
-    date_end_located = fields.Char(string='End Date Located', compute='_compute_date_end_tz')
     is_ongoing = fields.Boolean('Is Ongoing', compute='_compute_is_ongoing', search='_search_is_ongoing')
     is_one_day = fields.Boolean(compute='_compute_field_is_one_day')
     is_finished = fields.Boolean(compute='_compute_is_finished', search='_search_is_finished')
     # Location and communication
     address_id = fields.Many2one(
         'res.partner', string='Venue', default=lambda self: self.env.company.partner_id.id,
-        tracking=True, domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]")
+        check_company=True,
+        tracking=True
+    )
     address_search = fields.Many2one(
         'res.partner', string='Address', compute='_compute_address_search', search='_search_address_search')
     address_inline = fields.Char(
@@ -216,30 +178,83 @@ class EventEvent(models.Model):
         compute_sudo=True)
     country_id = fields.Many2one(
         'res.country', 'Country', related='address_id.country_id', readonly=False, store=True)
+    event_url = fields.Char(
+        string='Online Event URL', compute='_compute_event_url', readonly=False, store=True,
+        help="Link where the online event will take place.",
+    )
+    event_share_url = fields.Char(string='Event Share URL', compute='_compute_event_share_url')
+    lang = fields.Selection(_lang_get, string='Language',
+        help="All the communication emails sent to attendees will be translated in this language.")
     # ticket reports
+    badge_format = fields.Selection(
+        string='Badge Dimension',
+        selection=[
+            ('A4_french_fold', 'A4 foldable'),
+            ('A6', 'A6'),
+            ('four_per_sheet', '4 per sheet'),
+        ], default='A6', required=True)
+    badge_image = fields.Image('Badge Background', max_width=1024, max_height=1024)
     ticket_instructions = fields.Html('Ticket Instructions', translate=True,
         compute='_compute_ticket_instructions', store=True, readonly=False,
         help="This information will be printed on your tickets.")
+    # questions
+    question_ids = fields.Many2many('event.question', 'event_event_event_question_rel',
+        string='Questions', compute='_compute_question_ids', readonly=False, store=True, precompute=True)
+    general_question_ids = fields.Many2many('event.question', 'event_event_event_question_rel',
+        string='General Questions', domain=[('once_per_order', '=', True)])
+    specific_question_ids = fields.Many2many('event.question', 'event_event_event_question_rel',
+        string='Specific Questions', domain=[('once_per_order', '=', False)])
 
-    @api.depends('stage_id', 'kanban_state')
-    def _compute_kanban_state_label(self):
+    def _compute_use_barcode(self):
+        use_barcode = self.env['ir.config_parameter'].sudo().get_param('event.use_event_barcode') == 'True'
+        for record in self:
+            record.use_barcode = use_barcode
+
+    def _compute_event_share_url(self):
+        """Get the URL to use to redirect to the event, overriden in website for fallback."""
         for event in self:
-            if event.kanban_state == 'normal':
-                event.kanban_state_label = event.stage_id.legend_normal
-            elif event.kanban_state == 'blocked':
-                event.kanban_state_label = event.stage_id.legend_blocked
-            else:
-                event.kanban_state_label = event.stage_id.legend_done
+            event.event_share_url = event.event_url
 
-    @api.depends('seats_max', 'registration_ids.state', 'registration_ids.active')
+    @api.depends('event_type_id')
+    def _compute_question_ids(self):
+        """ Update event questions from its event type. Depends are set only on
+        event_type_id itself to emulate an onchange. Changing event type content
+        itself should not trigger this method.
+
+        When synchronizing questions:
+
+          * lines with no registered answers for the event are removed;
+          * type lines are added;
+        """
+        for event in self:
+            questions_tokeep_ids = []
+            if self._origin.question_ids:
+                # Keep questions with attendee answers for the event.
+                questions_tokeep_ids.extend(
+                    (event.registration_ids.registration_answer_ids.question_id & self._origin.question_ids).ids
+                )
+
+            if not event.event_type_id and not questions_tokeep_ids:
+                event.question_ids = self._default_question_ids()
+                continue
+
+            if questions_tokeep_ids:
+                questions_toremove = event._origin.question_ids.filtered(
+                    lambda question: question.id not in questions_tokeep_ids)
+                command = [(3, question.id) for question in questions_toremove]
+            else:
+                command = [(5, 0)]
+            event.question_ids = command
+            event.question_ids = [Command.link(question_id.id) for question_id in event.event_type_id.question_ids]
+
+    @api.depends('event_slot_count', 'is_multi_slots', 'seats_max', 'registration_ids.state', 'registration_ids.active')
     def _compute_seats(self):
-        """ Determine reserved, available, reserved but unconfirmed and used seats. """
+        """ Determine available, reserved, used and taken seats. """
         # initialize fields to 0
         for event in self:
-            event.seats_unconfirmed = event.seats_reserved = event.seats_used = event.seats_available = 0
+            event.seats_reserved = event.seats_used = event.seats_available = 0
         # aggregate registrations by event and by state
         state_field = {
-            'draft': 'seats_unconfirmed',
             'open': 'seats_reserved',
             'done': 'seats_used',
         }
@@ -248,22 +263,23 @@ class EventEvent(models.Model):
         if self.ids:
             query = """ SELECT event_id, state, count(event_id)
                         FROM event_registration
-                        WHERE event_id IN %s AND state IN ('draft', 'open', 'done') AND active = true
+                        WHERE event_id IN %s AND state IN ('open', 'done') AND active = true
                         GROUP BY event_id, state
                     """
             self.env['event.registration'].flush_model(['event_id', 'state', 'active'])
-            self._cr.execute(query, (tuple(self.ids),))
-            res = self._cr.fetchall()
+            self.env.cr.execute(query, (tuple(self.ids),))
+            res = self.env.cr.fetchall()
             for event_id, state, num in res:
                 results[event_id][state_field[state]] = num
 
         # compute seats_available and expected
         for event in self:
             event.update(results.get(event._origin.id or event.id, base_vals))
-            if event.seats_max > 0:
-                event.seats_available = event.seats_max - (event.seats_reserved + event.seats_used)
+            seats_max = event.seats_max * event.event_slot_count if event.is_multi_slots else event.seats_max
+            if seats_max > 0:
+                event.seats_available = seats_max - (event.seats_reserved + event.seats_used)
 
-            event.seats_expected = event.seats_unconfirmed + event.seats_reserved + event.seats_used
+            event.seats_taken = event.seats_reserved + event.seats_used
 
     @api.depends('date_tz', 'start_sale_datetime')
     def _compute_event_registrations_started(self):
@@ -281,6 +297,7 @@ class EventEvent(models.Model):
     def _compute_event_registrations_open(self):
         """ Compute whether people may take registrations for this event
 
+          * for cancelled events, registrations are not open;
           * event.date_end -> if event is done, registrations are not open anymore;
           * event.start_sale_datetime -> lowest start date of tickets (if any; start_sale_datetime
             is False if no ticket are defined, see _compute_start_sale_date);
@@ -291,10 +308,29 @@ class EventEvent(models.Model):
             event = event._set_tz_context()
             current_datetime = fields.Datetime.context_timestamp(event, fields.Datetime.now())
             date_end_tz = event.date_end.astimezone(pytz.timezone(event.date_tz or 'UTC')) if event.date_end else False
-            event.event_registrations_open = event.event_registrations_started and \
+            event.event_registrations_open = event.kanban_state != 'cancel' and \
+                event.event_registrations_started and \
                 (date_end_tz >= current_datetime if date_end_tz else True) and \
                 (not event.seats_limited or not event.seats_max or event.seats_available) and \
-                (not event.event_ticket_ids or any(ticket.sale_available for ticket in event.event_ticket_ids))
+                (
+                    # Not multi slots: open if no tickets or at least a sale available ticket
+                    (not event.is_multi_slots and
+                        (not event.event_ticket_ids or any(ticket.sale_available for ticket in event.event_ticket_ids)))
+                    or
+                    # Multi slots: open if at least a slot and no tickets or at least an ongoing ticket with availability
+                    (event.is_multi_slots and event.event_slot_count and (
+                        not event.event_ticket_ids or any(
+                            ticket.is_launched and not ticket.is_expired and (
+                                any(availability is None or availability > 0
+                                    for availability in event._get_seats_availability([
+                                        (slot, ticket)
+                                        for slot in event.event_slot_ids
+                                    ])
+                                )
+                            ) for ticket in event.event_ticket_ids
+                        )
+                    ))
+                )
 
     @api.depends('event_ticket_ids.start_sale_datetime')
     def _compute_start_sale_date(self):
@@ -304,38 +340,32 @@ class EventEvent(models.Model):
             start_dates = [ticket.start_sale_datetime for ticket in event.event_ticket_ids if not ticket.is_expired]
             event.start_sale_datetime = min(start_dates) if start_dates and all(start_dates) else False
 
-    @api.depends('event_ticket_ids.sale_available', 'seats_available', 'seats_limited')
+    @api.depends('event_slot_ids', 'event_ticket_ids.sale_available', 'seats_available', 'seats_limited')
     def _compute_event_registrations_sold_out(self):
         """Note that max seats limits for events and sum of limits for all its tickets may not be
         equal to enable flexibility.
         E.g. max 20 seats for ticket A, 20 seats for ticket B
             * With max 20 seats for the event
             * Without limit set on the event (=40, but the customer didn't explicitly write 40)
+        When the event is multi slots, instead of checking if every tickets is sold out,
+        checking if every slot-ticket combination is sold out.
         """
         for event in self:
             event.event_registrations_sold_out = (
-                (event.seats_limited and event.seats_max and not event.seats_available)
-                or (event.event_ticket_ids and all(ticket.is_sold_out for ticket in event.event_ticket_ids))
+                (event.seats_limited and event.seats_max and not event.seats_available > 0)
+                or (event.event_ticket_ids and (
+                    not any(availability is None or availability > 0
+                        for availability in event._get_seats_availability([
+                            (slot, ticket)
+                            for slot in event.event_slot_ids
+                            for ticket in event.event_ticket_ids
+                        ])
+                    )
+                    if event.is_multi_slots else
+                    all(ticket.is_sold_out for ticket in event.event_ticket_ids)
+                ))
             )
 
-    @api.depends('date_tz', 'date_begin')
-    def _compute_date_begin_tz(self):
-        for event in self:
-            if event.date_begin:
-                event.date_begin_located = format_datetime(
-                    self.env, event.date_begin, tz=event.date_tz, dt_format='medium')
-            else:
-                event.date_begin_located = False
-
-    @api.depends('date_tz', 'date_end')
-    def _compute_date_end_tz(self):
-        for event in self:
-            if event.date_end:
-                event.date_end_located = format_datetime(
-                    self.env, event.date_end, tz=event.date_tz, dt_format='medium')
-            else:
-                event.date_end_located = False
-
     @api.depends('date_begin', 'date_end')
     def _compute_is_ongoing(self):
         now = fields.Datetime.now()
@@ -343,17 +373,10 @@ class EventEvent(models.Model):
             event.is_ongoing = event.date_begin <= now < event.date_end
 
     def _search_is_ongoing(self, operator, value):
-        if operator not in ['=', '!=']:
-            raise UserError(_('This operator is not supported'))
-        if not isinstance(value, bool):
-            raise UserError(_('Value should be True or False (not %s)') % value)
+        if operator != 'in':
+            return NotImplemented
         now = fields.Datetime.now()
-        if (operator == '=' and value) or (operator == '!=' and not value):
-            domain = [('date_begin', '<=', now), ('date_end', '>', now)]
-        else:
-            domain = ['|', ('date_begin', '>', now), ('date_end', '<=', now)]
-        event_ids = self.env['event.event']._search(domain)
-        return [('id', 'in', event_ids)]
+        return [('date_begin', '<=', now), ('date_end', '>', now)]
 
     @api.depends('date_begin', 'date_end', 'date_tz')
     def _compute_field_is_one_day(self):
@@ -377,17 +400,9 @@ class EventEvent(models.Model):
             event.is_finished = datetime_end <= current_datetime
 
     def _search_is_finished(self, operator, value):
-        if operator not in ['=', '!=']:
-            raise ValueError(_('This operator is not supported'))
-        if not isinstance(value, bool):
-            raise ValueError(_('Value should be True or False (not %s)'), value)
-        now = fields.Datetime.now()
-        if (operator == '=' and value) or (operator == '!=' and not value):
-            domain = [('date_end', '<=', now)]
-        else:
-            domain = [('date_end', '>', now)]
-        event_ids = self.env['event.event']._search(domain)
-        return [('id', 'in', event_ids)]
+        if operator != 'in':
+            return NotImplemented
+        return [('date_end', '<=', fields.Datetime.now())]
 
     @api.depends('event_type_id')
     def _compute_date_tz(self):
@@ -397,26 +412,36 @@ class EventEvent(models.Model):
             if not event.date_tz:
                 event.date_tz = self.env.user.tz or 'UTC'
 
+    @api.depends("event_slot_ids")
+    def _compute_event_slot_count(self):
+        slot_count_per_event = dict(self.env['event.slot']._read_group(
+            domain=[('event_id', 'in', self.ids)],
+            groupby=['event_id'],
+            aggregates=['__count']
+        ))
+        for event in self:
+            event.event_slot_count = slot_count_per_event.get(event, 0)
+
     @api.depends('address_id')
     def _compute_address_search(self):
         for event in self:
             event.address_search = event.address_id
 
     def _search_address_search(self, operator, value):
-        if operator != 'ilike' or not isinstance(value, str):
-            raise NotImplementedError(_('Operation not supported.'))
-
-        address_ids = self.env['res.partner']._search([
-            '|', '|', '|', '|', '|',
-            ('street', 'ilike', value),
-            ('street2', 'ilike', value),
-            ('city', 'ilike', value),
-            ('zip', 'ilike', value),
-            ('state_id', 'ilike', value),
-            ('country_id', 'ilike', value),
-        ])
-
-        return [('address_id', 'in', address_ids)]
+        def make_codomain(value):
+            return Domain.OR(
+                Domain(field, 'ilike', value)
+                for field in ('name', 'street', 'street2', 'city', 'zip', 'state_id', 'country_id')
+            )
+        if isinstance(value, Domain):
+            domain = value.map_conditions(lambda cond: cond if cond.field_expr != 'display_name' else make_codomain(cond.value))
+            return Domain('address_id', operator, domain)
+        if operator == 'ilike' and isinstance(value, str):
+            return Domain('address_id', 'any', make_codomain(value))
+        # for the trivial "empty" case, there is no empty address
+        if operator == 'in' and (not value or not any(value)):
+            return Domain(False)
+        return NotImplemented
 
     # seats
 
@@ -444,15 +469,6 @@ class EventEvent(models.Model):
             if not event.seats_limited:
                 event.seats_limited = False
 
-    @api.depends('event_type_id')
-    def _compute_auto_confirm(self):
-        """ Update event configuration from its event type. Depends are set only
-        on event_type_id itself, not its sub fields. Purpose is to emulate an
-        onchange: if event type is changed, update event configuration. Changing
-        event type content itself should not trigger this method. """
-        for event in self:
-            event.auto_confirm = event.event_type_id.auto_confirm
-
     @api.depends('event_type_id')
     def _compute_event_mail_ids(self):
         """ Update event configuration from its event type. Depends are set only
@@ -478,11 +494,11 @@ class EventEvent(models.Model):
 
             # lines to add: those which do not have the exact copy available in lines to keep
             if event.event_type_id.event_type_mail_ids:
-                mails_to_keep_vals = {mail._prepare_event_mail_values() for mail in event.event_mail_ids - mails_to_remove}
+                mails_to_keep_vals = {frozendict(mail._prepare_event_mail_values()) for mail in event.event_mail_ids - mails_to_remove}
                 for mail in event.event_type_id.event_type_mail_ids:
-                    mail_values = mail._prepare_event_mail_values()
+                    mail_values = frozendict(mail._prepare_event_mail_values())
                     if mail_values not in mails_to_keep_vals:
-                        command.append(Command.create(mail_values._asdict()))
+                        command.append(Command.create(mail_values))
             if command:
                 event.event_mail_ids = command
 
@@ -534,6 +550,12 @@ class EventEvent(models.Model):
             if event.event_type_id and not is_html_empty(event.event_type_id.note):
                 event.note = event.event_type_id.note
 
+    @api.depends('stage_id')
+    def _compute_kanban_state(self):
+        for task in self:
+            if task.kanban_state != 'cancel':
+                task.kanban_state = 'normal'
+
     @api.depends('event_type_id')
     def _compute_ticket_instructions(self):
         for event in self:
@@ -553,17 +575,34 @@ class EventEvent(models.Model):
             else:
                 event.address_inline = event.address_id.name or ''
 
-    @api.constrains('seats_max', 'seats_limited', 'registration_ids')
-    def _check_seats_availability(self, minimal_availability=0):
-        sold_out_events = []
-        for event in self:
-            if event.seats_limited and event.seats_max and event.seats_available < minimal_availability:
-                sold_out_events.append(
-                    (_('- "%(event_name)s": Missing %(nb_too_many)i seats.',
-                        event_name=event.name, nb_too_many=-event.seats_available)))
-        if sold_out_events:
-            raise ValidationError(_('There are not enough seats available for:')
-                                  + '\n%s\n' % '\n'.join(sold_out_events))
+    @api.depends('address_id')
+    def _compute_event_url(self):
+        """Reset url field as it should only be used for events with no physical location."""
+        self.filtered('address_id').event_url = ''
+
+    @api.constrains("date_begin", "date_end", "event_slot_ids", "is_multi_slots")
+    def _check_slots_dates(self):
+        multi_slots_event_ids = self.filtered(lambda event: event.is_multi_slots).ids
+        if not multi_slots_event_ids:
+            return
+        min_max_slot_dates_per_event = {
+            event: (min_start, max_end)
+            for event, min_start, max_end in self.env['event.slot']._read_group(
+                domain=[('event_id', 'in', multi_slots_event_ids)],
+                groupby=['event_id'],
+                aggregates=['start_datetime:min', 'end_datetime:max']
+            )
+        }
+        events_w_slots_outside_bounds = []
+        for event, (min_start, max_end) in min_max_slot_dates_per_event.items():
+            if (not (event.date_begin <= min_start <= event.date_end) or
+                not (event.date_begin <= max_end <= event.date_end)):
+                events_w_slots_outside_bounds.append(event)
+        if events_w_slots_outside_bounds:
+            raise ValidationError(_(
+                "These events cannot have slots scheduled outside of their time range:\n%(event_names)s",
+                event_names="\n".join(f"- {event.name}" for event in events_w_slots_outside_bounds)
+            ))
 
     @api.constrains('date_begin', 'date_end')
     def _check_closing_date(self):
@@ -571,33 +610,40 @@ class EventEvent(models.Model):
             if event.date_end < event.date_begin:
                 raise ValidationError(_('The closing date cannot be earlier than the beginning date.'))
 
-    @api.model
-    def _read_group_stage_ids(self, stages, domain, order):
-        return self.env['event.stage'].search([])
+    @api.constrains('event_url')
+    def _check_event_url(self):
+        for event in self.filtered('event_url'):
+            url = urlparse(event.event_url)
+            if not (url.scheme and url.netloc):
+                raise ValidationError(_('Please enter a valid event URL.'))
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        events = super(EventEvent, self).create(vals_list)
-        for res in events:
-            if res.organizer_id:
-                res.message_subscribe([res.organizer_id.id])
-        self.env.flush_all()
-        return events
+    @api.onchange('event_url')
+    def _onchange_event_url(self):
+        """Correct the url by adding scheme if it is missing."""
+        for event in self.filtered('event_url'):
+            parsed_url = urlparse(event.event_url)
+            if parsed_url.scheme not in ('http', 'https'):
+                event.event_url = 'https://' + event.event_url
 
-    def write(self, vals):
-        if 'stage_id' in vals and 'kanban_state' not in vals:
-            # reset kanban state when changing stage
-            vals['kanban_state'] = 'normal'
-        res = super(EventEvent, self).write(vals)
-        if vals.get('organizer_id'):
-            self.message_subscribe([vals['organizer_id']])
-        return res
+    @api.onchange('seats_max')
+    def _onchange_seats_max(self):
+        for event in self:
+            if event.seats_limited and event.seats_max and event.seats_available <= 0 and \
+                (event.event_slot_ids if event.is_multi_slots else True):
+                return {
+                    'warning': {
+                        'title': _("Update the limit of registrations?"),
+                        'message': _("There are more registrations than this limit, "
+                                    "the event will be sold out and the extra registrations will remain."),
+                    }
+                }
 
-    def name_get(self):
+    @api.depends('event_registrations_sold_out', 'seats_limited', 'seats_max', 'seats_available')
+    @api.depends_context('name_with_seats_availability')
+    def _compute_display_name(self):
         """Adds ticket seats availability if requested by context."""
         if not self.env.context.get('name_with_seats_availability'):
-            return super().name_get()
-        res = []
+            return super()._compute_display_name()
         for event in self:
             # event or its tickets are sold out
             if event.event_registrations_sold_out:
@@ -610,32 +656,133 @@ class EventEvent(models.Model):
                 )
             else:
                 name = event.name
-            res.append((event.id, name))
-        return res
+            event.display_name = name
 
-    @api.returns('self', lambda value: value.id)
-    def copy(self, default=None):
-        self.ensure_one()
-        default = dict(default or {}, name=_("%s (copy)") % (self.name))
-        return super(EventEvent, self).copy(default)
+    def copy_data(self, default=None):
+        vals_list = super().copy_data(default=default)
+        return [dict(vals, name=self.env._("%s (copy)", event.name)) for event, vals in zip(self, vals_list)]
 
-    @api.model
-    def _get_mail_message_access(self, res_ids, operation, model_name=None):
-        if (
-            operation == 'create'
-            and self.env.user.has_group('event.group_event_registration_desk')
-            and (not model_name or model_name == 'event.event')
-        ):
+    def _mail_get_operation_for_mail_message_operation(self, message_operation):
+        if (message_operation == 'create' and self.env.user.has_group('event.group_event_registration_desk')):
             # allow the registration desk users to post messages on Event
             # can not be done with "_mail_post_access" otherwise public user will be
             # able to post on published Event (see website_event)
-            return 'read'
-        return super(EventEvent, self)._get_mail_message_access(res_ids, operation, model_name)
+            return dict.fromkeys(self, 'read')
+        return super()._mail_get_operation_for_mail_message_operation(message_operation)
 
     def _set_tz_context(self):
         self.ensure_one()
         return self.with_context(tz=self.date_tz or 'UTC')
 
+    def _get_seats_availability(self, slot_tickets):
+        """ Get availabilities for given combinations of slot / ticket. Returns
+        a list following input order. None denotes no limit. """
+        self.ensure_one()
+        if not (all(len(item) == 2 for item in slot_tickets)):
+            raise ValueError('Input should be a list of tuples containing slot, ticket')
+
+        if any(slot for (slot, _ticket) in slot_tickets):
+            slot_tickets_nb_registrations = {
+                (slot.id, ticket.id): count
+                for (slot, ticket, count) in self.env['event.registration'].sudo()._read_group(
+                    domain=[('event_slot_id', '!=', False), ('event_id', 'in', self.ids),
+                            ('state', 'in', ['open', 'done']), ('active', '=', True)],
+                    groupby=['event_slot_id', 'event_ticket_id'],
+                    aggregates=['__count']
+                )
+            }
+
+        availabilities = []
+        for slot, ticket in slot_tickets:
+            available = None
+            # event is constrained: max stands for either each slot, either global (no slots)
+            if self.seats_limited and self.seats_max:
+                if slot:
+                    available = slot.seats_available
+                else:
+                    available = self.seats_available
+            # ticket is constrained: max standard for either each slot / ticket, either global (no slots)
+            if available != 0 and ticket and ticket.seats_max:
+                if slot:
+                    ticket_available = ticket.seats_max - slot_tickets_nb_registrations.get((slot.id, ticket.id), 0)
+                else:
+                    ticket_available = ticket.seats_available
+                available = ticket_available if available is None else min(available, ticket_available)
+            availabilities.append(available)
+        return availabilities
+
+    def _verify_seats_availability(self, slot_tickets):
+        """ Check event seats availability, for combinations of slot / ticket.
+
+        :param slot_tickets: a list of tuples(slot, ticket, count). Slot and
+          ticket are optional, depending on event configuration. If count is 0
+          it is a simple check current values do not overflow limit. If count
+          is given, it serves as a check there are enough remaining seats.
+        :raises ValidationError: if the event / slot / ticket do not have
+          enough available seats
+        """
+        self.ensure_one()
+        if not (all(len(item) == 3 for item in slot_tickets)):
+            raise ValueError('Input should be a list of tuples containing slot, ticket, count')
+
+        sold_out = []
+        availabilities = self._get_seats_availability([(item[0], item[1]) for item in slot_tickets])
+        for (slot, ticket, count), available in zip(slot_tickets, availabilities, strict=True):
+            if available is None:  # unconstrained
+                continue
+            if available < count:
+                if slot and ticket:
+                    name = f'{ticket.name} - {slot.display_name}'
+                elif slot:
+                    name = slot.display_name
+                elif ticket:
+                    name = ticket.name
+                else:
+                    name = self.name
+                sold_out.append((name, count - available))
+
+        if sold_out:
+            info = []  # note: somehow using list comprehension make translate.py crash in default lang
+            for item in sold_out:
+                info.append(_('%(slot_name)s: missing %(count)s seat(s)', slot_name=item[0], count=item[1]))
+            raise ValidationError(
+                _('There are not enough seats available for %(event_name)s:\n%(sold_out_info)s',
+                  event_name=self.name,
+                  sold_out_info='\n'.join(info),
+                )
+            )
+
+    # ------------------------------------------------------------
+    # ACTIONS
+    # ------------------------------------------------------------
+
+    def action_open_slot_calendar(self):
+        self.ensure_one()
+        now = datetime.now().astimezone(pytz.timezone(self.env.user.tz or 'UTC'))
+        next_hour = now + timedelta(hours=1)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Slots'),
+            'view_mode': 'calendar,list,form',
+            'mobile_view_mode': 'list',
+            'res_model': 'event.slot',
+            'target': 'current',
+            'domain': [('event_id', '=', self.id)],
+            'context': {
+                'default_event_id': self.id,
+                # Default hours for the list view and mobile quick create.
+                # Desktop calendar multi create using defaults in local storage
+                # (= the last selected time range or fallback on 12PM-1PM).
+                'default_start_hour': next_hour.hour,
+                'default_end_hour': (next_hour + timedelta(hours=1)).hour,
+                # To disable calendar days outside of event date range.
+                'event_calendar_range_start_date': self.date_begin.astimezone(pytz.timezone(self.date_tz)).date(),
+                'event_calendar_range_end_date': self.date_end.astimezone(pytz.timezone(self.date_tz)).date(),
+                # Calendar view initial date.
+                'initial_date': min(max(datetime.now(), self.date_begin), self.date_end),
+            },
+        }
+
     def action_set_done(self):
         """
         Action which will move the events
@@ -646,13 +793,46 @@ class EventEvent(models.Model):
         if first_ended_stage:
             self.write({'stage_id': first_ended_stage.id})
 
-    def mail_attendees(self, template_id, force_send=False, filter_func=lambda self: self.state != 'cancel'):
-        for event in self:
-            for attendee in event.registration_ids.filtered(filter_func):
-                self.env['mail.template'].browse(template_id).send_mail(attendee.id, force_send=force_send)
+    def _get_date_range_str(self, start_datetime=False, lang_code=False):
+        self.ensure_one()
+        datetime = start_datetime or self.date_begin
+        today_tz = pytz.utc.localize(fields.Datetime.now()).astimezone(pytz.timezone(self.date_tz))
+        event_date_tz = pytz.utc.localize(datetime).astimezone(pytz.timezone(self.date_tz))
+        diff = (event_date_tz.date() - today_tz.date())
+        if diff.days <= 0:
+            return _('today')
+        if diff.days == 1:
+            return _('tomorrow')
+        if (diff.days < 7):
+            return _('in %d days', diff.days)
+        if (diff.days < 14):
+            return _('next week')
+        if event_date_tz.month == (today_tz + relativedelta(months=+1)).month:
+            return _('next month')
+        return _('on %(date)s', date=format_date(self.env, datetime, lang_code=lang_code, date_format='medium'))
 
-    def _get_ics_file(self):
+    def _get_external_description(self):
+        """
+        Description of the event shortened to maximum 1900 characters to
+        leave some space for addition by sub-modules.
+        Meant to be used for external content (ics/icalc/Gcal).
+
+        Reference Docs for URL limit -: https://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers
+        """
+        self.ensure_one()
+        description = ''
+        if self.event_share_url:
+            description = f'<a href="{escape(self.event_share_url)}">{escape(self.name)}</a>\n'
+        description += textwrap.shorten(html_to_inner_content(self.description), 1900)
+        return description
+
+    def _get_external_description_url_encoded(self):
+        """Get a url-encoded version of the description for mail templates."""
+        return urllib.parse.quote_plus(self._get_external_description())
+
+    def _get_ics_file(self, slot=False):
         """ Returns iCalendar file for the event invitation.
+            :param slot: If a slot is given, schedule with the given slot datetimes
             :returns a dict of .ics file content for each event
         """
         result = {}
@@ -662,17 +842,27 @@ class EventEvent(models.Model):
         for event in self:
             cal = vobject.iCalendar()
             cal_event = cal.add('vevent')
+            start = slot.start_datetime or event.date_begin
+            end = slot.end_datetime or event.date_end
 
             cal_event.add('created').value = fields.Datetime.now().replace(tzinfo=pytz.timezone('UTC'))
-            cal_event.add('dtstart').value = event.date_begin.astimezone(pytz.timezone(event.date_tz))
-            cal_event.add('dtend').value = event.date_end.astimezone(pytz.timezone(event.date_tz))
+            cal_event.add('dtstart').value = start.astimezone(pytz.timezone(event.date_tz))
+            cal_event.add('dtend').value = end.astimezone(pytz.timezone(event.date_tz))
             cal_event.add('summary').value = event.name
+            cal_event.add('description').value = event._get_external_description()
             if event.address_id:
                 cal_event.add('location').value = event.address_inline
 
             result[event.id] = cal.serialize().encode('utf-8')
         return result
 
+    def _get_tickets_access_hash(self, registration_ids):
+        """ Returns the ground truth hash for accessing the tickets in route /event/<int:event_id>/my_tickets.
+        The dl links are always made event-dependant, hence the method linked to the record in self.
+        """
+        self.ensure_one()
+        return tools.hmac(self.env(su=True), 'event-registration-ticket-report-access', (self.id, sorted(registration_ids)))
+
     @api.autovacuum
     def _gc_mark_events_done(self):
         """ move every ended events in the next 'ended stage' """

odoo-bringout-oca-ocb-event/event/models/event_mail.py

@@ -1,18 +1,14 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import logging
-import random
-import threading
 
-from collections import namedtuple
-from datetime import datetime
 from dateutil.relativedelta import relativedelta
+from markupsafe import Markup
 
-from odoo import api, fields, models, tools
+from odoo import api, fields, models, modules, tools
+from odoo.addons.base.models.ir_qweb import QWebError
 from odoo.tools import exception_to_unicode
 from odoo.tools.translate import _
-from odoo.exceptions import MissingError, ValidationError
 
 
 _logger = logging.getLogger(__name__)
@@ -26,51 +22,7 @@ _INTERVALS = {
 }
 
 
-class EventTypeMail(models.Model):
-    """ Template of event.mail to attach to event.type. Those will be copied
-    upon all events created in that type to ease event creation. """
-    _name = 'event.type.mail'
-    _description = 'Mail Scheduling on Event Category'
-
-    @api.model
-    def _selection_template_model(self):
-        return [('mail.template', 'Mail')]
-
-    event_type_id = fields.Many2one(
-        'event.type', string='Event Type',
-        ondelete='cascade', required=True)
-    notification_type = fields.Selection([('mail', 'Mail')], string='Send', default='mail', required=True)
-    interval_nbr = fields.Integer('Interval', default=1)
-    interval_unit = fields.Selection([
-        ('now', 'Immediately'),
-        ('hours', 'Hours'), ('days', 'Days'),
-        ('weeks', 'Weeks'), ('months', 'Months')],
-        string='Unit', default='hours', required=True)
-    interval_type = fields.Selection([
-        ('after_sub', 'After each registration'),
-        ('before_event', 'Before the event'),
-        ('after_event', 'After the event')],
-        string='Trigger', default="before_event", required=True)
-    template_model_id = fields.Many2one('ir.model', string='Template Model', compute='_compute_template_model_id', compute_sudo=True)
-    template_ref = fields.Reference(string='Template', selection='_selection_template_model', required=True)
-
-    @api.depends('notification_type')
-    def _compute_template_model_id(self):
-        mail_model = self.env['ir.model']._get('mail.template')
-        for mail in self:
-            mail.template_model_id = mail_model if mail.notification_type == 'mail' else False
-
-    def _prepare_event_mail_values(self):
-        self.ensure_one()
-        return namedtuple("MailValues", ['notification_type', 'interval_nbr', 'interval_unit', 'interval_type', 'template_ref'])(
-            self.notification_type,
-            self.interval_nbr,
-            self.interval_unit,
-            self.interval_type,
-            '%s,%i' % (self.template_ref._name, self.template_ref.id)
-        )
-
-class EventMailScheduler(models.Model):
+class EventMail(models.Model):
     """ Event automated mailing. This model replaces all existing fields and
     configuration allowing to send emails on events since Odoo 9. A cron exists
     that periodically checks for mailing to run. """
@@ -78,23 +30,8 @@ class EventMailScheduler(models.Model):
     _rec_name = 'event_id'
     _description = 'Event Automated Mailing'
 
-    @api.model
-    def _selection_template_model(self):
-        return [('mail.template', 'Mail')]
-
-    def _selection_template_model_get_mapping(self):
-        return {'mail': 'mail.template'}
-
-    @api.onchange('notification_type')
-    def set_template_ref_model(self):
-        mail_model = self.env['mail.template']
-        if self.notification_type == 'mail':
-            record = mail_model.search([('model', '=', 'event.registration')], limit=1)
-            self.template_ref = "{},{}".format('mail.template', record.id) if record else False
-
-    event_id = fields.Many2one('event.event', string='Event', required=True, ondelete='cascade')
+    event_id = fields.Many2one('event.event', string='Event', required=True, index=True, ondelete='cascade')
     sequence = fields.Integer('Display order')
-    notification_type = fields.Selection([('mail', 'Mail')], string='Send', default='mail', required=True)
     interval_nbr = fields.Integer('Interval', default=1)
     interval_unit = fields.Selection([
         ('now', 'Immediately'),
@@ -102,154 +39,426 @@ class EventMailScheduler(models.Model):
         ('weeks', 'Weeks'), ('months', 'Months')],
         string='Unit', default='hours', required=True)
     interval_type = fields.Selection([
+        # attendee based
         ('after_sub', 'After each registration'),
-        ('before_event', 'Before the event'),
-        ('after_event', 'After the event')],
-        string='Trigger ', default="before_event", required=True)
+        # event based: start date
+        ('before_event', 'Before the event starts'),
+        ('after_event_start', 'After the event started'),
+        # event based: end date
+        ('after_event', 'After the event ended'),
+        ('before_event_end', 'Before the event ends')],
+        string='Trigger ', default="before_event", required=True,
+        help="Indicates when the communication is sent. "
+        "If the event has multiple slots, the interval is related to each time slot instead of the whole event.")
     scheduled_date = fields.Datetime('Schedule Date', compute='_compute_scheduled_date', store=True)
+    error_datetime = fields.Datetime('Last Error')
     # contact and status
+    last_registration_id = fields.Many2one('event.registration', 'Last Attendee')
     mail_registration_ids = fields.One2many(
         'event.mail.registration', 'scheduler_id',
         help='Communication related to event registrations')
+    mail_slot_ids = fields.One2many(
+        'event.mail.slot', 'scheduler_id',
+        help='Slot-based communication')
     mail_done = fields.Boolean("Sent", copy=False, readonly=True)
     mail_state = fields.Selection(
-        [('running', 'Running'), ('scheduled', 'Scheduled'), ('sent', 'Sent')],
+        [('running', 'Running'), ('scheduled', 'Scheduled'), ('sent', 'Sent'), ('error', 'Error'), ('cancelled', 'Cancelled')],
         string='Global communication Status', compute='_compute_mail_state')
     mail_count_done = fields.Integer('# Sent', copy=False, readonly=True)
-    template_model_id = fields.Many2one('ir.model', string='Template Model', compute='_compute_template_model_id', compute_sudo=True)
-    template_ref = fields.Reference(string='Template', selection='_selection_template_model', required=True)
-
-    @api.depends('notification_type')
-    def _compute_template_model_id(self):
-        mail_model = self.env['ir.model']._get('mail.template')
-        for mail in self:
-            mail.template_model_id = mail_model if mail.notification_type == 'mail' else False
+    notification_type = fields.Selection([('mail', 'Mail')], string='Send', compute='_compute_notification_type')
+    template_ref = fields.Reference(string='Template', ondelete={'mail.template': 'cascade'}, required=True, selection=[('mail.template', 'Mail')])
 
     @api.depends('event_id.date_begin', 'event_id.date_end', 'interval_type', 'interval_unit', 'interval_nbr')
     def _compute_scheduled_date(self):
         for scheduler in self:
             if scheduler.interval_type == 'after_sub':
                 date, sign = scheduler.event_id.create_date, 1
-            elif scheduler.interval_type == 'before_event':
-                date, sign = scheduler.event_id.date_begin, -1
+            elif scheduler.interval_type in ('before_event', 'after_event_start'):
+                date, sign = scheduler.event_id.date_begin, scheduler.interval_type == 'before_event' and -1 or 1
             else:
-                date, sign = scheduler.event_id.date_end, 1
+                date, sign = scheduler.event_id.date_end, scheduler.interval_type == 'after_event' and 1 or -1
 
             scheduler.scheduled_date = date.replace(microsecond=0) + _INTERVALS[scheduler.interval_unit](sign * scheduler.interval_nbr) if date else False
 
-    @api.depends('interval_type', 'scheduled_date', 'mail_done')
+        next_schedule = self.filtered('scheduled_date').mapped('scheduled_date')
+        if next_schedule and (cron := self.env.ref('event.event_mail_scheduler', raise_if_not_found=False)):
+            cron._trigger(next_schedule)
+
+    @api.depends('error_datetime', 'interval_type', 'mail_done', 'event_id')
     def _compute_mail_state(self):
         for scheduler in self:
+            # issue detected
+            if scheduler.error_datetime:
+                scheduler.mail_state = 'error'
+            # event cancelled
+            elif not scheduler.mail_done and scheduler.event_id.kanban_state == 'cancel':
+                scheduler.mail_state = 'cancelled'
             # registrations based
-            if scheduler.interval_type == 'after_sub':
+            elif scheduler.interval_type == 'after_sub':
                 scheduler.mail_state = 'running'
             # global event based
             elif scheduler.mail_done:
                 scheduler.mail_state = 'sent'
-            elif scheduler.scheduled_date:
-                scheduler.mail_state = 'scheduled'
             else:
-                scheduler.mail_state = 'running'
+                scheduler.mail_state = 'scheduled'
 
-    @api.constrains('notification_type', 'template_ref')
-    def _check_template_ref_model(self):
-        model_map = self._selection_template_model_get_mapping()
-        for record in self.filtered('template_ref'):
-            model = model_map[record.notification_type]
-            if record.template_ref._name != model:
-                raise ValidationError(_('The template which is referenced should be coming from %(model_name)s model.', model_name=model))
+    @api.depends('template_ref')
+    def _compute_notification_type(self):
+        """Assigns the type of template in use, if any is set."""
+        self.notification_type = 'mail'
 
     def execute(self):
-        for scheduler in self:
-            now = fields.Datetime.now()
+        now = fields.Datetime.now()
+        for scheduler in self._filter_template_ref():
             if scheduler.interval_type == 'after_sub':
-                new_registrations = scheduler.event_id.registration_ids.filtered_domain(
-                    [('state', 'not in', ('cancel', 'draft'))]
-                ) - scheduler.mail_registration_ids.registration_id
-                scheduler._create_missing_mail_registrations(new_registrations)
-
-                # execute scheduler on registrations
-                scheduler.mail_registration_ids.execute()
-                total_sent = len(scheduler.mail_registration_ids.filtered(lambda reg: reg.mail_sent))
-                scheduler.update({
-                    'mail_done': total_sent >= (scheduler.event_id.seats_reserved + scheduler.event_id.seats_used),
-                    'mail_count_done': total_sent,
-                })
+                scheduler._execute_attendee_based()
+            elif scheduler.event_id.is_multi_slots:
+                scheduler._execute_slot_based()
             else:
-                # before or after event -> one shot email
-                if scheduler.mail_done or scheduler.notification_type != 'mail':
-                    continue
-                # no template -> ill configured, skip and avoid crash
-                if not scheduler.template_ref:
+                # before or after event -> one shot communication, once done skip
+                if scheduler.mail_done:
                     continue
                 # do not send emails if the mailing was scheduled before the event but the event is over
-                if scheduler.scheduled_date <= now and (scheduler.interval_type != 'before_event' or scheduler.event_id.date_end > now):
-                    scheduler.event_id.mail_attendees(scheduler.template_ref.id)
-                    # Mail is sent to all attendees (unconfirmed as well), so count all attendees
-                    scheduler.update({
-                        'mail_done': True,
-                        'mail_count_done': scheduler.event_id.seats_expected,
-                    })
+                if scheduler.scheduled_date <= now and (scheduler.interval_type not in ('before_event', 'after_event_start') or scheduler.event_id.date_end > now):
+                    scheduler._execute_event_based()
+            scheduler.error_datetime = False
         return True
 
+    def _execute_event_based(self, mail_slot=False):
+        """ Main scheduler method when running in event-based mode aka
+        'after_event' or 'before_event' (and their negative counterparts).
+        This is a global communication done once i.e. we do not track each
+        registration individually.
+
+        :param mail_slot: optional <event.mail.slot> slot-specific event communication,
+          when event uses slots. In that case, it works like the classic event
+          communication (iterative, ...) but information is specific to each
+          slot (last registration, scheduled datetime, ...)
+        """
+        auto_commit = not modules.module.current_test
+        batch_size = int(
+            self.env['ir.config_parameter'].sudo().get_param('mail.batch_size')
+        ) or 50  # be sure to not have 0, as otherwise no iteration is done
+        cron_limit = int(
+            self.env['ir.config_parameter'].sudo().get_param('mail.render.cron.limit')
+        ) or 1000  # be sure to not have 0, as otherwise we will loop
+        scheduler_record = mail_slot or self
+
+        # fetch registrations to contact
+        registration_domain = [
+            ('event_id', '=', self.event_id.id),
+            ('state', 'not in', ["draft", "cancel"]),
+        ]
+        if mail_slot:
+            registration_domain += [('event_slot_id', '=', mail_slot.event_slot_id.id)]
+        if scheduler_record.last_registration_id:
+            registration_domain += [('id', '>', self.last_registration_id.id)]
+        registrations = self.env["event.registration"].search(registration_domain, limit=(cron_limit + 1), order="id ASC")
+
+        # no registrations -> done
+        if not registrations:
+            scheduler_record.mail_done = True
+            return
+
+        # there are more than planned for the cron -> reschedule
+        if len(registrations) > cron_limit:
+            registrations = registrations[:cron_limit]
+            self.env.ref('event.event_mail_scheduler')._trigger()
+
+        for registrations_chunk in tools.split_every(batch_size, registrations.ids, self.env["event.registration"].browse):
+            self._execute_event_based_for_registrations(registrations_chunk)
+            scheduler_record.last_registration_id = registrations_chunk[-1]
+
+            self._refresh_mail_count_done(mail_slot=mail_slot)
+            if auto_commit:
+                self.env.cr.commit()
+                # invalidate cache, no need to keep previous content in memory
+                self.env.invalidate_all()
+
+    def _execute_event_based_for_registrations(self, registrations):
+        """ Method doing notification and recipients specific implementation
+        of contacting attendees globally.
+
+        :param registrations: a recordset of registrations to contact
+        """
+        self.ensure_one()
+        if self.notification_type == "mail":
+            self._send_mail(registrations)
+        return True
+
+    def _execute_slot_based(self):
+        """ Main scheduler method when running in slot-based mode aka
+        'after_event' or 'before_event' (and their negative counterparts) on
+        events with slots. This is a global communication done once i.e. we do
+        not track each registration individually. """
+        # create slot-specific schedulers if not existing
+        missing_slots = self.event_id.event_slot_ids - self.mail_slot_ids.event_slot_id
+        if missing_slots:
+            self.write({'mail_slot_ids': [
+                (0, 0, {'event_slot_id': slot.id})
+                for slot in missing_slots
+            ]})
+
+        # filter slots to contact
+        now = fields.Datetime.now()
+        for mail_slot in self.mail_slot_ids:
+            # before or after event -> one shot communication, once done skip
+            if mail_slot.mail_done:
+                continue
+            # do not send emails if the mailing was scheduled before the slot but the slot is over
+            if mail_slot.scheduled_date <= now and (self.interval_type not in ('before_event', 'after_event_start') or mail_slot.event_slot_id.end_datetime > now):
+                self._execute_event_based(mail_slot=mail_slot)
+
+    def _execute_attendee_based(self):
+        """ Main scheduler method when running in attendee-based mode aka
+        'after_sub'. This relies on a sub model allowing to know which
+        registrations have been contacted.
+
+        It currently does two main things
+          * generate missing 'event.mail.registrations' which are scheduled
+            communication linked to registrations;
+          * launch registration-based communication, splitting in batches as
+            it may imply a lot of computation. When having more than given
+            limit to handle, schedule another call of cron to avoid having to
+            wait another cron interval check;
+        """
+        self.ensure_one()
+        context_registrations = self.env.context.get('event_mail_registration_ids')
+
+        auto_commit = not modules.module.current_test
+        batch_size = int(
+            self.env['ir.config_parameter'].sudo().get_param('mail.batch_size')
+        ) or 50  # be sure to not have 0, as otherwise no iteration is done
+        cron_limit = int(
+            self.env['ir.config_parameter'].sudo().get_param('mail.render.cron.limit')
+        ) or 1000  # be sure to not have 0, as otherwise we will loop
+
+        # fillup on subscription lines (generate more than to render creating
+        # mail.registration is less costly than rendering emails)
+        # note: original 2many domain was
+        #   ("id", "not in", self.env["event.registration"]._search([
+        #       ("mail_registration_ids.scheduler_id", "in", self.ids),
+        #   ]))
+        # but it gives less optimized sql
+        new_attendee_domain = [
+            ('event_id', '=', self.event_id.id),
+            ("state", "not in", ("cancel", "draft")),
+            ("mail_registration_ids", "not in", self.env["event.mail.registration"]._search(
+                [('scheduler_id', 'in', self.ids)]
+            )),
+        ]
+        if context_registrations:
+            new_attendee_domain += [
+                ('id', 'in', context_registrations),
+            ]
+        self.env["event.mail.registration"].flush_model(["registration_id", "scheduler_id"])
+        new_attendees = self.env["event.registration"].search(new_attendee_domain, limit=cron_limit * 2, order="id ASC")
+        new_attendee_mails = self._create_missing_mail_registrations(new_attendees)
+
+        # fetch attendee schedulers to run (or use the one given in context)
+        mail_domain = self.env["event.mail.registration"]._get_skip_domain() + [("scheduler_id", "=", self.id)]
+        if context_registrations:
+            new_attendee_mails = new_attendee_mails.filtered_domain(mail_domain)
+        else:
+            new_attendee_mails = self.env["event.mail.registration"].search(
+                mail_domain,
+                limit=(cron_limit + 1), order="id ASC"
+            )
+
+        # there are more than planned for the cron -> reschedule
+        if len(new_attendee_mails) > cron_limit:
+            new_attendee_mails = new_attendee_mails[:cron_limit]
+            self.env.ref('event.event_mail_scheduler')._trigger()
+
+        for chunk in tools.split_every(batch_size, new_attendee_mails.ids, self.env["event.mail.registration"].browse):
+            # filter out canceled / draft, and compare to seats_taken (same heuristic)
+            valid_chunk = chunk.filtered(lambda m: m.registration_id.state not in ("draft", "cancel"))
+            # scheduled mails for draft / cancel should be removed as they won't be sent
+            (chunk - valid_chunk).unlink()
+
+            # send communications, then update only when being in cron mode (aka no
+            # context registrations) to avoid concurrent updates on scheduler
+            valid_chunk._execute_on_registrations()
+            # if not context_registrations:
+            self._refresh_mail_count_done()
+            if auto_commit:
+                self.env.cr.commit()
+                # invalidate cache, no need to keep previous content in memory
+                self.env.invalidate_all()
+
     def _create_missing_mail_registrations(self, registrations):
-        new = []
+        new = self.env["event.mail.registration"]
         for scheduler in self:
-            new += [{
-                'registration_id': registration.id,
-                'scheduler_id': scheduler.id,
-            } for registration in registrations]
-        if new:
-            return self.env['event.mail.registration'].create(new)
-        return self.env['event.mail.registration']
+            for _chunk in tools.split_every(500, registrations.ids, self.env["event.registration"].browse):
+                new += self.env['event.mail.registration'].create([{
+                    'registration_id': registration.id,
+                    'scheduler_id': scheduler.id,
+                } for registration in registrations])
+        return new
+
+    def _refresh_mail_count_done(self, mail_slot=False):
+        for scheduler in self:
+            if scheduler.interval_type == "after_sub":
+                total_sent = self.env["event.mail.registration"].search_count([
+                    ("scheduler_id", "=", self.id),
+                    ("mail_sent", "=", True),
+                ])
+                scheduler.mail_count_done = total_sent
+            elif mail_slot and mail_slot.last_registration_id:
+                total_sent = self.env["event.registration"].search_count([
+                    ("id", "<=", mail_slot.last_registration_id.id),
+                    ("event_id", "=", scheduler.event_id.id),
+                    ("event_slot_id", "=", mail_slot.event_slot_id.id),
+                    ("state", "not in", ["draft", "cancel"]),
+                ])
+                mail_slot.mail_count_done = total_sent
+                mail_slot.mail_done = total_sent >= mail_slot.event_slot_id.seats_taken
+                scheduler.mail_count_done = sum(scheduler.mail_slot_ids.mapped('mail_count_done'))
+                scheduler.mail_done = scheduler.mail_count_done >= scheduler.event_id.seats_taken
+            elif scheduler.last_registration_id:
+                total_sent = self.env["event.registration"].search_count([
+                    ("id", "<=", self.last_registration_id.id),
+                    ("event_id", "=", self.event_id.id),
+                    ("state", "not in", ["draft", "cancel"]),
+                ])
+                scheduler.mail_count_done = total_sent
+                scheduler.mail_done = total_sent >= self.event_id.seats_taken
+            else:
+                scheduler.mail_count_done = 0
+                scheduler.mail_done = False
+
+    def _filter_template_ref(self):
+        """ Check for valid template reference: existing, working template """
+        type_info = self._template_model_by_notification_type()
+
+        if not self:
+            return self.browse()
+
+        invalid = self.browse()
+        missing = self.browse()
+        for scheduler in self:
+            tpl_model = type_info[scheduler.notification_type]
+            if scheduler.template_ref._name != tpl_model:
+                invalid += scheduler
+            else:
+                template = self.env[tpl_model].browse(scheduler.template_ref.id).exists()
+                if not template:
+                    missing += scheduler
+        for scheduler in missing:
+            _logger.warning(
+                "Cannot process scheduler %s (event %s - ID %s) as it refers to non-existent %s (ID %s)",
+                scheduler.id, scheduler.event_id.name, scheduler.event_id.id,
+                tpl_model, scheduler.template_ref.id
+            )
+        for scheduler in invalid:
+            _logger.warning(
+                "Cannot process scheduler %s (event %s - ID %s) as it refers to invalid template %s (ID %s) (%s instead of %s)",
+                scheduler.id, scheduler.event_id.name, scheduler.event_id.id,
+                scheduler.template_ref.name, scheduler.template_ref.id,
+                scheduler.template_ref._name, tpl_model)
+        return self - missing - invalid
+
+    def _send_mail(self, registrations):
+        """ Mail action: send mail to attendees """
+        if self.event_id.organizer_id.email:
+            author = self.event_id.organizer_id
+        elif self.env.company.email:
+            author = self.env.company.partner_id
+        elif self.env.user.email:
+            author = self.env.user.partner_id
+        else:
+            author = self.env.ref('base.user_root').partner_id
+
+        composer_values = {
+            'composition_mode': 'mass_mail',
+            'force_send': False,
+            'model': registrations._name,
+            'res_ids': registrations.ids,
+            'template_id': self.template_ref.id,
+        }
+        # force author, as mailing mode does not try to find the author matching
+        # email_from (done only when posting on chatter); give email_from if not
+        # configured on template
+        composer_values['author_id'] = author.id
+        composer_values['email_from'] = self.template_ref.email_from or author.email_formatted
+        composer = self.env['mail.compose.message'].create(composer_values)
+        # backward compatible behavior: event mail scheduler does not force partner
+        # creation, email_cc / email_to is kept on outgoing emails
+        composer.with_context(mail_composer_force_partners=False)._action_send_mail()
+
+    def _template_model_by_notification_type(self):
+        return {
+            "mail": "mail.template",
+        }
 
     def _prepare_event_mail_values(self):
         self.ensure_one()
-        return namedtuple("MailValues", ['notification_type', 'interval_nbr', 'interval_unit', 'interval_type', 'template_ref'])(
-            self.notification_type,
-            self.interval_nbr,
-            self.interval_unit,
-            self.interval_type,
-            '%s,%i' % (self.template_ref._name, self.template_ref.id)
-        )
+        return {
+            'interval_nbr': self.interval_nbr,
+            'interval_unit': self.interval_unit,
+            'interval_type': self.interval_type,
+            'template_ref': '%s,%i' % (self.template_ref._name, self.template_ref.id),
+        }
 
-    @api.model
-    def _warn_template_error(self, scheduler, exception):
-        # We warn ~ once by hour ~ instead of every 10 min if the interval unit is more than 'hours'.
-        if random.random() < 0.1666 or scheduler.interval_unit in ('now', 'hours'):
-            ex_s = exception_to_unicode(exception)
-            try:
-                event, template = scheduler.event_id, scheduler.template_ref
-                emails = list(set([event.organizer_id.email, event.user_id.email, template.write_uid.email]))
-                subject = _("WARNING: Event Scheduler Error for event: %s", event.name)
-                body = _("""Event Scheduler for:
-  - Event: %(event_name)s (%(event_id)s)
-  - Scheduled: %(date)s
-  - Template: %(template_name)s (%(template_id)s)
+    def _warn_error(self, exception):
+        last_error_dt = self.error_datetime
+        now = self.env.cr.now().replace(microsecond=0)
+        if not last_error_dt or last_error_dt < now - relativedelta(hours=1):
+            # message base: event, date
+            event, template = self.event_id, self.template_ref
+            if self.interval_type == "after_sub":
+                scheduled_date = now
+            else:
+                scheduled_date = self.scheduled_date
+            body_content = _(
+                "Communication for %(event_name)s scheduled on %(scheduled_date)s failed.",
+                event_name=event.name,
+                scheduled_date=scheduled_date,
+            )
 
-Failed with error:
-  - %(error)s
-
-You receive this email because you are:
-  - the organizer of the event,
-  - or the responsible of the event,
-  - or the last writer of the template.
-""",
-                         event_name=event.name,
-                         event_id=event.id,
-                         date=scheduler.scheduled_date,
-                         template_name=template.name,
-                         template_id=template.id,
-                         error=ex_s)
-                email = self.env['ir.mail_server'].build_email(
-                    email_from=self.env.user.email,
-                    email_to=emails,
-                    subject=subject, body=body,
+            # add some information on cause
+            template_link = Markup('<a href="%s">%s (%s)</a>') % (
+                f"{self.get_base_url()}/odoo/{template._name}/{template.id}",
+                template.display_name,
+                template.id,
+            )
+            cause = exception.__cause__ or exception.__context__
+            if hasattr(cause, 'qweb'):
+                source_content = _(
+                    "This is due to an error in template %(template_link)s.",
+                    template_link=template_link,
                 )
-                self.env['ir.mail_server'].send_email(email)
-            except Exception as e:
-                _logger.error("Exception while sending traceback by email: %s.\n Original Traceback:\n%s", e, exception)
-                pass
+                if isinstance(cause, QWebError) and isinstance(cause.__cause__, AttributeError):
+                    error_message = _(
+                        "There is an issue with dynamic placeholder. Actual error received is: %(error)s.",
+                        error=Markup('<br/>%s') % cause.__cause__,
+                    )
+                else:
+                    error_message = _(
+                        "Rendering of template failed with error: %(error)s.",
+                        error=Markup('<br/>%s') % cause.qweb,
+                    )
+            else:
+                source_content = _(
+                    "This may be linked to template %(template_link)s.",
+                    template_link=template_link,
+                )
+                error_message = _(
+                    "It failed with error %(error)s.",
+                    error=exception_to_unicode(exception),
+                )
+
+            body = Markup("<p>%s %s<br /><br />%s</p>") % (body_content, source_content, error_message)
+            recipients = (event.organizer_id | event.user_id.partner_id | template.write_uid.partner_id).filtered(
+                lambda p: p.active
+            )
+            self.event_id.message_post(
+                body=body,
+                force_send=False,  # use email queue, especially it could be cause of error
+                notify_author_mention=True,  # in case of event responsible creating attendees
+                partner_ids=recipients.ids,
+            )
+            self.error_datetime = now
 
     @api.model
     def run(self, autocommit=False):
@@ -260,9 +469,15 @@ You receive this email because you are:
     @api.model
     def schedule_communications(self, autocommit=False):
         schedulers = self.search([
+            # skip archived events
             ('event_id.active', '=', True),
+            # skip if event is cancelled
+            ('event_id.kanban_state', '!=', 'cancel'),
+            # scheduled
+            ('scheduled_date', '<=', fields.Datetime.now()),
+            # event-based: todo / attendee-based: running until event is not done
             ('mail_done', '=', False),
-            ('scheduled_date', '<=', fields.Datetime.now())
+            '|', ('interval_type', '!=', 'after_sub'), ('event_id.date_end', '>', self.env.cr.now()),
         ])
 
         for scheduler in schedulers:
@@ -272,67 +487,8 @@ You receive this email because you are:
             except Exception as e:
                 _logger.exception(e)
                 self.env.invalidate_all()
-                self._warn_template_error(scheduler, e)
+                scheduler._warn_error(e)
             else:
-                if autocommit and not getattr(threading.current_thread(), 'testing', False):
+                if autocommit and not modules.module.current_test:
                     self.env.cr.commit()
         return True
-
-
-class EventMailRegistration(models.Model):
-    _name = 'event.mail.registration'
-    _description = 'Registration Mail Scheduler'
-    _rec_name = 'scheduler_id'
-    _order = 'scheduled_date DESC'
-
-    scheduler_id = fields.Many2one('event.mail', 'Mail Scheduler', required=True, ondelete='cascade')
-    registration_id = fields.Many2one('event.registration', 'Attendee', required=True, ondelete='cascade')
-    scheduled_date = fields.Datetime('Scheduled Time', compute='_compute_scheduled_date', store=True)
-    mail_sent = fields.Boolean('Mail Sent')
-
-    def execute(self):
-        now = fields.Datetime.now()
-        todo = self.filtered(lambda reg_mail:
-            not reg_mail.mail_sent and \
-            reg_mail.registration_id.state in ['open', 'done'] and \
-            (reg_mail.scheduled_date and reg_mail.scheduled_date <= now) and \
-            reg_mail.scheduler_id.notification_type == 'mail'
-        )
-        done = self.browse()
-        for reg_mail in todo:
-            organizer = reg_mail.scheduler_id.event_id.organizer_id
-            company = self.env.company
-            author = self.env.ref('base.user_root').partner_id
-            if organizer.email:
-                author = organizer
-            elif company.email:
-                author = company.partner_id
-            elif self.env.user.email:
-                author = self.env.user.partner_id
-
-            email_values = {
-                'author_id': author.id,
-            }
-            template = None
-            try:
-                template = reg_mail.scheduler_id.template_ref.exists()
-            except MissingError:
-                pass
-
-            if not template:
-                _logger.warning("Cannot process ticket %s, because Mail Scheduler %s has reference to non-existent template", reg_mail.registration_id, reg_mail.scheduler_id)
-                continue
-
-            if not template.email_from:
-                email_values['email_from'] = author.email_formatted
-            template.send_mail(reg_mail.registration_id.id, email_values=email_values)
-            done |= reg_mail
-        done.write({'mail_sent': True})
-
-    @api.depends('registration_id', 'scheduler_id.interval_unit', 'scheduler_id.interval_type')
-    def _compute_scheduled_date(self):
-        for mail in self:
-            if mail.registration_id:
-                mail.scheduled_date = mail.registration_id.create_date.replace(microsecond=0) + _INTERVALS[mail.scheduler_id.interval_unit](mail.scheduler_id.interval_nbr)
-            else:
-                mail.scheduled_date = False

odoo-bringout-oca-ocb-event/event/models/event_mail_registration.py

@@ -0,0 +1,56 @@
+import logging
+
+from odoo import api, fields, models
+from odoo.addons.event.models.event_mail import _INTERVALS
+from odoo.exceptions import MissingError
+
+
+_logger = logging.getLogger(__name__)
+
+
+class EventMailRegistration(models.Model):
+    _name = 'event.mail.registration'
+    _description = 'Registration Mail Scheduler'
+    _rec_name = 'scheduler_id'
+    _order = 'scheduled_date DESC, id ASC'
+
+    scheduler_id = fields.Many2one('event.mail', 'Mail Scheduler', required=True, index=True, ondelete='cascade')
+    registration_id = fields.Many2one('event.registration', 'Attendee', required=True, index=True, ondelete='cascade')
+    scheduled_date = fields.Datetime('Scheduled Time', compute='_compute_scheduled_date', store=True)
+    mail_sent = fields.Boolean('Mail Sent')
+
+    @api.depends('registration_id', 'scheduler_id.interval_unit', 'scheduler_id.interval_type')
+    def _compute_scheduled_date(self):
+        for mail in self:
+            if mail.registration_id:
+                mail.scheduled_date = mail.registration_id.create_date.replace(microsecond=0) + _INTERVALS[mail.scheduler_id.interval_unit](mail.scheduler_id.interval_nbr)
+            else:
+                mail.scheduled_date = False
+
+    def execute(self):
+        # Deprecated, to be called only from parent scheduler
+        skip_domain = self._get_skip_domain() + [("registration_id.state", "in", ("open", "done"))]
+        self.filtered_domain(skip_domain)._execute_on_registrations()
+
+    def _execute_on_registrations(self):
+        """ Private mail registration execution. We consider input is already
+        filtered at this point, allowing to let caller do optimizations when
+        managing batches of registrations. """
+        todo = self.filtered(
+            lambda r: r.scheduler_id.notification_type == "mail"
+        )
+        for scheduler, reg_mails in todo.grouped('scheduler_id').items():
+            # exclusion_list should not be applied as registering to an event is implicitly
+            # subscribing to the emails relevant to the event such as the email containing the ticket
+            scheduler.with_context(default_use_exclusion_list=False)._send_mail(reg_mails.registration_id)
+        todo.mail_sent = True
+        return todo
+
+    def _get_skip_domain(self):
+        """ Domain of mail registrations ot skip: not already done, linked to
+        a valid registration, and scheduled in the past. """
+        return [
+            ("mail_sent", "=", False),
+            ("scheduled_date", "!=", False),
+            ("scheduled_date", "<=", self.env.cr.now()),
+        ]

odoo-bringout-oca-ocb-event/event/models/event_mail_slot.py

@@ -0,0 +1,31 @@
+from odoo import api, fields, models
+from odoo.addons.event.models.event_mail import _INTERVALS
+
+
+class EventMailRegistration(models.Model):
+    _name = 'event.mail.slot'
+    _description = 'Slot Mail Scheduler'
+    _rec_name = 'scheduler_id'
+    _order = 'scheduled_date DESC, id ASC'
+
+    event_slot_id = fields.Many2one('event.slot', 'Slot', ondelete='cascade', required=True)
+    scheduled_date = fields.Datetime('Schedule Date', compute='_compute_scheduled_date', store=True)
+    scheduler_id = fields.Many2one('event.mail', 'Mail Scheduler', ondelete='cascade', required=True, index=True)
+    # contact and status
+    last_registration_id = fields.Many2one('event.registration', 'Last Attendee')
+    mail_count_done = fields.Integer('# Sent', copy=False, readonly=True)
+    mail_done = fields.Boolean("Sent", copy=False, readonly=True)
+
+    @api.depends('event_slot_id.start_datetime', 'event_slot_id.end_datetime', 'scheduler_id.interval_unit', 'scheduler_id.interval_type')
+    def _compute_scheduled_date(self):
+        for mail_slot in self:
+            scheduler = mail_slot.scheduler_id
+            if scheduler.interval_type in ('before_event', 'after_event_start'):
+                date, sign = mail_slot.event_slot_id.start_datetime, (scheduler.interval_type == 'before_event' and -1) or 1
+            else:
+                date, sign = mail_slot.event_slot_id.end_datetime, (scheduler.interval_type == 'after_event' and 1) or -1
+            mail_slot.scheduled_date = date.replace(microsecond=0) + _INTERVALS[scheduler.interval_unit](sign * scheduler.interval_nbr) if date else False
+
+        next_schedule = self.filtered('scheduled_date').mapped('scheduled_date')
+        if next_schedule and (cron := self.env.ref('event.event_mail_scheduler', raise_if_not_found=False)):
+            cron._trigger(next_schedule)

odoo-bringout-oca-ocb-event/event/models/event_question.py

@@ -0,0 +1,102 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+
+
+class EventQuestion(models.Model):
+    _name = 'event.question'
+    _rec_name = 'title'
+    _order = 'sequence,id'
+    _description = 'Event Question'
+
+    title = fields.Char(required=True, translate=True)
+    question_type = fields.Selection([
+        ('simple_choice', 'Selection'),
+        ('text_box', 'Text Input'),
+        ('name', 'Name'),
+        ('email', 'Email'),
+        ('phone', 'Phone'),
+        ('company_name', 'Company'),
+    ], default='simple_choice', string="Question Type", required=True)
+    active = fields.Boolean('Active', default=True)
+    event_type_ids = fields.Many2many('event.type', string='Event Types', copy=False)
+    event_ids = fields.Many2many('event.event', string='Events', copy=False)
+    event_count = fields.Integer('# Events', compute='_compute_event_count')
+    is_default = fields.Boolean('Default question', help="Include by default in new events.")
+    is_reusable = fields.Boolean('Is Reusable',
+                                 compute='_compute_is_reusable', default=True, store=True,
+                                 help='Allow this question to be selected and reused for any future event. Always true for default questions.')
+    answer_ids = fields.One2many('event.question.answer', 'question_id', "Answers", copy=True)
+    sequence = fields.Integer(default=10)
+    once_per_order = fields.Boolean('Ask once per order',
+                                    help="Check this for order-level questions (e.g., 'Company Name') where the answer is the same for everyone.")
+    is_mandatory_answer = fields.Boolean('Mandatory Answer')
+
+    _check_default_question_is_reusable = models.Constraint(
+        'CHECK(is_default IS DISTINCT FROM TRUE OR is_reusable IS TRUE)',
+        "A default question must be reusable."
+    )
+
+    @api.depends('event_ids')
+    def _compute_event_count(self):
+        event_count_per_question = dict(self.env['event.event']._read_group(
+            domain=[('question_ids', 'in', self.ids)],
+            groupby=['question_ids'],
+            aggregates=['__count']
+        ))
+        for question in self:
+            question.event_count = event_count_per_question.get(question, 0)
+
+    @api.depends('is_default', 'event_type_ids')
+    def _compute_is_reusable(self):
+        self.filtered('is_default').is_reusable = True
+
+    def write(self, vals):
+        """ We add a check to prevent changing the question_type of a question that already has answers.
+        Indeed, it would mess up the event.registration.answer (answer type not matching the question type). """
+
+        if 'question_type' in vals:
+            questions_new_type = self.filtered(lambda question: question.question_type != vals['question_type'])
+            if questions_new_type:
+                answer_count = self.env['event.registration.answer'].search_count([('question_id', 'in', questions_new_type.ids)])
+                if answer_count > 0:
+                    raise UserError(_("You cannot change the question type of a question that already has answers!"))
+        return super().write(vals)
+
+    @api.ondelete(at_uninstall=False)
+    def _unlink_except_answered_question(self):
+        if self.env['event.registration.answer'].search_count([('question_id', 'in', self.ids)]):
+            raise UserError(_('You cannot delete a question that has already been answered by attendees. You can archive it instead.'))
+
+    @api.ondelete(at_uninstall=False)
+    def _unlink_except_default_question(self):
+        if set(self.ids) & set(self.env['event.type']._default_question_ids()):
+            raise UserError(_('You cannot delete a default question.'))
+
+    def action_view_question_answers(self):
+        """ Allow analyzing the attendees answers to event questions in a convenient way:
+
+        - A graph view showing counts of each suggestion for simple_choice questions
+          (Along with secondary pivot and list views)
+        - A list view showing textual answers values for text_box questions.
+        """
+        self.ensure_one()
+        action = self.env["ir.actions.actions"]._for_xml_id("event.action_event_registration_report")
+        action['context'] = {'search_default_question_id': self.id}
+        if event_id := self.env.context.get('search_default_event_id'):
+            action['context'].update(search_default_event_id=event_id)
+        # Fetch attendee answers for which the event is still linked to the question.
+        action['domain'] = [('event_id.question_ids', 'in', self.ids)]
+
+        if self.question_type == 'simple_choice':
+            action['views'] = [(False, 'graph'), (False, 'pivot'), (False, 'list')]
+        elif self.question_type == 'text_box':
+            action['views'] = [(False, 'list')]
+        return action
+
+    def action_event_view(self):
+        self.ensure_one()
+        action = self.env["ir.actions.actions"]._for_xml_id("event.action_event_view")
+        action['domain'] = [('question_ids', 'in', self.ids)]
+        return action