odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] inline server formats in date & datetime converter methods 

bzr revid: xmo@openerp.com-20131129103943-1ba1jbm3xxk1p42t
This commit is contained in:
Xavier Morel 2013-11-29 11:39:43 +01:00
parent e477c1f617
commit c457c2197a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openerp/addons/base/ir/ir_qweb.py
View File

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