[MERGE] forward port of branch 7.0 up to 27d8cb8
This commit is contained in:
commit
643bbcb00b
|
@ -407,6 +407,11 @@ class datetime(_column):
|
|||
exc_info=True)
|
||||
return utc_timestamp
|
||||
|
||||
@classmethod
|
||||
def _as_display_name(cls, field, cr, uid, obj, value, context=None):
|
||||
value = datetime.context_timestamp(cr, uid, DT.datetime.strptime(value, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context)
|
||||
return tools.ustr(value.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT))
|
||||
|
||||
class binary(_column):
|
||||
_type = 'binary'
|
||||
_symbol_c = '%s'
|
||||
|
|
Loading…
Reference in New Issue