audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '11.0' of https://github.com/hootel/hootel into 11.0

Browse Source
This commit is contained in:
Dario Lodeiros
2019-06-05 12:10:07 +02:00
parent 137e4a4be0 d6f3314662
commit 2293a447ab
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hotel_ine/wizard/inewizard.py
View File

@@ -122,6 +122,7 @@ class Wizard(models.TransientModel):
('date', '>=', ine_start_search), ('date', '>=', ine_start_search),
('date', '<=', ine_end_search), ('date', '<=', ine_end_search),
('reservation_id.room_id.in_ine', '=', True), ('reservation_id.room_id.in_ine', '=', True),
('reservation_id.state', '!=', "cancelled"),
('reservation_id.reservation_type', '=', 'normal'), ('reservation_id.reservation_type', '=', 'normal'),
]) ])
room_nights = all_room_nights.filtered( room_nights = all_room_nights.filtered(
@@ -151,20 +152,20 @@ class Wizard(models.TransientModel):
dic_tabla[idx]['pernocta'] += room_night.reservation_id.adults dic_tabla[idx]['pernocta'] += room_night.reservation_id.adults
# Calculating outputs and entries # Calculating outputs and entries
count = 1
last_stay = 0 last_stay = 0
for idx, row in enumerate(dic_tabla): for idx, row in enumerate(dic_tabla):
if count == last_day: if dic_tabla[idx]['dia'] == 1:
last_stay = 0 last_stay = 0
count = 1
count += 1
if last_stay < dic_tabla[idx]['pernocta']: if last_stay < dic_tabla[idx]['pernocta']:
dic_tabla[idx]['entradas'] += dic_tabla[idx]['pernocta'] dic_tabla[idx]['entradas'] += dic_tabla[idx]['pernocta'] - last_stay
elif last_stay > dic_tabla[idx]['pernocta']: elif last_stay > dic_tabla[idx]['pernocta']:
dic_tabla[idx]['salidas'] += last_stay - dic_tabla[idx][ dic_tabla[idx]['salidas'] += last_stay - dic_tabla[idx][
'pernocta'] 'pernocta']
# _logger.warning("%s: %s Perenocta: %s In: %s Out: %s Last=%s", dic_tabla[idx]['ine'], dic_tabla[idx]['dia'], dic_tabla[idx]['pernocta'], dic_tabla[idx]['entradas'], dic_tabla[idx]['salidas'],last_stay)
last_stay = dic_tabla[idx]['pernocta'] last_stay = dic_tabla[idx]['pernocta']
# "Print" outputs and entries # "Print" outputs and entries
ine_residen = "" ine_residen = ""
for idx, row in enumerate(dic_tabla): for idx, row in enumerate(dic_tabla):