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

[WIP][MIG][11.0] Hotel Improvements + Hotel Calendar

Browse Source
This commit is contained in:
QS5ELkMu
2018-09-06 00:06:37 +02:00
parent 0c7b3edd77
commit 52562f7341
70 changed files with 509 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hotel/wizard/checkinwizard.py
View File

@@ -212,7 +212,7 @@ class Wizard(models.TransientModel):
# show the checkin fields if a partner is selected
if self.op_select_partner == 'S' and self.partner_id.id != False:
write_vals.update({'checkin_mode': 1})
self.write(write_vals)
self.update(write_vals)
@api.onchange('op_select_partner')
def onchange_op_select_partner(self):

6
hotel/wizard/duplicate_reservation.py
View File

@@ -32,7 +32,7 @@ class DuplicateReservationWizard(models.TransientModel):
}))
# Check Input
avails = hotel_room_type_obj.check_availability_virtual_room(
avails = hotel_room_type_obj.check_availability_room(
reservation_id.checkin,
reservation_id.checkout,
room_type_id=reservation_id.room_type_id.id)
@@ -43,10 +43,10 @@ class DuplicateReservationWizard(models.TransientModel):
There are no '%d' free rooms") % self.num)
for i in range(0, self.num):
free_rooms = hotel_room_type_obj.check_availability_virtual_room(
free_rooms = hotel_room_type_obj.check_availability_room(
reservation_id.checkin,
reservation_id.checkout,
virtual_room_id=reservation_id.room_type_id.id)
room_type_id=reservation_id.room_type_id.id)
if any(free_rooms):
new_reservation_id = hotel_reservation_obj.create({
'room_id': free_rooms[0].id,

8
hotel/wizard/massive_changes.py
View File

@@ -30,7 +30,7 @@ class MassiveChangesWizard(models.TransientModel):
('0', 'Global'),
('1', 'Virtual Room'),
], string='Applied On', default='0')
# virtual_room_ids = fields.Many2many('hotel.virtual.room',
# room_type_ids = fields.Many2many('hotel.virtual.room',
# string="Virtual Rooms")
room_type_ids = fields.Many2many('hotel.room.type',
string="Room Types")
@@ -171,7 +171,7 @@ class MassiveChangesWizard(models.TransientModel):
('date_start', '>=', ndate.strftime(DEFAULT_SERVER_DATE_FORMAT)),
('date_end', '<=', ndate.strftime(DEFAULT_SERVER_DATE_FORMAT)),
('restriction_id', '=', record.restriction_id.id),
('applied_on', '=', '0_virtual_room'),
('applied_on', '=', '0_room_type'),
]
for room_type in room_types:
@@ -189,7 +189,7 @@ class MassiveChangesWizard(models.TransientModel):
'date_end': ndate.strftime(DEFAULT_SERVER_DATE_FORMAT),
'restriction_id': record.restriction_id.id,
'room_type_id': room_type.id,
'applied_on': '0_virtual_room',
'applied_on': '0_room_type',
})
hotel_room_type_re_it_obj.create(vals)
@@ -200,7 +200,7 @@ class MassiveChangesWizard(models.TransientModel):
if record.change_no_ota:
vals.update({'no_ota': record.no_ota})
if record.change_avail:
cavail = len(hotel_room_type_obj.check_availability_virtual_room(
cavail = len(hotel_room_type_obj.check_availability_room(
ndate.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
ndate.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
room_type_id=room_type.id))

2
hotel/wizard/massive_changes.xml
View File

@@ -10,7 +10,7 @@
<group>
<field name="section" required="1" />
<field name="applied_on" required="1" />
<!-- <field name="virtual_room_ids" widget="many2many_tags" attrs="{'invisible':[('applied_on', '!=', '1')], 'required':[('applied_on', '=', '1')]}" /> -->
<!-- <field name="room_type_ids" widget="many2many_tags" attrs="{'invisible':[('applied_on', '!=', '1')], 'required':[('applied_on', '=', '1')]}" /> -->
<field name="room_type_ids" widget="many2many_tags" attrs="{'invisible':[('applied_on', '!=', '1')], 'required':[('applied_on', '=', '1')]}" />
</group>
<group colspan="8" col="8">

2
hotel/wizard/split_reservation.py
View File

@@ -64,7 +64,7 @@ class SplitReservationWizard(models.TransientModel):
'splitted': True,
'price_unit': tprice[1],
'parent_reservation': parent_res.id,
'virtual_room_id': parent_res.virtual_room_id.id,
'room_type_id': parent_res.room_type_id.id,
'discount': parent_res.discount,
})
reservation_copy = self.env['hotel.reservation'].create(vals)