diff --git a/hotel/models/hotel_reservation.py b/hotel/models/hotel_reservation.py
index f2a9eab6b..094fe6179 100644
--- a/hotel/models/hotel_reservation.py
+++ b/hotel/models/hotel_reservation.py
@@ -270,9 +270,9 @@ class HotelReservation(models.Model):
 
     @api.model
     def create(self, vals):
-        vals.update(self._prepare_add_missing_fields(vals))
         if 'room_id' not in vals:
             vals.update(self._autoassign(vals))
+        vals.update(self._prepare_add_missing_fields(vals))
         if 'folio_id' in vals:
             folio = self.env["hotel.folio"].browse(vals['folio_id'])
             vals.update({'channel_type': folio.channel_type})
@@ -335,7 +335,7 @@ class HotelReservation(models.Model):
         """ Deduce missing required fields from the onchange """
         res = {}
         onchange_fields = ['room_id', 'reservation_type', 'currency_id', 'name']
-        if values.get('partner_id') and values.get('room_type_id'):
+        if values.get('room_type_id'):
             line = self.new(values)
             if any(f not in values for f in onchange_fields):
                 line.onchange_room_id()
@@ -825,11 +825,16 @@ class HotelReservation(models.Model):
         @param dto: range date to
         @return: array with the reservations _confirmed_ between dfrom and dto
         """
+        domain = self._get_domain_reservations_occupation(dfrom, dto)
+        return self.env['hotel.reservation'].search(domain)
+
+    @api.model
+    def _get_domain_reservations_occupation(self, dfrom, dto):
         domain = [('reservation_line_ids.date', '>=', dfrom),
                   ('reservation_line_ids.date', '<', dto),
                   ('state', '!=', 'cancelled'),
                   ('overbooking', '=', False)]
-        return self.env['hotel.reservation'].search(domain)
+        return domain
 
     @api.model
     def get_reservations_dates(self, dfrom, dto, room_type=False):