diff options
| author | Nicolas Lempereur <nle@odoo.com> | 2020-12-07 09:51:51 +0000 |
|---|---|---|
| committer | Nicolas Lempereur <nle@odoo.com> | 2020-12-07 13:52:03 +0000 |
| commit | b68ca9fb1d3f8c0a6346fa1d3d6cce28f4977bbd (patch) | |
| tree | e2769644cbe2a7fb5f47f1df9aae3ca98c75e751 | |
| parent | 4628675caf37c1699d8c25fe2ff6ef8b7bbc72a0 (diff) | |
[FIX] event: google calendar link ok timezone
In the change 6ba81c99 there was an issue with timezone with Google
because we were now sending "20201217T123000+0000" instead of
"20201217T123124Z".
When google received formatted date ending in Z it would treat it as
UTC, but with +0000 ending he treats it as a locale time thus get it
wrong if locale timezone is different than UTC.
opw-2370895
closes #62943
closes odoo/odoo#62958
X-original-commit: 39c95f1d64154d0fbac7da0be4044a63375dcb54
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
| -rw-r--r-- | addons/event/data/email_template_data.xml | 8 | ||||
| -rw-r--r-- | addons/event/i18n/event.pot | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/addons/event/data/email_template_data.xml b/addons/event/data/email_template_data.xml index 8bf5414e11a..4bc9af2151f 100644 --- a/addons/event/data/email_template_data.xml +++ b/addons/event/data/email_template_data.xml @@ -35,8 +35,8 @@ <field name="email_to">${(object.email and '"%s" <%s>' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe}</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"> -% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='yyyyMMdd\'T\'HHmmssZ') -% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='yyyyMMdd\'T\'HHmmssZ') +% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format="yyyyMMdd'T'HHmmss'Z'") +% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format="yyyyMMdd'T'HHmmss'Z'") % set is_online = 'is_published' in object.event_id and object.event_id.is_published % set event_organizer = object.event_id.organizer_id % set event_address = object.event_id.address_id @@ -259,8 +259,8 @@ <field name="email_to">${(object.email and '"%s" <%s>' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe}</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"> -% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='yyyyMMdd\'T\'HHmmssZ') -% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='yyyyMMdd\'T\'HHmmssZ') +% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format="yyyyMMdd'T'HHmmss'Z'") +% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format="yyyyMMdd'T'HHmmss'Z'") % set is_online = 'is_published' in object.event_id and object.event_id.is_published % set event_organizer = object.event_id.organizer_id % set event_address = object.event_id.address_id diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot index 20a6dd0e965..f00bbfa5289 100644 --- a/addons/event/i18n/event.pot +++ b/addons/event/i18n/event.pot @@ -237,8 +237,8 @@ msgstr "" #: model:mail.template,body_html:event.event_subscription msgid "" "<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\">\n" -"% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='yyyyMMdd\\'T\\'HHmmssZ')\n" -"% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='yyyyMMdd\\'T\\'HHmmssZ')\n" +"% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format=\"yyyyMMdd'T'HHmmss'Z'\")\n" +"% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format=\"yyyyMMdd'T'HHmmss'Z'\")\n" "% set is_online = 'is_published' in object.event_id and object.event_id.is_published\n" "% set event_organizer = object.event_id.organizer_id\n" "% set event_address = object.event_id.address_id\n" @@ -455,8 +455,8 @@ msgstr "" #: model:mail.template,body_html:event.event_reminder msgid "" "<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\">\n" -"% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='yyyyMMdd\\'T\\'HHmmssZ')\n" -"% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='yyyyMMdd\\'T\\'HHmmssZ')\n" +"% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format=\"yyyyMMdd'T'HHmmss'Z'\")\n" +"% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format=\"yyyyMMdd'T'HHmmss'Z'\")\n" "% set is_online = 'is_published' in object.event_id and object.event_id.is_published\n" "% set event_organizer = object.event_id.organizer_id\n" "% set event_address = object.event_id.address_id\n" |