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 pr_wubook_sale

Browse Source
This commit is contained in:
Dario Lodeiros
2019-03-14 00:18:47 +01:00
parent d49b7b4b4a 2076e6f995
commit bd6c4b0f7d
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hotel_channel_connector_wubook/models/hotel_reservation/common.py
View File

@@ -60,6 +60,7 @@ class HotelReservation(models.Model):
if user.has_group('hotel.group_hotel_call'): if user.has_group('hotel.group_hotel_call'):
self.write({'to_assign': True}) self.write({'to_assign': True})
<<<<<<< HEAD
<<<<<<< 2076e6f9957b19690791d7ef40bbd5b5c59c96dd <<<<<<< 2076e6f9957b19690791d7ef40bbd5b5c59c96dd
return super(HotelReservation, self).action_cancel() return super(HotelReservation, self).action_cancel()
@@ -73,6 +74,10 @@ class HotelReservation(models.Model):
self.sudo().env['channel.hotel.reservation']._event('on_record_cancel').notify(binding) self.sudo().env['channel.hotel.reservation']._event('on_record_cancel').notify(binding)
return res return res
>>>>>>> [WIP] Payments Notifications >>>>>>> [WIP] Payments Notifications
=======
return super(HotelReservation, self).action_cancel()
>>>>>>> 11.0
@api.multi @api.multi
def confirm(self): def confirm(self):
@@ -127,3 +132,5 @@ class HotelReservationAdapter(Component):
def cancel_reservation(self, channel_reservation_id, message): def cancel_reservation(self, channel_reservation_id, message):
return super(HotelReservationAdapter, self).cancel_reservation( return super(HotelReservationAdapter, self).cancel_reservation(
channel_reservation_id, message) channel_reservation_id, message)