diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
| commit | f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72 (patch) | |
| tree | a02d0dedc047ff296517530b50a33556e5d4f6c7 /addons/event/email_template.xml | |
| parent | 9d9cfd585f56bf64126e7316ea60ea5131a02059 (diff) | |
| parent | 4f5cc00420c6af5430ac921e89f217dcedaa1b8f (diff) | |
Merge branch 'server-trunk'
Conflicts:
addons/mass_mailing/controllers/main.py
Diffstat (limited to 'addons/event/email_template.xml')
| -rw-r--r-- | addons/event/email_template.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/event/email_template.xml b/addons/event/email_template.xml index d4479bcfc87..d99774acd3c 100644 --- a/addons/event/email_template.xml +++ b/addons/event/email_template.xml @@ -9,7 +9,7 @@ <field name="subject">Your registration at ${object.event_id.name}</field> <field name="body_html"><![CDATA[ <p>Hello ${object.name},</p> - <p>The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin_located.strftime('%Y-%m-%d %H:%M:%S (%Z)')} to ${object.event_id.date_end_located.strftime('%Y-%m-%d %H:%M:%S (%Z)')}. + <p>The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin} to ${object.event_id.date_end}. For any further information please contact our event department.</p> <p>Thank you for your participation!</p> <p>Best regards</p>]]></field> |