diff --git a/addons/event/__manifest__.py b/addons/event/__manifest__.py index 4d9a1002d94..12689659c87 100644 --- a/addons/event/__manifest__.py +++ b/addons/event/__manifest__.py @@ -57,7 +57,7 @@ Key Features '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', ], diff --git a/addons/event/controllers/main.py b/addons/event/controllers/main.py index 93d8d6438d9..72211d0d191 100644 --- a/addons/event/controllers/main.py +++ b/addons/event/controllers/main.py @@ -65,7 +65,7 @@ class EventController(Controller): return request.make_response(html) pdf = request.env['ir.actions.report'].sudo()._render_qweb_pdf( - 'event.action_report_event_registration_foldable_badge' if badge_mode else + 'event.action_report_event_registration_badge' if badge_mode else 'event.action_report_event_registration_full_page_ticket', event_registrations_sudo.ids, )[0] diff --git a/addons/event/data/mail_template_data.xml b/addons/event/data/mail_template_data.xml index 4fd4458ea59..5a8cbb2d781 100644 --- a/addons/event/data/mail_template_data.xml +++ b/addons/event/data/mail_template_data.xml @@ -97,6 +97,7 @@ +
OpenWood Collection Online Reveal
From May 4, 2021, 7:00:00 AM
To May 6, 2021, 5:00:00 PM
(Europe/Brussels)
@@ -228,7 +229,7 @@ - + {{ object.event_id.lang or object.partner_id.lang }} @@ -340,6 +341,7 @@ +
OpenWood Collection Online Reveal
From May 4, 2021, 7:00:00 AM
To May 6, 2021, 5:00:00 PM
(Europe/Brussels)
diff --git a/addons/event/models/event_event.py b/addons/event/models/event_event.py index 7ac8da308b6..c6b565f3bd5 100644 --- a/addons/event/models/event_event.py +++ b/addons/event/models/event_event.py @@ -224,6 +224,14 @@ class EventEvent(models.Model): 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.") diff --git a/addons/event/models/event_ticket.py b/addons/event/models/event_ticket.py index 9a6a6ca40ef..aa80c732079 100644 --- a/addons/event/models/event_ticket.py +++ b/addons/event/models/event_ticket.py @@ -80,6 +80,8 @@ class EventTicket(models.Model): seats_used = fields.Integer(string='Used Seats', compute='_compute_seats', store=False) is_sold_out = fields.Boolean( 'Sold Out', compute='_compute_is_sold_out', help='Whether seats are not available for this ticket.') + # reports + color = fields.Char('Color', default="#875A7B") @api.depends('end_sale_datetime', 'event_id.date_tz') def _compute_is_expired(self): diff --git a/addons/event/report/event_event_reports.xml b/addons/event/report/event_event_reports.xml index 3970b91f394..35a92018485 100644 --- a/addons/event/report/event_event_reports.xml +++ b/addons/event/report/event_event_reports.xml @@ -1,8 +1,8 @@ - - Custom Paperformat for the Event Foldable Badge report + + Custom Paperformat for the Event Badge report A4 @@ -31,9 +31,8 @@ 96 - + -