From c457c2197a3cf582cfba984689ddf0d5ffb87f90 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 29 Nov 2013 11:39:43 +0100 Subject: [PATCH] [REF] inline server formats in date & datetime converter methods bzr revid: xmo@openerp.com-20131129103943-1ba1jbm3xxk1p42t --- openerp/addons/base/ir/ir_qweb.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py index 460833dbe17..a036dacf898 100644 --- a/openerp/addons/base/ir/ir_qweb.py +++ b/openerp/addons/base/ir/ir_qweb.py @@ -628,11 +628,11 @@ class DateConverter(osv.AbstractModel): if not value: return '' lang = self.user_lang(cr, uid, context=context) - parse_format = openerp.tools.DEFAULT_SERVER_DATE_FORMAT out_format = lang.date_format.encode('utf-8') if isinstance(value, basestring): - value = datetime.datetime.strptime(value, parse_format) + value = datetime.datetime.strptime( + value, openerp.tools.DEFAULT_SERVER_DATE_FORMAT) return value.strftime(out_format) @@ -644,11 +644,11 @@ class DateTimeConverter(osv.AbstractModel): if not value: return '' lang = self.user_lang(cr, uid, context=context) - parse_format = openerp.tools.DEFAULT_SERVER_DATETIME_FORMAT out_format = (u"%s %s" % (lang.date_format, lang.time_format)).encode('utf-8') if isinstance(value, basestring): - value = datetime.datetime.strptime(value, parse_format) + value = datetime.datetime.strptime( + value, openerp.tools.DEFAULT_SERVER_DATETIME_FORMAT) value = column.context_timestamp( cr, uid, timestamp=value, context=context)