Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX an overlap issue when a user requests 2 half-days on the same day with different types

Browse Source
This commit is contained in:
Alexis de Lattre
2015-06-11 09:47:26 +02:00
parent 7d0f3976dd
commit edcd3c7637
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hr_holidays_usability/hr_holidays.py
View File

@@ -244,7 +244,11 @@ class HrHolidays(orm.Model):
context = {}
hour = 0 # = morning
if vacation_time_from and vacation_time_from == 'noon':
hour = 12 # noon, LOCAL TIME
hour = 13 # noon, LOCAL TIME
# Warning : when the vacation STARTs at Noon, it starts at 1 p.m.
# to avoid an overlap (which would be blocked by a constraint of
# hr_holidays) if a user requests 2 half-days with different
# holiday types on the same day
datetime_str = False
if vacation_date_from:
date_dt = datetime.strptime(
@@ -265,7 +269,11 @@ class HrHolidays(orm.Model):
context=None):
hour = 23 # = evening
if vacation_time_to and vacation_time_to == 'noon':
hour = 14 # Noon, LOCAL TIME
hour = 12 # Noon, LOCAL TIME
# Warning : when vacation STOPs at Noon, it stops at 12 a.m.
# to avoid an overlap (which would be blocked by a constraint of
# hr_holidays) if a user requests 2 half-days with different
# holiday types on the same day
datetime_str = False
if vacation_date_to:
date_dt = datetime.strptime(