pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] P3: surprise, time.time() isn't falsy

Browse Source 
https://bugs.python.org/issue13936

That's a pretty sensible change, but it turns out we did have some
bits of resource which implicitly depended on the old behaviour.
This commit is contained in:
Xavier Morel
2017-08-19 02:34:23 +02:00
committed by Olivier Dony
parent 4d6d5c8290
commit 1edc84dfdf
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/resource/models/resource.py
+12 -4
View File
@@ -420,8 +420,12 @@ class ResourceCalendar(models.Model):
dtstart=start_dt,
until=end_dt,
byweekday=self._get_weekdays()):
start_time = day.date() == start_dt.date() and start_dt.time() or datetime.time.min
end_time = day.date() == end_dt.date() and end_dt.time() or datetime.time.max
start_time = datetime.time.min
if day.date() == start_dt.date():
start_time = start_dt.time()
end_time = datetime.time.max
if day.date() == end_dt.date() and end_dt.time() != datetime.time():
end_time = end_dt.time()
intervals = self._get_day_work_intervals(
day.date(),
@@ -445,8 +449,12 @@ class ResourceCalendar(models.Model):
dtstart=start_dt,
until=end_dt,
byweekday=self._get_weekdays()):
start_time = day.date() == start_dt.date() and start_dt.time() or datetime.time.min
end_time = day.date() == end_dt.date() and end_dt.time() or datetime.time.max
start_time = datetime.time.min
if day.date() == start_dt.date():
start_time = start_dt.time()
end_time = datetime.time.max
if day.date() == end_dt.date() and end_dt.time() != datetime.time():
end_time = end_dt.time()
intervals = self._get_day_leave_intervals(
day.date(),