diff --git a/addons/event/data/mail_template_data.xml b/addons/event/data/mail_template_data.xml index 4bc9af2151f..d7cdc868182 100644 --- a/addons/event/data/mail_template_data.xml +++ b/addons/event/data/mail_template_data.xml @@ -240,7 +240,7 @@ Sent by ${object.company_id.name} % if is_online:
- Discover all our events. + Discover all our events. % endif @@ -464,7 +464,7 @@ Sent by ${object.company_id.name} % if 'website_url' in object.event_id and object.event_id.website_url:
- Discover all our events. + Discover all our events. % endif diff --git a/addons/event/models/event_event.py b/addons/event/models/event_event.py index 4120a96b538..c838c1c0e50 100644 --- a/addons/event/models/event_event.py +++ b/addons/event/models/event_event.py @@ -501,6 +501,9 @@ class EventEvent(models.Model): return events 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']]) diff --git a/addons/event_sale/data/event_sale_data.xml b/addons/event_sale/data/event_sale_data.xml index 79cbbe1256f..2fedfd9b289 100644 --- a/addons/event_sale/data/event_sale_data.xml +++ b/addons/event_sale/data/event_sale_data.xml @@ -7,9 +7,9 @@ - 10.0 + 30.0 - 30.0 + 10.0 Event Registration diff --git a/addons/website_event_track/models/event_track.py b/addons/website_event_track/models/event_track.py index 0092885d1dd..4dc21a14370 100644 --- a/addons/website_event_track/models/event_track.py +++ b/addons/website_event_track/models/event_track.py @@ -124,7 +124,8 @@ class Track(models.Model): string='Always Wishlisted', help="""If set, the talk will be starred for each attendee registered to the event. The attendee won't be able to un-star this talk.""") # Call to action - website_cta = fields.Boolean('Magic Button') + website_cta = fields.Boolean('Magic Button', + help="Display a Call to Action button to your Attendees while they watch your Track.") website_cta_title = fields.Char('Button Title') website_cta_url = fields.Char('Button Target URL') website_cta_delay = fields.Integer('Button appears') diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml index 9c265acd0db..c76cad5c3c6 100644 --- a/addons/website_event_track/views/event_track_views.xml +++ b/addons/website_event_track/views/event_track_views.xml @@ -203,7 +203,7 @@ attrs="{'invisible': [('website_cta', '=', False)]}"/>
minutes after talk start + attrs="{'required': [('website_cta', '=', True)]}"/> minutes after track starts