From 439cdb6871b03a4af9a64fe5945e862d6c8768e2 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 18 May 2015 12:42:17 +0200
Subject: [PATCH] [FIX] report: print time in user timezone

In reports calling the internal headers layout,
e.g. the general ledger,
the print time was displayed in UTC,
while it should be in user tz.

closes #3341
opw-612043
---
 addons/report/models/report.py  | 5 ++++-
 addons/report/views/layouts.xml | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/report/models/report.py b/addons/report/models/report.py
index f0e2b4008ea..9c3e0cccd50 100644
--- a/addons/report/models/report.py
+++ b/addons/report/models/report.py
@@ -22,7 +22,7 @@
 from openerp import api
 from openerp import SUPERUSER_ID
 from openerp.exceptions import AccessError
-from openerp.osv import osv
+from openerp.osv import osv, fields
 from openerp.tools import config
 from openerp.tools.misc import find_in_path
 from openerp.tools.translate import _
@@ -38,6 +38,7 @@ import lxml.html
 import os
 import subprocess
 from contextlib import closing
+from datetime import datetime
 from distutils.version import LooseVersion
 from functools import partial
 from pyPdf import PdfFileWriter, PdfFileReader
@@ -142,6 +143,8 @@ class Report(osv.Model):
                 context = dict(context, translatable=context.get('lang') != request.website.default_lang_code)
         values.update(
             time=time,
+            datetime=datetime,
+            context_timestamp=lambda t: fields.datetime.context_timestamp(cr, uid, t, context),
             translate_doc=translate_doc,
             editable=True,
             user=user,
diff --git a/addons/report/views/layouts.xml b/addons/report/views/layouts.xml
index c9bf8708185..963810c384e 100644
--- a/addons/report/views/layouts.xml
+++ b/addons/report/views/layouts.xml
@@ -123,8 +123,7 @@
     <div class="header">
         <div class="row">
             <div class="col-xs-3">
-                <span t-esc="time.strftime('%Y-%m-%d')"/>
-                <span t-esc="time.strftime('%H:%M')"/>
+                <span t-esc="context_timestamp(datetime.now()).strftime('%Y-%m-%d %H:%M')"/>
             </div>
             <div class="col-xs-2 col-xs-offset-2 text-center">
                 <span t-esc="company.name"/>