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

[FIX] resource: current_hour in interval_get_multi 

The minutes of dt_from(start date) must be taken into account by current_hour and not by
todo (hours).
This commit is contained in:
Goffin Simon 2015-09-14 15:12:40 +02:00
parent 2442fe2e4b
commit acf22b7bc8
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

@ -159,10 +159,10 @@ class resource_calendar(osv.osv):
continue
dt_leave = self._get_leaves(cr, uid, id, resource)
todo = hours + f_round(float(dt_from.minute)/60, 2)
todo = hours
result = []
maxrecur = 100
current_hour = dt_from.hour
current_hour = dt_from.hour + f_round(float(dt_from.minute)/60, 2)
while float_compare(todo, 0, 4) and maxrecur:
for (hour_from,hour_to) in [(item['hour_from'], item['hour_to']) for item in hours_by_cal[id] if item['dayofweek'] == str(dt_from.weekday())]:
h_from = dt_from.replace(hour=int(hour_from), minute=int((hour_from % 1)*60)).replace(tzinfo=tzinfo).astimezone(pytz.UTC)