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

[UPD] use sequence for manually drag rooms to define the order in calendars and tree views

Browse Source
This commit is contained in:
Pablo
2019-02-18 17:32:56 +01:00
parent 97bfc509d3
commit ad627339af
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hotel_calendar/__manifest__.py
View File

@@ -23,8 +23,8 @@
'views/general.xml',
'views/actions.xml',
'views/inherited_res_users_views.xml',
'views/inherited_hotel_room_type_views.xml',
'views/inherited_hotel_room_views.xml',
# 'views/inherited_hotel_room_type_views.xml',
# 'views/inherited_hotel_room_views.xml',
'views/hotel_reservation_views.xml',
'views/hotel_calendar_management_views.xml',
'views/hotel_calendar_views.xml',

4
hotel_calendar/models/__init__.py
View File

@@ -5,8 +5,8 @@ from . import bus_hotel_calendar
from . import hotel_calendar_management
from . import inherited_hotel_reservation
from . import inherited_res_users
from . import inherited_hotel_room
from . import inherited_hotel_room_type
# from . import inherited_hotel_room
# from . import inherited_hotel_room_type
from . import inherited_hotel_room_type_restriction_item
from . import inherited_product_pricelist
from . import inherited_product_pricelist_item

2
hotel_calendar/models/hotel_calendar_management.py
View File

@@ -236,7 +236,7 @@ class HotelCalendarManagement(models.TransientModel):
if withRooms:
room_ids = self.env['hotel.room.type'].search(
[],
order='hcal_sequence ASC')
order='sequence ASC')
json_rooms = self._hcalendar_room_json_data(room_ids)
vals.update({'rooms': json_rooms or []})

4
hotel_calendar/models/inherited_hotel_reservation.py
View File

@@ -294,7 +294,7 @@ class HotelReservation(models.Model):
json_rooms_rests = {}
room_typed_ids = self.env['hotel.room.type'].search(
[],
order='hcal_sequence ASC')
order='sequence ASC')
room_type_rest_obj = self.env['hotel.room.type.restriction.item']
rtype_rest_ids = room_type_rest_obj.search([
('room_type_id', 'in', room_typed_ids.ids),
@@ -368,7 +368,7 @@ class HotelReservation(models.Model):
dfrom_dt = fields.Date.from_string(dfrom)
dto_dt = fields.Date.from_string(dto)
rooms = self.env['hotel.room'].search([], order='hcal_sequence ASC')
rooms = self.env['hotel.room'].search([], order='sequence ASC')
json_res, json_res_tooltips = self.get_hcalendar_reservations_data(
dfrom_dt, dto_dt, rooms)

2
hotel_calendar/models/inherited_hotel_room.py
View File

@@ -6,4 +6,4 @@ from odoo import models, fields
class HotelRoom(models.Model):
_inherit = 'hotel.room'
hcal_sequence = fields.Integer('Calendar Sequence', default=0)
# hcal_sequence = fields.Integer('Calendar Sequence', default=0)

2
hotel_calendar/models/inherited_hotel_room_type.py
View File

@@ -6,4 +6,4 @@ from odoo import models, fields
class HotelRoomType(models.Model):
_inherit = 'hotel.room.type'
hcal_sequence = fields.Integer('Calendar Sequence', default=0)
# hcal_sequence = fields.Integer('Calendar Sequence', default=0)