Skip to content
Snippets Groups Projects
Commit 7bdb6f9c authored by Christophe Simonis's avatar Christophe Simonis
Browse files

[MERGE] forward port branch saas-6 up to adead97e

parents 24a22179 adead97e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
addons/mail/models/mail_template.py
+ 1
− 1
View file @ 7bdb6f9c
...@@ -50,7 +50,7 @@ def format_tz(pool, cr, uid, dt, tz=False, format=False, context=None): ...@@ -50,7 +50,7 @@ def format_tz(pool, cr, uid, dt, tz=False, format=False, context=None):
format_time = lang_params.get("time_format", '%I-%M %p') format_time = lang_params.get("time_format", '%I-%M %p')
fdate = ts.strftime(format_date).decode('utf-8') fdate = ts.strftime(format_date).decode('utf-8')
ftime = ts.strftime(format_time) ftime = ts.strftime(format_time).decode('utf-8')
return "%s %s%s" % (fdate, ftime, (' (%s)' % tz) if tz else '') return "%s %s%s" % (fdate, ftime, (' (%s)' % tz) if tz else '')
try: try:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment