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

[FIX] resource: Fix date/datetime comparison

Browse Source 
closes odoo/odoo#96632

X-original-commit: 4cea2adede45e51d5911278897e068bbf0abf792
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
Yannick Tivisse
2022-07-27 04:53:13 +02:00
parent 2ff8701447
commit f88a4c39b2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/resource/models/resource.py
+2 -2
View File
@@ -446,8 +446,8 @@ class ResourceCalendar(models.Model):
week_type = ResourceCalendarAttendance.get_week_type(day)
attendances = attendances_per_day[day.weekday() + 7 * week_type]
for attendance in attendances:
if (attendance.date_from and day < attendance.date_from) or\
(attendance.date_to and attendance.date_to < day):
if (attendance.date_from and day.date() < attendance.date_from) or\
(attendance.date_to and attendance.date_to < day.date()):
continue
day_from = datetime.combine(day, float_to_time(attendance.hour_from))
day_to = datetime.combine(day, float_to_time(attendance.hour_to))