diff --git a/addons/event/data/email_template_data.xml b/addons/event/data/email_template_data.xml index 9ee4351ff89..b41bd61c623 100644 --- a/addons/event/data/email_template_data.xml +++ b/addons/event/data/email_template_data.xml @@ -37,6 +37,9 @@ - - % if object.event_id.organizer_id: - - % endif - - % if object.event_id.address_id: + + + + + + + - % endif
% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='%Y%m%dT%H%M%SZ') % set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='%Y%m%dT%H%M%SZ') +% 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 @@ -49,7 +52,14 @@ ${object.name} - % if object.event_id.address_id.country_id.name: - - - % endif - -
+ % if is_online + + View Event + + % else ${'%s' % object.company_id.name} + % endif
@@ -65,27 +75,31 @@
Hello ${object.name or ''},
We are happy to confirm your registration to the event - % if 'website_published' in object.event_id and object.event_id.website_published: + % if is_online: ${object.event_id.name} % else: ${object.event_id.name} % endif for attendee ${object.name}.
- % if 'website_published' in object.event_id and object.event_id.website_published: -
- View Event
+
+
+ Add this event to your calendar + Google + iCal/Outlook + + Yahoo + +

- % endif
See you soon,
--
- % if object.event_id.organizer_id: - ${object.event_id.organizer_id.name} + % if event_organizer: + ${event_organizer.name} % else: - The organizers. + The ${object.event_id.name} Team % endif
@@ -111,84 +125,98 @@
To ${object.event_id.date_end_located}
TZ ${object.event_id.date_tz}
 - - - % set location = '' - % if object.event_id.address_id.name: -
${object.event_id.address_id.name}
- % endif - % if object.event_id.address_id.street: -
${object.event_id.address_id.street}
- % set location = object.event_id.address_id.street - % endif - % if object.event_id.address_id.street2: -
${object.event_id.address_id.street2}
- % set location = '%s, %s' % (location, object.event_id.address_id.street2) - % endif -
- % if object.event_id.address_id.city: - ${object.event_id.address_id.city}, - % set location = '%s, %s' % (location, object.event_id.address_id.city) - % endif - % if object.event_id.address_id.state_id.name: - ${object.event_id.address_id.state_id.name}, - % set location = '%s, %s' % (location, object.event_id.address_id.state_id.name) - % endif - % if object.event_id.address_id.zip: - ${object.event_id.address_id.zip} - % set location = '%s, %s' % (location, object.event_id.address_id.zip) - % endif -
- % if object.event_id.address_id.country_id.name: -
${object.event_id.address_id.country_id.name}
- % set location = '%s, %s' % (location, object.event_id.address_id.country_id.name) - % endif -
-
-
-
-
- Questions about this event? -
Please contact the organizer:
-
    -
  • ${object.event_id.organizer_id.name}
    • - % if object.event_id.organizer_id.email -
  • Mail: ${object.event_id.organizer_id.email}
    • - % endif - % if object.event_id.organizer_id.phone -
  • Phone: ${object.event_id.organizer_id.phone}
    • - % endif -
-
-
- - - +
- Add this event to your calendar - Google - iCal/Outlook - - Yahoo + + % if event_address: + + % endif + + % if event_address: + % set location = '' + % if object.event_id.address_id.name: +
${object.event_id.address_id.name}
+ % endif + % if object.event_id.address_id.street: +
${object.event_id.address_id.street}
+ % set location = object.event_id.address_id.street + % endif + % if object.event_id.address_id.street2: +
${object.event_id.address_id.street2}
+ % set location = '%s, %s' % (location, object.event_id.address_id.street2) + % endif +
+ % if object.event_id.address_id.city: + ${object.event_id.address_id.city}, + % set location = '%s, %s' % (location, object.event_id.address_id.city) + % endif + % if object.event_id.address_id.state_id.name: + ${object.event_id.address_id.state_id.name}, + % set location = '%s, %s' % (location, object.event_id.address_id.state_id.name) + % endif + % if object.event_id.address_id.zip: + ${object.event_id.address_id.zip} + % set location = '%s, %s' % (location, object.event_id.address_id.zip) + % endif +
+ % if object.event_id.address_id.country_id.name: +
${object.event_id.address_id.country_id.name}
+ % set location = '%s, %s' % (location, object.event_id.address_id.country_id.name) + % endif + % endif
-
+ % if event_organizer +
+ % endif
+ + % if event_organizer: +
+ Questions about this event? +
Please contact the organizer:
+
    +
  • ${event_organizer.name}
    • + % if event_organizer.email +
  • Mail: ${event_organizer.email}
    • + % endif + % if event_organizer.phone +
  • Phone: ${event_organizer.phone}
    • + % endif +
+
+ % endif +
+ + % if is_online or event_address: +
+ % endif +
+ + % if is_online: +
+ Get the best mobile experience. + Install our mobile app +
+ % endif +
+ + % if is_online and event_address: +
+ % endif +
+ + % if event_address:
+ % endif
@@ -205,19 +233,19 @@ -% if object.company_id + % if object.company_id
Sent by ${object.company_id.name} - % if 'website_url' in object.event_id and object.event_id.website_url: + % if is_online:
Discover all our events. % endif
+ % endif -% endif ${object.partner_id.lang} @@ -233,6 +261,9 @@ - - % if object.event_id.organizer_id: - - % endif - - % if object.event_id.address_id: + + + + + + + - % endif
% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='%Y%m%dT%H%M%SZ') % set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='%Y%m%dT%H%M%SZ') +% 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 @@ -245,7 +276,14 @@ ${object.name} - % if object.event_id.address_id.country_id.name: - - - % endif - -
+ % if is_online + + View Event + + % else ${'%s' % object.company_id.name} + % endif
@@ -261,27 +299,31 @@
Hello ${object.name},
We are excited to remind you that the event - % if 'website_published' in object.event_id and object.event_id.website_published: + % if is_online: ${object.event_id.name} % else: ${object.event_id.name} % endif is starting ${object.get_date_range_str()}.
- % if 'website_published' in object.event_id and object.event_id.website_published: -
- View Event
+
+
+ Add this event to your calendar + Google + iCal/Outlook + + Yahoo + +

- % endif
We confirm your registration and hope to meet you there,
--
- % if object.event_id.organizer_id: - ${object.event_id.organizer_id.name} + % if event_organizer: + ${event_organizer.name} % else: - The organizers. + The ${object.event_id.name} Team % endif
@@ -307,84 +349,98 @@
To ${object.event_id.date_end_located}
TZ ${object.event_id.date_tz}
 - - - % set location = '' - % if object.event_id.address_id.name: -
${object.event_id.address_id.name}
- % endif - % if object.event_id.address_id.street: -
${object.event_id.address_id.street}
- % set location = object.event_id.address_id.street - % endif - % if object.event_id.address_id.street2: -
${object.event_id.address_id.street2}
- % set location = '%s, %s' % (location, object.event_id.address_id.street2) - % endif -
- % if object.event_id.address_id.city: - ${object.event_id.address_id.city}, - % set location = '%s, %s' % (location, object.event_id.address_id.city) - % endif - % if object.event_id.address_id.state_id.name: - ${object.event_id.address_id.state_id.name}, - % set location = '%s, %s' % (location, object.event_id.address_id.state_id.name) - % endif - % if object.event_id.address_id.zip: - ${object.event_id.address_id.zip} - % set location = '%s, %s' % (location, object.event_id.address_id.zip) - % endif -
- % if object.event_id.address_id.country_id.name: -
${object.event_id.address_id.country_id.name}
- % set location = '%s, %s' % (location, object.event_id.address_id.country_id.name) - % endif -
-
-
-
-
- Questions about this event? -
Please contact the organizer:
-
    -
  • ${object.event_id.organizer_id.name}
    • - % if object.event_id.organizer_id.email -
  • Mail: ${object.event_id.organizer_id.email}
    • - % endif - % if object.event_id.organizer_id.phone -
  • Phone: ${object.event_id.organizer_id.phone}
    • - % endif -
-
-
- - - +
- Add this event to your calendar - Google - iCal/Outlook - - Yahoo + + % if event_address: + + % endif + + % if event_address: + % set location = '' + % if object.event_id.address_id.name: +
${object.event_id.address_id.name}
+ % endif + % if object.event_id.address_id.street: +
${object.event_id.address_id.street}
+ % set location = object.event_id.address_id.street + % endif + % if object.event_id.address_id.street2: +
${object.event_id.address_id.street2}
+ % set location = '%s, %s' % (location, object.event_id.address_id.street2) + % endif +
+ % if object.event_id.address_id.city: + ${object.event_id.address_id.city}, + % set location = '%s, %s' % (location, object.event_id.address_id.city) + % endif + % if object.event_id.address_id.state_id.name: + ${object.event_id.address_id.state_id.name}, + % set location = '%s, %s' % (location, object.event_id.address_id.state_id.name) + % endif + % if object.event_id.address_id.zip: + ${object.event_id.address_id.zip} + % set location = '%s, %s' % (location, object.event_id.address_id.zip) + % endif +
+ % if object.event_id.address_id.country_id.name: +
${object.event_id.address_id.country_id.name}
+ % set location = '%s, %s' % (location, object.event_id.address_id.country_id.name) + % endif + % endif
-
+ % if event_organizer +
+ % endif
+ + % if event_organizer: +
+ Questions about this event? +
Please contact the organizer:
+
    +
  • ${event_organizer.name}
    • + % if event_organizer.email +
  • Mail: ${event_organizer.email}
    • + % endif + % if event_organizer.phone +
  • Phone: ${event_organizer.phone}
    • + % endif +
+
+ % endif +
+ + % if is_online or event_address: +
+ % endif +
+ + % if is_online: +
+ Get the best mobile experience. + Install our mobile app +
+ % endif +
+ + % if is_online and event_address: +
+ % endif +
+ + % if event_address:
+ % endif
@@ -401,8 +457,8 @@ -% if object.company_id + % if object.company_id
Sent by ${object.company_id.name} @@ -412,8 +468,8 @@ % endif
+ % endif -% endif ${object.partner_id.lang} diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot index b4b442d5be4..e64fccffdd0 100644 --- a/addons/event/i18n/event.pot +++ b/addons/event/i18n/event.pot @@ -122,6 +122,9 @@ msgid "" "\n" -" \n" -" % if object.event_id.organizer_id:\n" -" \n" -" % endif\n" -" \n" " \n" -" % if object.event_id.address_id:\n" +"\n" " \n" +" \n" +"\n" +" \n" +" \n" +"\n" +" \n" -" % endif\n" "
\n" "% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='%Y%m%dT%H%M%SZ')\n" "% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='%Y%m%dT%H%M%SZ')\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" "\n" "\n" " \n" @@ -134,7 +137,13 @@ msgid "" " ${object.name}\n" " \n" " \n" " \n" -" % if object.event_id.address_id.country_id.name:\n" -" \n" -" \n" -" % endif\n" -" \n" -"
\n" +" % if is_online\n" +" \n" +" View Event\n" +" \n" +" % else\n" " \"${'%s'\n" +" % endif\n" "
\n" "
\n" @@ -150,26 +159,31 @@ msgid "" "
\n" " Hello ${object.name or ''},
\n" " We are happy to confirm your registration to the event\n" -" % if 'website_published' in object.event_id and object.event_id.website_published:\n" +" % if is_online:\n" " ${object.event_id.name}\n" " % else:\n" " ${object.event_id.name}\n" " % endif\n" " for attendee ${object.name}.\n" "
\n" -" % if 'website_published' in object.event_id and object.event_id.website_published:\n" -"
\n" -" View Event
\n" +"
\n" +"
\n" +" Add this event to your calendar\n" +" \"\"/ Google\n" +" \"\"/ iCal/Outlook\n" +" \n" +" \"\"/ Yahoo\n" +" \n" +"

\n" "
\n" -" % endif\n" "
\n" " See you soon,
\n" " \n" " --
\n" -" % if object.event_id.organizer_id:\n" -" ${object.event_id.organizer_id.name}\n" +" % if event_organizer:\n" +" ${event_organizer.name}\n" " % else:\n" -" The organizers.\n" +" The ${object.event_id.name} Team\n" " % endif\n" " \n" "
\n" @@ -195,84 +209,98 @@ msgid "" "
To ${object.event_id.date_end_located}
\n" "
TZ ${object.event_id.date_tz}
\n" "
\n" -" \"\"/\n" -" \n" -" % set location = ''\n" -" % if object.event_id.address_id.name:\n" -"
${object.event_id.address_id.name}
\n" -" % endif\n" -" % if object.event_id.address_id.street:\n" -"
${object.event_id.address_id.street}
\n" -" % set location = object.event_id.address_id.street\n" -" % endif\n" -" % if object.event_id.address_id.street2:\n" -"
${object.event_id.address_id.street2}
\n" -" % set location = '%s, %s' % (location, object.event_id.address_id.street2)\n" -" % endif\n" -"
\n" -" % if object.event_id.address_id.city:\n" -" ${object.event_id.address_id.city},\n" -" % set location = '%s, %s' % (location, object.event_id.address_id.city)\n" -" % endif\n" -" % if object.event_id.address_id.state_id.name:\n" -" ${object.event_id.address_id.state_id.name},\n" -" % set location = '%s, %s' % (location, object.event_id.address_id.state_id.name)\n" -" % endif\n" -" % if object.event_id.address_id.zip:\n" -" ${object.event_id.address_id.zip}\n" -" % set location = '%s, %s' % (location, object.event_id.address_id.zip)\n" -" % endif\n" -"
\n" -" % if object.event_id.address_id.country_id.name:\n" -"
${object.event_id.address_id.country_id.name}
\n" -" % set location = '%s, %s' % (location, object.event_id.address_id.country_id.name)\n" -" % endif\n" -"
\n" -"
\n" -"
\n" -"
\n" -"
\n" -" Questions about this event?\n" -"
Please contact the organizer:
\n" -"
    \n" -"
  • ${object.event_id.organizer_id.name}
    • \n" -" % if object.event_id.organizer_id.email\n" -"
  • Mail: ${object.event_id.organizer_id.email}
    • \n" -" % endif\n" -" % if object.event_id.organizer_id.phone\n" -"
  • Phone: ${object.event_id.organizer_id.phone}
    • \n" -" % endif\n" -"
\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" +" \n" " \n" "
\n" -" Add this event to your calendar\n" -" \"\"/ Google\n" -" \"\"/ iCal/Outlook\n" -" \n" -" \"\"/ Yahoo\n" +" \n" +" % if event_address:\n" +" \"\"/\n" +" % endif\n" +" \n" +" % if event_address:\n" +" % set location = ''\n" +" % if object.event_id.address_id.name:\n" +"
${object.event_id.address_id.name}
\n" +" % endif\n" +" % if object.event_id.address_id.street:\n" +"
${object.event_id.address_id.street}
\n" +" % set location = object.event_id.address_id.street\n" +" % endif\n" +" % if object.event_id.address_id.street2:\n" +"
${object.event_id.address_id.street2}
\n" +" % set location = '%s, %s' % (location, object.event_id.address_id.street2)\n" +" % endif\n" +"
\n" +" % if object.event_id.address_id.city:\n" +" ${object.event_id.address_id.city},\n" +" % set location = '%s, %s' % (location, object.event_id.address_id.city)\n" +" % endif\n" +" % if object.event_id.address_id.state_id.name:\n" +" ${object.event_id.address_id.state_id.name},\n" +" % set location = '%s, %s' % (location, object.event_id.address_id.state_id.name)\n" +" % endif\n" +" % if object.event_id.address_id.zip:\n" +" ${object.event_id.address_id.zip}\n" +" % set location = '%s, %s' % (location, object.event_id.address_id.zip)\n" +" % endif\n" +"
\n" +" % if object.event_id.address_id.country_id.name:\n" +"
${object.event_id.address_id.country_id.name}
\n" +" % set location = '%s, %s' % (location, object.event_id.address_id.country_id.name)\n" +" % endif\n" +" % endif\n" "
\n" "
\n" -"
\n" +" % if event_organizer\n" +"
\n" +" % endif\n" "
\n" +" \n" +" % if event_organizer:\n" +"
\n" +" Questions about this event?\n" +"
Please contact the organizer:
\n" +"
    \n" +"
  • ${event_organizer.name}
    • \n" +" % if event_organizer.email\n" +"
  • Mail: ${event_organizer.email}
    • \n" +" % endif\n" +" % if event_organizer.phone\n" +"
  • Phone: ${event_organizer.phone}
    • \n" +" % endif\n" +"
\n" +"
\n" +" % endif\n" +"
\n" +" \n" +" % if is_online or event_address:\n" +"
\n" +" % endif\n" +"
\n" +" \n" +" % if is_online:\n" +"
\n" +" Get the best mobile experience.\n" +" Install our mobile app\n" +"
\n" +" % endif\n" +"
\n" +" \n" +" % if is_online and event_address:\n" +"
\n" +" % endif\n" +"
\n" +" \n" +" % if event_address:\n" "
\n" " \n" "
\n" +" % endif\n" "
\n" " \n" " \n" @@ -289,19 +317,19 @@ msgid "" "\n" "\n" "\n" -"% if object.company_id\n" "\n" +" % if object.company_id\n" " \n" " \n" "
\n" " Sent by ${object.company_id.name}\n" -" % if 'website_url' in object.event_id and object.event_id.website_url:\n" +" % if is_online:\n" "
\n" " Discover all our events.\n" " % endif\n" "
\n" +" % endif\n" "\n" -"% endif\n" "\n" " " msgstr "" @@ -312,6 +340,9 @@ msgid "" "\n" -" \n" -" % if object.event_id.organizer_id:\n" -" \n" -" % endif\n" -" \n" " \n" -" % if object.event_id.address_id:\n" +"\n" " \n" +" \n" +"\n" +" \n" +" \n" +"\n" +" \n" -" % endif\n" "
\n" "% set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='%Y%m%dT%H%M%SZ')\n" "% set date_end = format_datetime(object.event_id.date_end, tz='UTC', dt_format='%Y%m%dT%H%M%SZ')\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" "\n" "\n" " \n" @@ -324,7 +355,13 @@ msgid "" " ${object.name}\n" " \n" " \n" " \n" -" % if object.event_id.address_id.country_id.name:\n" -" \n" -" \n" -" % endif\n" -" \n" -"
\n" +" % if is_online\n" +" \n" +" View Event\n" +" \n" +" % else\n" " \"${'%s'\n" +" % endif\n" "
\n" "
\n" @@ -340,26 +377,31 @@ msgid "" "
\n" " Hello ${object.name},
\n" " We are excited to remind you that the event\n" -" % if 'website_published' in object.event_id and object.event_id.website_published:\n" +" % if is_online:\n" " ${object.event_id.name}\n" " % else:\n" " ${object.event_id.name}\n" " % endif\n" " is starting ${object.get_date_range_str()}.\n" "
\n" -" % if 'website_published' in object.event_id and object.event_id.website_published:\n" -"
\n" -" View Event
\n" +"
\n" +"
\n" +" Add this event to your calendar\n" +" \"\"/ Google\n" +" \"\"/ iCal/Outlook\n" +" \n" +" \"\"/ Yahoo\n" +" \n" +"

\n" "
\n" -" % endif\n" "
\n" " We confirm your registration and hope to meet you there,
\n" " \n" " --
\n" -" % if object.event_id.organizer_id:\n" -" ${object.event_id.organizer_id.name}\n" +" % if event_organizer:\n" +" ${event_organizer.name}\n" " % else:\n" -" The organizers.\n" +" The ${object.event_id.name} Team\n" " % endif\n" " \n" "
\n" @@ -385,84 +427,98 @@ msgid "" "
To ${object.event_id.date_end_located}
\n" "
TZ ${object.event_id.date_tz}
\n" "
\n" -" \"\"/\n" -" \n" -" % set location = ''\n" -" % if object.event_id.address_id.name:\n" -"
${object.event_id.address_id.name}
\n" -" % endif\n" -" % if object.event_id.address_id.street:\n" -"
${object.event_id.address_id.street}
\n" -" % set location = object.event_id.address_id.street\n" -" % endif\n" -" % if object.event_id.address_id.street2:\n" -"
${object.event_id.address_id.street2}
\n" -" % set location = '%s, %s' % (location, object.event_id.address_id.street2)\n" -" % endif\n" -"
\n" -" % if object.event_id.address_id.city:\n" -" ${object.event_id.address_id.city},\n" -" % set location = '%s, %s' % (location, object.event_id.address_id.city)\n" -" % endif\n" -" % if object.event_id.address_id.state_id.name:\n" -" ${object.event_id.address_id.state_id.name},\n" -" % set location = '%s, %s' % (location, object.event_id.address_id.state_id.name)\n" -" % endif\n" -" % if object.event_id.address_id.zip:\n" -" ${object.event_id.address_id.zip}\n" -" % set location = '%s, %s' % (location, object.event_id.address_id.zip)\n" -" % endif\n" -"
\n" -" % if object.event_id.address_id.country_id.name:\n" -"
${object.event_id.address_id.country_id.name}
\n" -" % set location = '%s, %s' % (location, object.event_id.address_id.country_id.name)\n" -" % endif\n" -"
\n" -"
\n" -"
\n" -"
\n" -"
\n" -" Questions about this event?\n" -"
Please contact the organizer:
\n" -"
    \n" -"
  • ${object.event_id.organizer_id.name}
    • \n" -" % if object.event_id.organizer_id.email\n" -"
  • Mail: ${object.event_id.organizer_id.email}
    • \n" -" % endif\n" -" % if object.event_id.organizer_id.phone\n" -"
  • Phone: ${object.event_id.organizer_id.phone}
    • \n" -" % endif\n" -"
\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" +" \n" " \n" "
\n" -" Add this event to your calendar\n" -" \"\"/ Google\n" -" \"\"/ iCal/Outlook\n" -" \n" -" \"\"/ Yahoo\n" +" \n" +" % if event_address:\n" +" \"\"/\n" +" % endif\n" +" \n" +" % if event_address:\n" +" % set location = ''\n" +" % if object.event_id.address_id.name:\n" +"
${object.event_id.address_id.name}
\n" +" % endif\n" +" % if object.event_id.address_id.street:\n" +"
${object.event_id.address_id.street}
\n" +" % set location = object.event_id.address_id.street\n" +" % endif\n" +" % if object.event_id.address_id.street2:\n" +"
${object.event_id.address_id.street2}
\n" +" % set location = '%s, %s' % (location, object.event_id.address_id.street2)\n" +" % endif\n" +"
\n" +" % if object.event_id.address_id.city:\n" +" ${object.event_id.address_id.city},\n" +" % set location = '%s, %s' % (location, object.event_id.address_id.city)\n" +" % endif\n" +" % if object.event_id.address_id.state_id.name:\n" +" ${object.event_id.address_id.state_id.name},\n" +" % set location = '%s, %s' % (location, object.event_id.address_id.state_id.name)\n" +" % endif\n" +" % if object.event_id.address_id.zip:\n" +" ${object.event_id.address_id.zip}\n" +" % set location = '%s, %s' % (location, object.event_id.address_id.zip)\n" +" % endif\n" +"
\n" +" % if object.event_id.address_id.country_id.name:\n" +"
${object.event_id.address_id.country_id.name}
\n" +" % set location = '%s, %s' % (location, object.event_id.address_id.country_id.name)\n" +" % endif\n" +" % endif\n" "
\n" "
\n" -"
\n" +" % if event_organizer\n" +"
\n" +" % endif\n" "
\n" +" \n" +" % if event_organizer:\n" +"
\n" +" Questions about this event?\n" +"
Please contact the organizer:
\n" +"
    \n" +"
  • ${event_organizer.name}
    • \n" +" % if event_organizer.email\n" +"
  • Mail: ${event_organizer.email}
    • \n" +" % endif\n" +" % if event_organizer.phone\n" +"
  • Phone: ${event_organizer.phone}
    • \n" +" % endif\n" +"
\n" +"
\n" +" % endif\n" +"
\n" +" \n" +" % if is_online or event_address:\n" +"
\n" +" % endif\n" +"
\n" +" \n" +" % if is_online:\n" +"
\n" +" Get the best mobile experience.\n" +" Install our mobile app\n" +"
\n" +" % endif\n" +"
\n" +" \n" +" % if is_online and event_address:\n" +"
\n" +" % endif\n" +"
\n" +" \n" +" % if event_address:\n" "
\n" " \n" "
\n" +" % endif\n" "
\n" " \n" " \n" @@ -479,8 +535,8 @@ msgid "" "\n" "\n" "\n" -"% if object.company_id\n" "\n" +" % if object.company_id\n" " \n" " \n" "
\n" " Sent by ${object.company_id.name}\n" @@ -490,8 +546,8 @@ msgid "" " % endif\n" "
\n" +" % endif\n" "\n" -"% endif\n" "\n" " " msgstr "" @@ -809,6 +865,7 @@ msgstr "" #. module: event #: model:ir.model.fields.selection,name:event.selection__event_registration__state__open +#: model_terms:ir.ui.view,arch_db:event.event_event_ticket_view_tree_from_event #: model_terms:ir.ui.view,arch_db:event.view_event_kanban #: model_terms:ir.ui.view,arch_db:event.view_registration_search msgid "Confirmed" @@ -1866,6 +1923,7 @@ msgstr "" #. module: event #: model:ir.model.fields,field_description:event.field_event_registration__date_open +#: model_terms:ir.ui.view,arch_db:event.view_event_registration_tree #: model_terms:ir.ui.view,arch_db:event.view_registration_search msgid "Registration Date" msgstr "" @@ -1933,11 +1991,6 @@ msgstr "" msgid "Reporting" msgstr "" -#. module: event -#: model_terms:ir.ui.view,arch_db:event.event_event_ticket_view_tree_from_event -msgid "Reserved" -msgstr "" - #. module: event #: model:ir.model.fields,field_description:event.field_event_event__seats_reserved #: model:ir.model.fields,field_description:event.field_event_event_ticket__seats_reserved @@ -1995,11 +2048,6 @@ msgstr "" msgid "Seats Limit" msgstr "" -#. module: event -#: model:event.type,name:event.event_type_data_ticket -msgid "Sell Online" -msgstr "" - #. module: event #: model_terms:ir.ui.view,arch_db:event.res_config_settings_view_form msgid "Sell tickets on your website" diff --git a/addons/event/views/event_menu_views.xml b/addons/event/views/event_menu_views.xml index ffb58639d61..ec2dd29e675 100644 --- a/addons/event/views/event_menu_views.xml +++ b/addons/event/views/event_menu_views.xml @@ -32,6 +32,10 @@ id="menu_event_type" sequence="1" parent="menu_event_configuration"/> + tree,form - + + + + diff --git a/addons/event/views/event_tag_views.xml b/addons/event/views/event_tag_views.xml index f5042a5d5f7..10c94b0e82c 100644 --- a/addons/event/views/event_tag_views.xml +++ b/addons/event/views/event_tag_views.xml @@ -61,12 +61,9 @@
-
-
- + +
diff --git a/addons/event/views/event_ticket_views.xml b/addons/event/views/event_ticket_views.xml index 1a9acb5efaf..51db5ed396b 100644 --- a/addons/event/views/event_ticket_views.xml +++ b/addons/event/views/event_ticket_views.xml @@ -71,11 +71,11 @@ - - - + + + - + diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml index 5930492effa..c367df894ce 100644 --- a/addons/event/views/event_views.xml +++ b/addons/event/views/event_views.xml @@ -72,10 +72,15 @@ -
+
+
@@ -226,22 +231,22 @@
- - - + + + - @@ -332,6 +337,7 @@ + @@ -369,7 +375,7 @@ Expected attendees -
+

Confirmed @@ -500,14 +506,14 @@ event.registration - + - - - + + + - + diff --git a/addons/event_sale/i18n/event_sale.pot b/addons/event_sale/i18n/event_sale.pot index 5657912fddf..5013a5dd6bf 100644 --- a/addons/event_sale/i18n/event_sale.pot +++ b/addons/event_sale/i18n/event_sale.pot @@ -362,6 +362,7 @@ msgstr "" #. module: event_sale #: model:ir.model,name:event_sale.model_sale_order +#: model:ir.model.fields,field_description:event_sale.field_event_registration__sale_order_id #: model:ir.model.fields,field_description:event_sale.field_registration_editor__sale_order_id msgid "Sales Order" msgstr "" @@ -388,11 +389,6 @@ msgstr "" msgid "Source" msgstr "" -#. module: event_sale -#: model:ir.model.fields,field_description:event_sale.field_event_registration__sale_order_id -msgid "Source Sales Order" -msgstr "" - #. module: event_sale #: model_terms:ir.ui.view,arch_db:event_sale.event_event_report_template_badge msgid "Ticket Type" diff --git a/addons/event_sale/models/event_registration.py b/addons/event_sale/models/event_registration.py index cd35ff5d2e4..f7b6d79a395 100644 --- a/addons/event_sale/models/event_registration.py +++ b/addons/event_sale/models/event_registration.py @@ -10,7 +10,7 @@ class EventRegistration(models.Model): is_paid = fields.Boolean('Is Paid') # TDE FIXME: maybe add an onchange on sale_order_id - sale_order_id = fields.Many2one('sale.order', string='Source Sales Order', ondelete='cascade', copy=False) + sale_order_id = fields.Many2one('sale.order', string='Sales Order', ondelete='cascade', copy=False) sale_order_line_id = fields.Many2one('sale.order.line', string='Sales Order Line', ondelete='cascade', copy=False) payment_status = fields.Selection(string="Payment Status", selection=[ ('to_pay', 'Not Paid'), diff --git a/addons/event_sale/views/event_registration_views.xml b/addons/event_sale/views/event_registration_views.xml index fcaf61ebfbf..eb091bd011f 100644 --- a/addons/event_sale/views/event_registration_views.xml +++ b/addons/event_sale/views/event_registration_views.xml @@ -7,7 +7,7 @@ - + diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 163b811928e..849df56e298 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -1055,7 +1055,7 @@ Sitemap: sitemap.xml