From 5aeca103e1606d2af5a523636d763956d2191023 Mon Sep 17 00:00:00 2001
From: Dario Lodeiros <dario@aloxa.eu>
Date: Wed, 7 Nov 2018 20:27:21 +0100
Subject: [PATCH] [WIP] Refactoring Code

---
 hotel/models/hotel_room_type.py                        |  2 +-
 hotel/views/hotel_room_amenities_views.xml             |  2 +-
 hotel/views/hotel_room_type_views.xml                  | 10 ++++++----
 hotel/views/hotel_room_views.xml                       |  2 +-
 .../models/hotel_room_type/importer.py                 |  2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/hotel/models/hotel_room_type.py b/hotel/models/hotel_room_type.py
index 0908740af..759f94d2d 100644
--- a/hotel/models/hotel_room_type.py
+++ b/hotel/models/hotel_room_type.py
@@ -19,7 +19,7 @@ class HotelRoomType(models.Model):
     room_ids = fields.One2many('hotel.room', 'room_type_id', 'Rooms')
     class_id = fields.Many2one('hotel.room.type.class', 'Hotel Type Class')
     room_amenity_ids = fields.Many2many('hotel.amenity',
-                                      'hotel_room_type_aminitie_rel',
+                                      'hotel_room_type_aminity_rel',
                                       'room_type_ids', 'amenity_ids',
                                       string='Room Type Amenities',
                                       help='List of Amenities.')
diff --git a/hotel/views/hotel_room_amenities_views.xml b/hotel/views/hotel_room_amenities_views.xml
index 3c34e30ae..be790f487 100644
--- a/hotel/views/hotel_room_amenities_views.xml
+++ b/hotel/views/hotel_room_amenities_views.xml
@@ -100,7 +100,7 @@
         <field name="res_model">hotel.amenity</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_hotel_room_amenity_list" />
+        <field name="view_id" ref="hotel_amenity_view_list" />
     </record>
     <menuitem name="Amenities" id="menu_action_hotel_room_amenity_view_form"
         action="action_hotel_room_amenity_view_form" sequence="2"
diff --git a/hotel/views/hotel_room_type_views.xml b/hotel/views/hotel_room_type_views.xml
index c7e8a2de4..b31b0be9d 100644
--- a/hotel/views/hotel_room_type_views.xml
+++ b/hotel/views/hotel_room_type_views.xml
@@ -31,10 +31,12 @@
                             <field name="room_ids" widget="many2many"/>
                         </group>
                     </group>
-                    <page string="Room Amenities">
-                        <separator string=" Room Amenities" />
-                        <field name="room_amenities" colspan="4" nolabel="1" />
-                    </page>
+                    <notebook>
+                        <page string="Room Amenities">
+                            <separator string=" Room Amenities" />
+                            <field name="room_amenity_ids" colspan="4" nolabel="1" />
+                        </page>
+                    </notebook>
                 </sheet>
             </form>
         </field>
diff --git a/hotel/views/hotel_room_views.xml b/hotel/views/hotel_room_views.xml
index c4788e508..137ca6579 100644
--- a/hotel/views/hotel_room_views.xml
+++ b/hotel/views/hotel_room_views.xml
@@ -169,7 +169,7 @@
         <field name="view_type">form</field>
         <!-- <field name="context">{'default_isroom':1,'default_rental':1}
         </field> -->
-        <field name="view_id" ref="view_hotel_room_tree" />
+        <field name="view_id" ref="hotel_room_view_tree" />
         <field name="view_mode">kanban,tree,form</field>
     </record>
 
diff --git a/hotel_channel_connector/models/hotel_room_type/importer.py b/hotel_channel_connector/models/hotel_room_type/importer.py
index e00395507..c972a3080 100644
--- a/hotel_channel_connector/models/hotel_room_type/importer.py
+++ b/hotel_channel_connector/models/hotel_room_type/importer.py
@@ -5,7 +5,7 @@ import logging
 from datetime import timedelta
 from odoo.exceptions import ValidationError
 from odoo.addons.component.core import Component
-from odoo.addons.sconnector.components.mapper import mapping
+from odoo.addons.connector.components.mapper import mapping
 from odoo import fields, api, _
 from odoo.tools import (
     DEFAULT_SERVER_DATE_FORMAT,