odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] resource: fixed computation with a False calendar id (spotted in stock_no_autopicking.py yml tests) 

bzr revid: tde@openerp.com-20130830144334-ong666lutkbibtrd
This commit is contained in:
Thibault Delavallée 2013-08-30 16:43:34 +02:00
parent 83e0e842c2
commit 2cdefa52ef
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/resource/resource.py
View File

@ -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()