From c3d2be19f58436997c3d2d671f63bbaafc84b781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 1 Aug 2018 11:37:09 +0200 Subject: [PATCH] Add support of timestamp field on client issue6463 review50521002 --- trytond/model/fields/date.py | 1 + trytond/model/model.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/trytond/model/fields/date.py b/trytond/model/fields/date.py index f5c214d761..78a45145eb 100644 --- a/trytond/model/fields/date.py +++ b/trytond/model/fields/date.py @@ -99,6 +99,7 @@ class Timestamp(Field): ''' _type = 'timestamp' _sql_type = 'TIMESTAMP' + format = '%H:%M:%S.%f' def sql_format(self, value): if value is None: diff --git a/trytond/model/model.py b/trytond/model/model.py index 0474296cf9..0b7fe370a8 100644 --- a/trytond/model/model.py +++ b/trytond/model/model.py @@ -322,7 +322,7 @@ class Model(WarningErrorMixin, URLMixin, PoolBase, metaclass=ModelMeta): # Set relation_field only if there is no ambiguity if len(relation_fields) == 1: res[field]['relation_field'], = relation_fields - if res[field]['type'] in ('datetime', 'time'): + if res[field]['type'] in ('datetime', 'time', 'timestamp'): res[field]['format'] = copy.copy(cls._fields[field].format) if res[field]['type'] == 'selection': res[field]['context'] = copy.copy(cls._fields[field].context)