diff --git a/hotel_calendar/static/src/js/views/calendar_management/hotel_calendar_management_controller.js b/hotel_calendar/static/src/js/views/calendar_management/hotel_calendar_management_controller.js index 8f0d9cf79..08bbdb913 100644 --- a/hotel_calendar/static/src/js/views/calendar_management/hotel_calendar_management_controller.js +++ b/hotel_calendar/static/src/js/views/calendar_management/hotel_calendar_management_controller.js @@ -101,8 +101,8 @@ var MPMSCalendarController = AbstractController.extend({ self.renderer._pricelist_id = results['pricelist_id']; self.renderer._restriction_id = results['restriction_id']; $.when( - self.model.get_pricelists(), - self.model.get_restrictions(), + self.model.get_pricelist_plans(), + self.model.get_restriction_plans(), ).then(function(a1, a2){ self.renderer.loadViewFilters(a1, a2); }) diff --git a/hotel_calendar/static/src/js/views/calendar_management/hotel_calendar_management_model.js b/hotel_calendar/static/src/js/views/calendar_management/hotel_calendar_management_model.js index 421c2fee4..76231030d 100644 --- a/hotel_calendar/static/src/js/views/calendar_management/hotel_calendar_management_model.js +++ b/hotel_calendar/static/src/js/views/calendar_management/hotel_calendar_management_model.js @@ -39,9 +39,10 @@ return AbstractModel.extend({ }); }, - get_pricelists: function () { - var domain = [['hotel_ids', 'in', Session.hotel_id]]; - domain.push(['pricelist_type', '=', 'daily']); + get_pricelist_plans: function () { + var domain = [['pricelist_type', '=', 'daily']]; + domain.push('|',['hotel_ids', 'in', Session.hotel_id], + ['hotel_ids', '=', false]); return this._rpc({ model: 'product.pricelist', method: 'search_read', @@ -50,8 +51,9 @@ return AbstractModel.extend({ }); }, - get_restrictions: function () { - var domain = [['hotel_ids', 'in', Session.hotel_id]]; + get_restriction_plans: function () { + // TODO: FIXME: search and read restriction plans for current hotel + var domain = [['item_ids.room_type_id.hotel_id', '=', Session.hotel_id]]; return this._rpc({ model: 'hotel.room.type.restriction', method: 'search_read',