From 97f85c0efe1719fa31d2276b907e9fa87df0f325 Mon Sep 17 00:00:00 2001 From: Pablo Date: Thu, 2 May 2019 11:23:58 +0200 Subject: [PATCH 1/3] [FIX] save_changes in hotel calendar --- .../static/src/js/views/calendar/hotel_calendar_model.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_model.js b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_model.js index d8bfa791b..e846dc11f 100644 --- a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_model.js +++ b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_model.js @@ -164,8 +164,7 @@ return AbstractModel.extend({ }, save_changes: function(params) { - //params.splice(0, 0, false); // FIXME: ID=False because first parameter its an integer - //console.log(params); + params.splice(0, 0, false); // FIXME: ID=False because first parameter its an integer return this._rpc({ model: 'hotel.calendar.management', method: 'save_changes', From a0b2448b66b905f164f16cb6e5238d13265047e3 Mon Sep 17 00:00:00 2001 From: Pablo Date: Thu, 2 May 2019 13:03:18 +0200 Subject: [PATCH 2/3] [FIX] search in account.invoice model --- .../static/src/js/views/calendar/hotel_calendar_renderer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js index b4f56dd57..58a379a0b 100644 --- a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js +++ b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js @@ -240,7 +240,7 @@ var HotelCalendarView = AbstractRenderer.extend({ model = 'hotel.checkin.partner'; title = _t('Checkins'); } else if (type === 'invoice') { - model = 'sale.order'; + model = 'account.invoice'; title = _t('Invoices'); } else if (type === 'folio') { model = 'hotel.folio' From ed54828b4100e12605786d2391b42306656031ea Mon Sep 17 00:00:00 2001 From: Pablo Date: Thu, 2 May 2019 18:57:17 +0200 Subject: [PATCH 3/3] [FIX] type in inherited + search invoice by number --- .../static/src/js/views/calendar/hotel_calendar_renderer.js | 4 ++++ .../static/src/js/views/hotel_calendar_renderer.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js index 58a379a0b..74f1d7de5 100644 --- a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js +++ b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js @@ -227,6 +227,10 @@ var HotelCalendarView = AbstractRenderer.extend({ ['partner_id.vat', 'ilike', tsearch], ['partner_id.email', 'ilike', tsearch], ['partner_id.phone', 'ilike', tsearch]); + if (type === 'invoice') { + domain.splice(0, 0, '|'); + domain.push(['number', 'ilike', tsearch]); + } return domain; }, diff --git a/hotel_calendar_channel_connector/static/src/js/views/hotel_calendar_renderer.js b/hotel_calendar_channel_connector/static/src/js/views/hotel_calendar_renderer.js index 5bf257cc2..9c5c1b84d 100644 --- a/hotel_calendar_channel_connector/static/src/js/views/hotel_calendar_renderer.js +++ b/hotel_calendar_channel_connector/static/src/js/views/hotel_calendar_renderer.js @@ -40,7 +40,7 @@ odoo.define('hotel_calendar_channel_connector.PMSHotelCalendarRenderer', functio }, _generate_search_domain: function(tsearch, type) { - var domain = this._super(tsearch); + var domain = this._super(tsearch, type); if (type === 'book') { domain.splice(0, 0, '|');