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

2016-10-11 18:00:27 +02:00
parent 24a2217980 adead97e53
commit 7bdb6f9c8d
1 changed files with 1 additions and 1 deletions
@@ -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')

        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: