Yaltik/golem
1
0
Fork 2
Code Issues Pull Requests 4 Releases Activity

[FIX]GOLEM Resource : reservation can end at the same time new begin

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2018-02-18 17:36:32 +01:00
parent 518d2c8348
commit 05d5cc5cda
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
golem_resource/models/golem_resource_reservation.py
View File

@ -190,8 +190,8 @@ class GolemResourceReservation(models.Model):
('id', '!=', reservation.id)] ('id', '!=', reservation.id)]
reservations = self.env['golem.resource.reservation'].search(domain) reservations = self.env['golem.resource.reservation'].search(domain)
for other_res in reservations: for other_res in reservations:
if (other_res.hour_start <= reservation.hour_start <= other_res.hour_stop) or \ if (other_res.hour_start < reservation.hour_start < other_res.hour_stop) or \
(other_res.hour_start <= reservation.hour_stop <= other_res.hour_stop): (other_res.hour_start < reservation.hour_stop < other_res.hour_stop):
uerr = _('Not allowed, the resource is already taken ' uerr = _('Not allowed, the resource is already taken '
'during this period : from {} to {} this day, ' 'during this period : from {} to {} this day, '
'please choose another périod before confirming.') 'please choose another périod before confirming.')