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

hotel_calendar/models/inherited_hotel_reservation.py

@@ -3,6 +3,7 @@
 import logging
 from datetime import timedelta
 from odoo import models, fields, api, _
+from odoo.models import operator
 from odoo.exceptions import ValidationError
 from odoo.tools import DEFAULT_SERVER_DATE_FORMAT
 _logger = logging.getLogger(__name__)
@@ -246,16 +247,16 @@ class HotelReservation(models.Model):
 
         self.env.cr.execute('''
             WITH RECURSIVE gen_table_days AS (
-              SELECT hrt.id, %s::Date AS date
+              SELECT hrt.id, %s::Date AS date, hrt.sequence
               FROM hotel_room_type AS hrt
                 UNION ALL
-              SELECT hrt.id, (td.date + INTERVAL '1 day')::Date
+              SELECT hrt.id, (td.date + INTERVAL '1 day')::Date, hrt.sequence
               FROM gen_table_days as td
               LEFT JOIN hotel_room_type AS hrt ON hrt.id=td.id
               WHERE td.date < %s
             )
             SELECT
-              TO_CHAR(gtd.date, 'DD/MM/YYYY') as date, gtd.id as room_type_id,
+              TO_CHAR(gtd.date, 'DD/MM/YYYY') as date, gtd.id as room_type_id, gtd.sequence,
               pt.name, ppi.fixed_price as price, pt.list_price
             FROM gen_table_days AS gtd
             LEFT JOIN hotel_room_type AS hrt ON hrt.id = gtd.id
@@ -273,13 +274,17 @@ class HotelReservation(models.Model):
                 json_data.setdefault(results['room_type_id'], {}).update({
                     'title': results['name'],
                     'room': results['room_type_id'],
+                    'sequence': results['sequence'],
                 })
             json_data[results['room_type_id']].setdefault('days', {}).update({
                 results['date']: results['price'] or results['list_price']
             })
 
+        json_data_by_sequence = list(json_data.values())
+        json_data_by_sequence.sort(key=operator.itemgetter('sequence'))
+
         json_rooms_prices = {}
-        for prices in list(json_data.values()):
+        for prices in json_data_by_sequence:
             json_rooms_prices.setdefault(pricelist_id, []).append(prices)
         return json_rooms_prices
 

hotel_data_bi/security/ir.model.access.csv

@@ -7,6 +7,7 @@ access_hotel_reservation_line,hoteldatabi.hotel_reservation_line,hotel.model_hot
 access_hotel_reservation,hoteldatabi.hotel_reservation,hotel.model_hotel_reservation,hotel_data_bi.group_hotel_export_data,1,0,0,0
 access_hotel_board_service,hoteldatabi.hotel_board_service,hotel.model_hotel_board_service,hotel_data_bi.group_hotel_export_data,1,0,0,0
 access_hotel_board_service_line,hoteldatabi.hotel_board_service_line,hotel.model_hotel_board_service_line,hotel_data_bi.group_hotel_export_data,1,0,0,0
+access_hotel_board_service_room_type,hoteldatabi.hotel_board_service_room_type,hotel.model_hotel_board_service_room_type,hotel_data_bi.group_hotel_export_data,1,0,0,0
 access_code_ine,hoteldatabi.code_ine,hotel_l10n_es.model_code_ine,hotel_data_bi.group_hotel_export_data,1,0,0,0
 access_budget ,hoteldatabi.budget,hotel_data_bi.model_budget,hotel_data_bi.group_hotel_export_data,1,0,0,0
 access_channel_ota_info,hoteldatabi.channel_ota_info,hotel_channel_connector.model_channel_ota_info,hotel_data_bi.group_hotel_export_data,1,0,0,0

kellys_daily_report/wizard/kellys_daily_pdf.py

@@ -26,10 +26,13 @@ class KellysWizard(models.TransientModel):
     _name = 'kellysreport'
 
     @api.model
+    def _get_default_date(self):
+        return date.today()
+
     def _get_default_habitaciones(self):
         return self.calculalimpiar(datetime.now())
 
-    date_start = fields.Date("Fecha del listado", default=date.today())
+    date_start = fields.Date("Fecha del listado", default=_get_default_date)
     habitaciones = fields.Many2many('kellysrooms', string="Limpieza:",
                                     default=_get_default_habitaciones)
     order = fields.Selection([