From 4bd91f0cf58936bfaee4c106d0f3dca6d64c656c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 3 Oct 2020 23:37:02 +0200 Subject: [PATCH] Use contextual date format to format datetime When a datetime has min time, we must still use the contextual date format instead of the OS. issue9622 review326131002 --- tryton/common/domain_parser.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tryton/common/domain_parser.py b/tryton/common/domain_parser.py index c81eecb483..86e8328315 100644 --- a/tryton/common/domain_parser.py +++ b/tryton/common/domain_parser.py @@ -338,14 +338,13 @@ def format_value(field, value, target=None, context=None): def format_datetime(): if not value: return '' - format_ = ( - date_format(context.get('date_format')) + ' ' + time_format(field)) if not isinstance(value, datetime.datetime): time = datetime.datetime.combine(value, datetime.time.min) else: time = timezoned_date(value) - if time.time() == datetime.time.min: - format_ = '%x' + format_ = date_format(context.get('date_format')) + if time.time() != datetime.time.min: + format_ += ' ' + time_format(field) return time.strftime(format_) def format_date():