[MERGE] forward port branch 8.0 up to f4aae1c

2016-10-11 17:58:16 +02:00
parent c4fb79ff88 f4aae1c58b
commit adead97e53
1 changed files with 1 additions and 1 deletions
@@ -69,7 +69,7 @@ def format_tz(pool, cr, uid, dt, tz=False, format=False, context=None):
        format_time = lang_params.get("time_format", '%I-%M %p')

        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 '')

 try: