[MERGE] forward port of branch saas-3 up to 643bbcb
This commit is contained in:
commit
00762bbae0
|
@ -521,6 +521,11 @@ class datetime(_column):
|
||||||
exc_info=True)
|
exc_info=True)
|
||||||
return utc_timestamp
|
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):
|
class binary(_column):
|
||||||
_type = 'binary'
|
_type = 'binary'
|
||||||
_symbol_c = '%s'
|
_symbol_c = '%s'
|
||||||
|
|
Loading…
Reference in New Issue