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 pr_onboard_service_line

Browse Source
This commit is contained in:
Dario Lodeiros
2018-12-16 12:56:19 +01:00
parent a6d37bd0d9 d974b5ee5d
commit ee97d7f3f1
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hotel_calendar/models/inherited_hotel_room_type_restriction_item.py
View File

@@ -60,12 +60,11 @@ class HotelRoomTypeResrtrictionItem(models.Model):
# Construct dictionary with relevant info of removed records # Construct dictionary with relevant info of removed records
unlink_vals = [] unlink_vals = []
for record in self: for record in self:
if record.restriction_id.id != restrictions_default_id or \ if record.restriction_id.id != restrictions_default_id:
record.applied_on != '0_room_type':
continue continue
unlink_vals.append({ unlink_vals.append({
'restriction_id': record.restriction_id.id, 'restriction_id': record.restriction_id.id,
'date': record.date_start, 'date': record.date,
'min_stay': 0, 'min_stay': 0,
'min_stay_arrival': 0, 'min_stay_arrival': 0,
'max_stay': 0, 'max_stay': 0,

1
hotel_calendar/tests/test_management_calendar.py
View File

@@ -112,7 +112,6 @@ class TestManagementCalendar(TestHotelCalendar):
rest_it_obj = self.env['hotel.room.type.restriction.item'].sudo( rest_it_obj = self.env['hotel.room.type.restriction.item'].sudo(
self.user_hotel_manager) self.user_hotel_manager)
rest_ids = rest_it_obj.search([ rest_ids = rest_it_obj.search([
('applied_on', '=', '0_room_type'),
('restriction_id', '=', self.default_restriction_id), ('restriction_id', '=', self.default_restriction_id),
('room_type_id', 'in', (self.hotel_room_type_budget.id, ('room_type_id', 'in', (self.hotel_room_type_budget.id,
self.hotel_room_type_special.id)), self.hotel_room_type_special.id)),