From 88f06c467cfd8625ab58b556a2529c4ab4291c11 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Mon, 5 Nov 2012 18:03:18 +0100 Subject: [PATCH] [IMP] use tools.DEFAULT_SERVER_DATETIME_FORMAT bzr revid: abo@openerp.com-20121105170318-fmq31jsjf1xriqnh --- addons/hr_holidays/hr_holidays.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 7181f836bb5..f315f3d4ef3 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -27,6 +27,7 @@ from operator import itemgetter import math import netsvc +import tools from osv import fields, osv from tools.translate import _ @@ -217,11 +218,10 @@ class hr_holidays(osv.osv): raise osv.except_osv(_('Warning!'),_('The start date must be anterior to the end date.')) result = {'value': {}} - DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S" # No date_to set so far: automatically compute one 8 hours later if date_from and not date_to: - date_to_with_delta = datetime.datetime.strptime(date_from, DATETIME_FORMAT) + datetime.timedelta(hours=8) + date_to_with_delta = datetime.datetime.strptime(date_from, tools.DEFAULT_SERVER_DATETIME_FORMAT) + datetime.timedelta(hours=8) result['value']['date_to'] = str(date_to_with_delta) # Compute and update the number of days