From 52d99207e018adb914dc461238d3055d1b9d2dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 9 Feb 2015 23:00:39 +0100 Subject: [PATCH] Complete timedelta converter issue4026 review13811002 --- res.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/res.py b/res.py index f136d08adc..3c12920aea 100644 --- a/res.py +++ b/res.py @@ -16,9 +16,12 @@ class User: context_only=context_only) if user.company: res['company_work_time'] = { - 'Y': user.company.hours_per_work_year, - 'M': user.company.hours_per_work_month, - 'w': user.company.hours_per_work_week, - 'd': user.company.hours_per_work_day, + 'Y': user.company.hours_per_work_year * 60 * 60, + 'M': user.company.hours_per_work_month * 60 * 60, + 'w': user.company.hours_per_work_week * 60 * 60, + 'd': user.company.hours_per_work_day * 60 * 60, + 'h': 60 * 60, + 'm': 60, + 's': 1, } return res