From c380d37aa5216525a115d19449255746b28c17ba Mon Sep 17 00:00:00 2001
From: QS5ELkMu <dev@redneboa.es>
Date: Sun, 19 Aug 2018 03:44:09 +0200
Subject: [PATCH] [WIP][MIG][11.0] Odoo Connector

---
 .../__manifest__.py                           |  2 +-
 .../components/backend_adapter.py             |  1 -
 hotel_channel_connector/components/core.py    |  2 +-
 .../components/exporter.py                    |  1 +
 .../components/importer.py                    |  1 +
 hotel_channel_connector/data/cron_jobs.xml    |  4 +-
 hotel_channel_connector/data/menus.xml        | 36 +++------
 hotel_channel_connector/data/sequences.xml    |  4 +-
 ...py => hotel_channel_connector_ota_info.py} |  0
 .../models/hotel_reservation/common.py        |  2 +-
 hotel_channel_connector/views/general.xml     |  8 +-
 ....xml => hotel_channel_connector_issue.xml} | 36 ++++-----
 .../views/inherited_hotel_folio_views.xml     |  4 +-
 .../inherited_hotel_reservation_views.xml     | 20 ++---
 ..._hotel_virtual_room_availability_views.xml |  4 +-
 .../inherited_hotel_virtual_room_views.xml    | 10 +--
 ...inherited_product_pricelist_item_views.xml | 10 +--
 .../inherited_product_pricelist_views.xml     | 14 ++--
 ...nherited_reservation_restriction_views.xml |  6 +-
 .../views/res_config_views.xml                | 81 ++++++++++++++++++-
 .../views/wubook_channel_info_views.xml       | 33 --------
 ...ubook_hotel_channel_connector_ota_info.xml | 33 ++++++++
 22 files changed, 188 insertions(+), 124 deletions(-)
 rename hotel_channel_connector/models/{wubook_channel_info.py => hotel_channel_connector_ota_info.py} (100%)
 rename hotel_channel_connector/views/{wubook_issue_views.xml => hotel_channel_connector_issue.xml} (60%)
 delete mode 100644 hotel_channel_connector/views/wubook_channel_info_views.xml
 create mode 100644 hotel_channel_connector/views/wubook_hotel_channel_connector_ota_info.xml

diff --git a/hotel_calendar_channel_connector/__manifest__.py b/hotel_calendar_channel_connector/__manifest__.py
index ac888bdc5..a9a707498 100644
--- a/hotel_calendar_channel_connector/__manifest__.py
+++ b/hotel_calendar_channel_connector/__manifest__.py
@@ -46,7 +46,7 @@
     'test': [
     ],
 
-    'installable': True,
+    'installable': False,
     'auto_install': True,
     'application': False,
     'license': 'AGPL-3',
diff --git a/hotel_channel_connector/components/backend_adapter.py b/hotel_channel_connector/components/backend_adapter.py
index a644a071d..d40ee0446 100644
--- a/hotel_channel_connector/components/backend_adapter.py
+++ b/hotel_channel_connector/components/backend_adapter.py
@@ -1,6 +1,5 @@
 from odoo.addons.component.core import AbstractComponent
 from odoo.addons.queue_job.exception import RetryableJobError
-from odoo.addons.queue_job.exception import RetryableJobError
 from odoo.tools import (
     DEFAULT_SERVER_DATE_FORMAT,
     DEFAULT_SERVER_DATETIME_FORMAT)
diff --git a/hotel_channel_connector/components/core.py b/hotel_channel_connector/components/core.py
index 5502f0b40..9ed977565 100644
--- a/hotel_channel_connector/components/core.py
+++ b/hotel_channel_connector/components/core.py
@@ -1,5 +1,5 @@
 from odoo.addons.component.core import AbstractComponent
-
+from odoo import api
 
 class BaseHotelChannelConnectorComponent(AbstractComponent):
     _name = 'base.hotel.channel.connector'
diff --git a/hotel_channel_connector/components/exporter.py b/hotel_channel_connector/components/exporter.py
index 16080ec73..3b92a7323 100644
--- a/hotel_channel_connector/components/exporter.py
+++ b/hotel_channel_connector/components/exporter.py
@@ -7,6 +7,7 @@ from odoo.tools import (
     DEFAULT_SERVER_DATETIME_FORMAT)
 from .backend_adapter import DEFAULT_WUBOOK_DATE_FORMAT
 from odoo.addons.hotel import date_utils
+from odoo import api
 _logger = logging.getLogger(__name__)
 
 class HotelChannelConnectorExporter(AbstractComponent):
diff --git a/hotel_channel_connector/components/importer.py b/hotel_channel_connector/components/importer.py
index 1e7832046..4a57f0589 100644
--- a/hotel_channel_connector/components/importer.py
+++ b/hotel_channel_connector/components/importer.py
@@ -6,6 +6,7 @@ from odoo.tools import (
     DEFAULT_SERVER_DATE_FORMAT,
     DEFAULT_SERVER_DATETIME_FORMAT)
 from .backend_adapter import DEFAULT_WUBOOK_DATE_FORMAT
+from odoo import api
 _logger = logging.getLogger(__name__)
 
 class HotelChannelConnectorImporter(AbstractComponent):
diff --git a/hotel_channel_connector/data/cron_jobs.xml b/hotel_channel_connector/data/cron_jobs.xml
index a92b53d2f..2810968b4 100644
--- a/hotel_channel_connector/data/cron_jobs.xml
+++ b/hotel_channel_connector/data/cron_jobs.xml
@@ -1,5 +1,5 @@
 <odoo noupdate="1">
-  <record model="ir.cron" id="wubook_push_avail">
+  <!--record model="ir.cron" id="wubook_push_avail">
       <field name="name">WuBook Push Availability</field>
       <field name="interval_number">5</field>
       <field name="interval_type">minutes</field>
@@ -7,7 +7,7 @@
       <field name="doall" eval="False" />
       <field name="model_id" ref="model_wubook" />
       <field name="code">model.push_changes()</field>
-  </record>
+  </record-->
 
   <!--          <record id="wubook_corporate_fetch" model="ir.cron">
     <field name="name">WuBook Corporate Fetchable Properties</field>
diff --git a/hotel_channel_connector/data/menus.xml b/hotel_channel_connector/data/menus.xml
index 17dabeeb7..1abf0e2be 100644
--- a/hotel_channel_connector/data/menus.xml
+++ b/hotel_channel_connector/data/menus.xml
@@ -1,40 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-	<record model="ir.actions.act_window" id="open_wubook_channel_info_tree_all">
-		<field name="name">WuBook Channel Info</field>
-		<field name="res_model">wubook.channel.info</field>
+	<record model="ir.actions.act_window" id="open_hotel_channel_connector_ota_info_tree_all">
+		<field name="name">Hotel Channel Connector OTA's Info</field>
+		<field name="res_model">hotel_channel_connector_ota_info</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
 
-	<record model="ir.actions.act_window" id="open_wubook_issues_tree_all">
-		<field name="name">WuBook Issues</field>
-		<field name="res_model">wubook.issue</field>
+	<record model="ir.actions.act_window" id="open_hotel_channel_connector_issue_tree_all">
+		<field name="name">Hotel Channel Connector Issues</field>
+		<field name="res_model">hotel.channel.connector.issue</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
-		<field name="search_view_id" ref="view_wubook_issue_form_search"/>
+		<field name="search_view_id" ref="view_hotel_channel_connector_issue_form_search"/>
 		<field name="context">{"search_default_to_read":True}</field>
 	</record>
 
-    <record model="ir.actions.act_window" id="action_wubook_config">
-        <field name="name">Configure WuBook</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">wubook.config.settings</field>
-        <field name="view_id" ref="view_wubook_config_settings"/>
-        <field name="view_mode">form</field>
-        <field name="target">inline</field>
-    </record>
-
-
-	<menuitem id="wubook_menu" name="WuBook"
+	<menuitem id="hotel_channel_connector_menu" name="Hotel Channel Connector"
 	    sequence="25" parent="base.menu_administration" />
 
-	<menuitem id="wubook_channels_info_menu" name="Channels Info"
-		sequence="1" action="open_wubook_channel_info_tree_all" parent="wubook_menu"/>
-	<menuitem id="wubook_issues_menu" name="Issues"
-		sequence="2" action="open_wubook_issues_tree_all" parent="wubook_menu"/>
-	<menuitem id="wubook_config_menu" name="Settings"
-			sequence="3" action="action_wubook_config" parent="wubook_menu"/>
+	<menuitem id="hotel_channel_connector_ota_info_menu" name="Channels Info"
+		sequence="1" action="open_hotel_channel_connector_ota_info_tree_all" parent="hotel_channel_connector_menu"/>
+	<menuitem id="hotel_channel_connector_issue_menu" name="Issues"
+		sequence="2" action="open_hotel_channel_connector_issue_tree_all" parent="hotel_channel_connector_menu"/>
 
 </odoo>
diff --git a/hotel_channel_connector/data/sequences.xml b/hotel_channel_connector/data/sequences.xml
index 4143cc28e..6209d591f 100644
--- a/hotel_channel_connector/data/sequences.xml
+++ b/hotel_channel_connector/data/sequences.xml
@@ -3,9 +3,9 @@
 
 	<record model="ir.sequence" id="seq_vroom_id">
 	    <field name="name">Virtual Room Short Code</field>
-	    <field name="code">hotel.room.type</field>
+	    <field name="code">hotel.virtual.room</field>
 	    <field name="prefix"></field>
 	    <field name="padding">4</field>
 	</record>
-	
+
 </odoo>
diff --git a/hotel_channel_connector/models/wubook_channel_info.py b/hotel_channel_connector/models/hotel_channel_connector_ota_info.py
similarity index 100%
rename from hotel_channel_connector/models/wubook_channel_info.py
rename to hotel_channel_connector/models/hotel_channel_connector_ota_info.py
diff --git a/hotel_channel_connector/models/hotel_reservation/common.py b/hotel_channel_connector/models/hotel_reservation/common.py
index a19beb11b..0804cdf64 100644
--- a/hotel_channel_connector/models/hotel_reservation/common.py
+++ b/hotel_channel_connector/models/hotel_reservation/common.py
@@ -26,7 +26,7 @@ class ChannelHotelReservation(models.Model):
                              old_name='wchannel_id')
     ota_reservation_id = fields.Char("Channel OTA Reservation Code",
                                      readonly=True,
-                                     old_name='channel_reservation_code')
+                                     old_name='wchannel_reservation_code')
     is_from_ota = fields.Boolean('Is From OTA',
                                  compute=_is_from_ota, store=False,
                                  readonly=True,
diff --git a/hotel_channel_connector/views/general.xml b/hotel_channel_connector/views/general.xml
index 1fe1dcae3..f502c02d7 100644
--- a/hotel_channel_connector/views/general.xml
+++ b/hotel_channel_connector/views/general.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-	
+
 	<!-- Backend stuff -->
 	<template id="assets_backend" inherit_id="web.assets_backend">
 		<xpath expr="." position="inside">
-			<script type="text/javascript" src="/hotel_wubook_proto/static/src/js/wubook_listview_import_buttons.js"></script>
+			<script type="text/javascript" src="/hotel_channel_connector/static/src/js/wubook_listview_import_buttons.js"></script>
 		</xpath>
 	</template>
-	
-</odoo>
\ No newline at end of file
+
+</odoo>
diff --git a/hotel_channel_connector/views/wubook_issue_views.xml b/hotel_channel_connector/views/hotel_channel_connector_issue.xml
similarity index 60%
rename from hotel_channel_connector/views/wubook_issue_views.xml
rename to hotel_channel_connector/views/hotel_channel_connector_issue.xml
index bd4425dc4..0281f605b 100644
--- a/hotel_channel_connector/views/wubook_issue_views.xml
+++ b/hotel_channel_connector/views/hotel_channel_connector_issue.xml
@@ -2,11 +2,11 @@
 <odoo>
 
   <!-- FORM issue -->
-  <record id="wubook_issue_view_form" model="ir.ui.view">
-    <field name="name">wubook.issue.form</field>
-    <field name="model">wubook.issue</field>
+  <record id="hotel_channel_connector_issue_view_form" model="ir.ui.view">
+    <field name="name">hotel.channel.coonector.issue.form</field>
+    <field name="model">hotel.channel.coonector.issue</field>
     <field name="arch" type="xml">
-      <form string="WuBook Issue">
+      <form string="Channel Connector Issue">
         <sheet>
           <div class="oe_button_box" name="button_box">
               <button name="toggle_to_read" type="object" class="oe_stat_button" icon="fa-eye">
@@ -20,15 +20,15 @@
           </div>
           <group>
             <field name="section"/>
-            <field name="message"/>
+            <field name="internal_message"/>
           </group>
           <group>
             <field name="date_start"/>
             <field name="date_end"/>
           </group>
           <group>
-            <field name="wid"/>
-            <field name="wmessage"/>
+            <field name="channel_object_id"/>
+            <field name="channel_message"/>
           </group>
         </sheet>
       </form>
@@ -36,34 +36,34 @@
   </record>
 
   <!-- TREE issue -->
-  <record id="wubook_issue_view_tree" model="ir.ui.view">
-    <field name="name">wubook.issue.tree</field>
-    <field name="model">wubook.issue</field>
+  <record id="hotel_channel_connector_issue_view_tree" model="ir.ui.view">
+    <field name="name">hotel.channel.coonector.issue.tree</field>
+    <field name="model">hotel.channel.coonector.issue</field>
     <field name="type">tree</field>
     <field name="arch" type="xml">
-      <tree string="WuBook Issues">
+      <tree string="Channel Connector Issues">
         <field name="create_date"/>
         <field name="section"/>
-        <field name="message"/>
+        <field name="internal_message"/>
         <field name="date_start"/>
         <field name="date_end"/>
-        <field name="wid"/>
+        <field name="channel_object_id"/>
       </tree>
     </field>
   </record>
 
   <!-- SEARCH issue -->
-  <record id="view_wubook_issue_form_search" model="ir.ui.view">
-      <field name="name">wubook.issue.search</field>
-      <field name="model">wubook.issue</field>
+  <record id="view_hotel_channel_connector_issue_form_search" model="ir.ui.view">
+      <field name="name">hotel.channel.coonector.issue.search</field>
+      <field name="model">hotel.channel.coonector.issue</field>
       <field name="arch" type="xml">
           <search string="Issues">
             <field name="create_date"/>
             <field name="section"/>
-            <field name="message"/>
+            <field name="internal_message"/>
             <field name="date_start"/>
             <field name="date_end"/>
-            <field name="wid"/>
+            <field name="channel_object_id"/>
             <field name="to_read"/>
           </search>
       </field>
diff --git a/hotel_channel_connector/views/inherited_hotel_folio_views.xml b/hotel_channel_connector/views/inherited_hotel_folio_views.xml
index f50517e74..1f39f8702 100644
--- a/hotel_channel_connector/views/inherited_hotel_folio_views.xml
+++ b/hotel_channel_connector/views/inherited_hotel_folio_views.xml
@@ -18,7 +18,7 @@
         <field name="arch" type="xml">
             <xpath expr="//notebook/page/field[@name='room_lines']/tree/field[@name='checkout']" position="after">
                 <field name="origin_sale"/>
-                <field name="wis_from_channel" invisible="1"/>
+                <field name="is_from_ota" invisible="1"/>
             </xpath>
             <xpath expr="//notebook/page/field[@name='room_lines']/tree/field[@name='checkout']" position="attributes">
                 <attribute name="attrs">{'readonly': [('wis_from_channel', '!=', False)]}</attribute>
@@ -28,7 +28,7 @@
             </xpath>
             <xpath expr="//notebook/page/field[@name='room_lines']/form/sheet/header/field[@name='folio_id']" position="after">
                 <field name="origin_sale" invisible="1"/>
-                <field name="wis_from_channel" invisible="1"/>
+                <field name="is_from_ota" invisible="1"/>
             </xpath>
             <xpath expr="//notebook/page/field[@name='room_lines']/form/sheet/h3/field[@name='checkout']" position="attributes">
                 <attribute name="attrs">{'readonly': [('wis_from_channel', '!=', False)]}</attribute>
diff --git a/hotel_channel_connector/views/inherited_hotel_reservation_views.xml b/hotel_channel_connector/views/inherited_hotel_reservation_views.xml
index cf58536e5..faae321a5 100644
--- a/hotel_channel_connector/views/inherited_hotel_reservation_views.xml
+++ b/hotel_channel_connector/views/inherited_hotel_reservation_views.xml
@@ -10,13 +10,13 @@
             </xpath>
             <xpath expr="//field[@name='cardex_pending']" position="before">
                 <group colspan="6" col="6">
-                    <field name="wis_from_channel" readonly="True" invisible="True"/>
+                    <field name="is_from_ota" readonly="True" invisible="True"/>
                 </group>
             </xpath>
 
             <xpath expr="//field[@name='partner_internal_comment']" position="after">
                 <field name="able_to_modify_wubook" invisible="True"/>
-                <field name="wcustomer_notes" readonly="1"
+                <field name="customer_notes" readonly="1"
                     attrs="{'invisible': [('wrid','=',False)]}"
                     nolabel="1" colspan="2"
                 />
@@ -25,8 +25,8 @@
             <xpath expr="//page[@name='days']" position="after">
                 <page name="wubook" string="Wubook">
                     <group colspan="4" col="4">
-                        <field name="wrid" attrs='{"readonly": [("able_to_modify_wubook","=",False)]}'/>
-                        <field name="wchannel_reservation_code" attrs='{"readonly": [("able_to_modify_wubook","=",False)]}'/>
+                        <field name="channel_reservation_id" attrs='{"readonly": [("able_to_modify_wubook","=",False)]}'/>
+                        <field name="ota_reservation_code" attrs='{"readonly": [("able_to_modify_wubook","=",False)]}'/>
                         <field name="wstatus" attrs='{"readonly": [("able_to_modify_wubook","=",False)]}'/>
                         <field name="wstatus_reason" attrs='{"readonly": [("able_to_modify_wubook","=",False)]}'/>
                         <field name="to_read" invisible="0"/>
@@ -37,22 +37,22 @@
 
             <!-- ALLOW ONLY-READ -->
             <xpath expr="//field[@name='adults']" position="attributes">
-                <attribute name="attrs">{'readonly': [('wis_from_channel','=',True),('able_to_modify_wubook','=',False)]}</attribute>
+                <attribute name="attrs">{'readonly': [('is_from_ota','=',True),('able_to_modify_wubook','=',False)]}</attribute>
             </xpath>
             <xpath expr="//field[@name='virtual_room_id']" position="attributes">
-                <attribute name="attrs">{'readonly': [('wrid','!=',False),('able_to_modify_wubook','=',False)]}</attribute>
+                <attribute name="attrs">{'readonly': [('channel_reservation_id','!=',False),('able_to_modify_wubook','=',False)]}</attribute>
             </xpath>
             <xpath expr="//field[@name='children']" position="attributes">
-                <attribute name="attrs">{'readonly': [('wis_from_channel','=',True),('able_to_modify_wubook','=',False)]}</attribute>
+                <attribute name="attrs">{'readonly': [('is_from_ota','=',True),('able_to_modify_wubook','=',False)]}</attribute>
             </xpath>
             <xpath expr="//field[@name='checkin']" position="attributes">
-                <attribute name="attrs">{'readonly': [('wis_from_channel','=',True),('able_to_modify_wubook','=',False)]}</attribute>
+                <attribute name="attrs">{'readonly': [('is_from_ota','=',True),('able_to_modify_wubook','=',False)]}</attribute>
             </xpath>
             <xpath expr="//field[@name='checkout']" position="attributes">
-                <attribute name="attrs">{'readonly': [('wis_from_channel','=',True),('able_to_modify_wubook','=',False)]}</attribute>
+                <attribute name="attrs">{'readonly': [('is_from_ota','=',True),('able_to_modify_wubook','=',False)]}</attribute>
             </xpath>
             <xpath expr="//field[@name='reservation_line_ids']" position="attributes">
-                <attribute name="attrs">{'readonly': [('wis_from_channel','=',True),('able_to_modify_wubook','=',False)]}</attribute>
+                <attribute name="attrs">{'readonly': [('is_from_ota','=',True),('able_to_modify_wubook','=',False)]}</attribute>
             </xpath>
         </field>
     </record>
diff --git a/hotel_channel_connector/views/inherited_hotel_virtual_room_availability_views.xml b/hotel_channel_connector/views/inherited_hotel_virtual_room_availability_views.xml
index 4cf867141..46ada881c 100644
--- a/hotel_channel_connector/views/inherited_hotel_virtual_room_availability_views.xml
+++ b/hotel_channel_connector/views/inherited_hotel_virtual_room_availability_views.xml
@@ -7,7 +7,7 @@
         <field name="inherit_id" ref="hotel.virtual_room_availability_view_form" />
         <field name="arch" type="xml">
         	<xpath expr="//field[@name='avail']" position="after">
-        		<field name="wmax_avail" />
+        		<field name="channel_max_avail" />
         	</xpath>
         </field>
     </record>
@@ -19,7 +19,7 @@
       <field name="type">tree</field>
       <field name="arch" type="xml">
         <xpath expr="//field[@name='avail']" position="after">
-            <field name="wmax_avail" />
+            <field name="channel_max_avail" />
         </xpath>
       </field>
     </record>
diff --git a/hotel_channel_connector/views/inherited_hotel_virtual_room_views.xml b/hotel_channel_connector/views/inherited_hotel_virtual_room_views.xml
index 0e8193b74..b87ecd4b9 100644
--- a/hotel_channel_connector/views/inherited_hotel_virtual_room_views.xml
+++ b/hotel_channel_connector/views/inherited_hotel_virtual_room_views.xml
@@ -6,11 +6,11 @@
         <field name="inherit_id" ref="hotel.virtual_room_view_form" />
         <field name="arch" type="xml">
         	<xpath expr="//field[@name='name']" position="after">
-        		<field name="wscode" maxlength="4" readonly="True" />
-        		<field name="wrid" readonly="True"  />
-        		<field name="wcapacity" />
+        		<field name="channel_short_code" maxlength="4" readonly="True" />
+        		<field name="channel_reservation_id" readonly="True"  />
+        		<field name="ota_capacity" />
         	</xpath>
         </field>
     </record>
-    
-</odoo>
\ No newline at end of file
+
+</odoo>
diff --git a/hotel_channel_connector/views/inherited_product_pricelist_item_views.xml b/hotel_channel_connector/views/inherited_product_pricelist_item_views.xml
index 6ce838576..a37f810dc 100644
--- a/hotel_channel_connector/views/inherited_product_pricelist_item_views.xml
+++ b/hotel_channel_connector/views/inherited_product_pricelist_item_views.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <odoo>
-    
+
     <record id="product_pricelist_item_form_view" model="ir.ui.view">
 		<field name="model">product.pricelist.item</field>
 		<field name="inherit_id" ref="product.product_pricelist_item_form_view" />
-		<field name="arch" type="xml">        	
+		<field name="arch" type="xml">
 			<xpath expr="//field[@name='name']" position="after">
-				<field name="wpushed" readonly="True" />
-				<field name="wdaily" invisible="1" />
+				<field name="channel_pushed" readonly="True" />
+				<field name="is_daily_plan" invisible="1" />
 			</xpath>
 			<xpath expr="//field[@name='date_end']" position="attributes">
-				<attribute name="attrs">{'readonly': [('wdaily', '=', True)]}</attribute>
+				<attribute name="attrs">{'readonly': [('is_daily_plan', '=', True)]}</attribute>
 			</xpath>
 		</field>
 	</record>
diff --git a/hotel_channel_connector/views/inherited_product_pricelist_views.xml b/hotel_channel_connector/views/inherited_product_pricelist_views.xml
index 2e7fca25f..ace159618 100644
--- a/hotel_channel_connector/views/inherited_product_pricelist_views.xml
+++ b/hotel_channel_connector/views/inherited_product_pricelist_views.xml
@@ -7,25 +7,25 @@
         <field name="arch" type="xml">
 			<xpath expr="//form[1]//sheet" position="before">
             	<header>
-            		<button name="%(action_wubook_import_plan_prices)d" string="Import Prices From WuBook" type="action" class="oe_highlight" />
+            		<button name="%(action_channel_import_plan_prices)d" string="Import Prices From Channel" type="action" class="oe_highlight" />
             	</header>
 			</xpath>
         	<xpath expr="//field[@name='company_id']" position="after">
         		<field name="id" invisible="1"/>
-        		<field name="wpid" />
-        		<field name="wdaily" widget="checkbox" attrs="{'readonly':[('id', '>', 0)]}" />
+        		<field name="channel_plan_id" />
+        		<field name="is_daily_plan" widget="checkbox" attrs="{'readonly':[('id', '>', 0)]}" />
         	</xpath>
         </field>
     </record>
-    
+
 	<record id="product_pricelist_view_tree" model="ir.ui.view">
         <field name="model">product.pricelist</field>
         <field name="inherit_id" ref="product.product_pricelist_view_tree" />
         <field name="arch" type="xml">
         	<xpath expr="//field[@name='name']" position="after">
-        		<field name="wdaily" widget="checkbox" readonly="True" />
+        		<field name="is_daily_plan" widget="checkbox" readonly="True" />
         	</xpath>
         </field>
     </record>
-    
-</odoo>
\ No newline at end of file
+
+</odoo>
diff --git a/hotel_channel_connector/views/inherited_reservation_restriction_views.xml b/hotel_channel_connector/views/inherited_reservation_restriction_views.xml
index fb6407352..a5d64ad8c 100644
--- a/hotel_channel_connector/views/inherited_reservation_restriction_views.xml
+++ b/hotel_channel_connector/views/inherited_reservation_restriction_views.xml
@@ -7,12 +7,12 @@
         <field name="arch" type="xml">
 					<xpath expr="//form[1]//sheet" position="before">
 	        	<header>
-	        		<button name="%(action_wubook_import_plan_restrictions)d" string="Import Restrictions From WuBook" type="action" class="oe_highlight" />
+	        		<button name="%(action_channel_import_plan_restrictions)d" string="Import Restrictions From Channel" type="action" class="oe_highlight" />
 	        	</header>
 					</xpath>
         	<xpath expr="//field[@name='active']" position="after">
-        		<field name="wpid" />
-						<field name="wdaily" />
+        		<field name="channel_plan_id" />
+						<field name="is_daily_plan" />
         	</xpath>
         </field>
     </record>
diff --git a/hotel_channel_connector/views/res_config_views.xml b/hotel_channel_connector/views/res_config_views.xml
index f2147694c..3f336b368 100644
--- a/hotel_channel_connector/views/res_config_views.xml
+++ b/hotel_channel_connector/views/res_config_views.xml
@@ -1,12 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <!-- Hotel Channel Connector Settings -->
+    <record id="view_hotel_config_settings" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.hotel.channel.connector</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="80"/>
+        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('settings')]" position="inside">
+                <div class="app_settings_block" data-string="Hotel" string="Hotel" data-key="hotel" groups="hotel.group_hotel_manager">
+                    <h2>Hotel Parity</h2>
+                    <div class="row mt16 o_settings_container">
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <label for="parity_pricelist_id"/>
+                            <div class="text-muted">
+                                Set pricelist parity
+                            </div>
+                            <div class="content-group">
+                                <div class="mt16">
+                                    <field name="parity_pricelist_id" required="True" />
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <label for="parity_restrictions_id"/>
+                            <div class="text-muted">
+                                Set restrictions parity
+                            </div>
+                            <div class="content-group">
+                                <div class="mt16">
+                                    <field name="parity_restrictions_id" required="True" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <h2>Hotel Default Hours</h2>
+                    <div class="row mt16 o_settings_container">
+                        <div class="col-xs-12 col-md-12 o_setting_box">
+                            <label for="tz_hotel"/>
+                            <div class="text-muted">
+                                Set time-zone
+                            </div>
+                            <div class="content-group">
+                                <div class="mt16">
+                                    <field name="tz_hotel"/>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <label for="default_arrival_hour"/>
+                            <div class="text-muted">
+                                Set default arrival hour
+                            </div>
+                            <div class="content-group">
+                                <div class="mt16">
+                                    <field name="default_arrival_hour" required="True" />
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <label for="default_departure_hour"/>
+                            <div class="text-muted">
+                                Set default departure hour
+                            </div>
+                            <div class="content-group">
+                                <div class="mt16">
+                                    <field name="default_departure_hour" required="True" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
     <!-- WuBook config wizard -->
     <record id="view_wubook_config_settings" model="ir.ui.view">
-        <field name="name">WuBook Settings</field>
-        <field name="model">wubook.config.settings</field>
+        <field name="name">Channel Settings</field>
+        <field name="model">res.config.settings</field>
         <field name="arch" type="xml">
-            <form string="Configure WuBook" class="oe_form_configuration">
+            <form string="Configure Channel" class="oe_form_configuration">
                 <header>
                     <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                     <button string="Cancel" type="object" name="cancel" class="oe_link"/>
diff --git a/hotel_channel_connector/views/wubook_channel_info_views.xml b/hotel_channel_connector/views/wubook_channel_info_views.xml
deleted file mode 100644
index fcfa1de86..000000000
--- a/hotel_channel_connector/views/wubook_channel_info_views.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-       <!-- Form view -->
-       <record model="ir.ui.view" id="view_wubook_channel_info_form">
-            <field name="name">wubook.channel.info.form</field>
-            <field name="model">wubook.channel.info</field>
-            <field name="arch" type="xml">
-                <form string="Wubook Channel Info" >
-                    <sheet>
-                    	<group>
-	                        <field name="wid" />
-	                        <field name="name" />
-	                        <field name="ical" readonly="True" widget="checkbox" />
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <!-- Tree view -->
-        <record model="ir.ui.view" id="view_wubook_channel_info_tree">
-            <field name="name">wubook.channel.info.tree</field>
-            <field name="model">wubook.channel.info</field>
-            <field name="arch" type="xml">
-                <tree string="WuBook Channel Info">
-                    <field name="wid" />
-                    <field name="name" />
-                </tree>
-            </field>
-        </record>
-
-</odoo>
diff --git a/hotel_channel_connector/views/wubook_hotel_channel_connector_ota_info.xml b/hotel_channel_connector/views/wubook_hotel_channel_connector_ota_info.xml
new file mode 100644
index 000000000..ab1a5aa77
--- /dev/null
+++ b/hotel_channel_connector/views/wubook_hotel_channel_connector_ota_info.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+       <!-- Form view -->
+       <record model="ir.ui.view" id="view_hotel_channel_connector_ota_info_form">
+            <field name="name">hotel.channel.connector.ota.info.form</field>
+            <field name="model">hotel.channel.connector.ota.info</field>
+            <field name="arch" type="xml">
+                <form string="Channel OTA's Info" >
+                    <sheet>
+                        <group>
+                            <field name="ota_id" />
+                            <field name="name" />
+                            <field name="ical" readonly="True" widget="checkbox" />
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <!-- Tree view -->
+        <record model="ir.ui.view" id="view_hotel_channel_connector_ota_info_tree">
+            <field name="name">hotel.channel.connector.ota.info.tree</field>
+            <field name="model">hotel.channel.connector.ota.info.info</field>
+            <field name="arch" type="xml">
+                <tree string="Channel OTA's Info">
+                    <field name="ota_id" />
+                    <field name="name" />
+                </tree>
+            </field>
+        </record>
+
+</odoo>