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' into hotel_node_master

Browse Source
This commit is contained in:
Pablo
2018-10-24 11:23:05 +02:00
parent 4d4b6d41ec c6e00ba109
commit 69c02dc916
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hotel/models/hotel_reservation.py
View File

@@ -334,11 +334,15 @@ class HotelReservation(models.Model):
def _prepare_add_missing_fields(self, values):
""" Deduce missing required fields from the onchange """
res = {}
onchange_fields = ['room_id', 'pricelist_id', 'reservation_type', 'currency_id']
if values.get('partner_id') and values.get('room_type_id') and \
any(f not in values for f in onchange_fields):
onchange_fields = ['room_id', 'reservation_type', 'currency_id']
if values.get('partner_id') and values.get('room_type_id'):
line = self.new(values)
line.onchange_room_id()
if any(f not in values for f in onchange_fields):
line.onchange_room_id()
if 'name' not in values:
line.onchange_compute_reservation_description()
if 'pricelist_id' not in values:
line.onchange_partner_id()
for field in onchange_fields:
if field not in values:
res[field] = line._fields[field].convert_to_write(line[field], line)
@@ -353,7 +357,7 @@ class HotelReservation(models.Model):
if checkin and checkout and room_type:
room_chosen = self.env['hotel.room.type'].check_availability_room(checkin, checkout, room_type)[0]
res.update({
'room_id': room_chosen
'room_id': room_chosen.id
})
return res