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

[FIX]resource: interval_get_multi crashed when the interval of hours was greater than 24, because it was using datetime parameters instead of using timedelta to create a datetime in the future/past 

bzr revid: dle@openerp.com-20131114175244-iudygbtpbppuxbds
This commit is contained in:
Denis Ledoux 2013-11-14 18:52:44 +01:00
parent 7a752f5f03
commit 70d8172d32
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/resource/resource.py
View File

@ -177,8 +177,8 @@ class resource_calendar(osv.osv):
if leave_flag:
break
else:
d1 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(m)), int((m%1) * 60))
d2 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60))
d1 = datetime(dt_from.year, dt_from.month, dt_from.day) + timedelta(hours=int(math.floor(m)), minutes=int((m%1) * 60))
d2 = datetime(dt_from.year, dt_from.month, dt_from.day) + timedelta(hours=int(math.floor(hour_to)), minutes=int((hour_to%1) * 60))
result.append((d1, d2))
current_hour = hour_to
todo -= (hour_to - m)