[FIX] Athom and Git playing with me... grrr

This commit is contained in:
Dario Lodeiros
2019-03-14 00:27:05 +01:00
parent 7a28f85104
commit 58d1eba117

View File

@@ -60,25 +60,8 @@ class HotelReservation(models.Model):
if user.has_group('hotel.group_hotel_call'):
self.write({'to_assign': True})
<<<<<<< HEAD
<<<<<<< 2076e6f9957b19690791d7ef40bbd5b5c59c96dd
return super(HotelReservation, self).action_cancel()
=======
res = super(HotelReservation, self).action_cancel()
for record in self:
# Only can cancel reservations created directly in wubook
for binding in record.channel_bind_ids:
if binding.external_id and not binding.ota_id and \
int(binding.channel_status) in WUBOOK_STATUS_GOOD:
self.sudo().env['channel.hotel.reservation']._event('on_record_cancel').notify(binding)
return res
>>>>>>> [WIP] Payments Notifications
=======
return super(HotelReservation, self).action_cancel()
>>>>>>> 11.0
@api.multi
def confirm(self):
for record in self:
@@ -132,5 +115,3 @@ class HotelReservationAdapter(Component):
def cancel_reservation(self, channel_reservation_id, message):
return super(HotelReservationAdapter, self).cancel_reservation(
channel_reservation_id, message)