From 2cdefa52ef508d1583231ebbfa517cb205200440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 30 Aug 2013 16:43:34 +0200 Subject: [PATCH] [FIX] resource: fixed computation with a False calendar id (spotted in stock_no_autopicking.py yml tests) bzr revid: tde@openerp.com-20130830144334-ong666lutkbibtrd --- addons/resource/resource.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/resource/resource.py b/addons/resource/resource.py index b2c3f54101e..859e31e82a0 100644 --- a/addons/resource/resource.py +++ b/addons/resource/resource.py @@ -20,13 +20,10 @@ ############################################################################## import datetime -# from datetime import datetime, timedelta from dateutil import rrule from dateutil.relativedelta import relativedelta -import itertools -import math from operator import itemgetter -import pytz +# import pytz from faces import * from openerp import tools @@ -182,7 +179,7 @@ class resource_calendar(osv.osv): :param date day_date: current day as a date """ - if id is None: + if not id: return day_date + relativedelta(days=1) weekdays = self.get_weekdays(cr, uid, id, context) @@ -205,7 +202,7 @@ class resource_calendar(osv.osv): :param date day_date: current day as a date """ - if id is None: + if not id: return day_date + relativedelta(days=-1) weekdays = self.get_weekdays(cr, uid, id, context) weekdays.reverse()