From d2b6312ba265b746ae10da3e3ce80a49d187ae34 Mon Sep 17 00:00:00 2001
From: Jose Luis <osotranquilo@gmail.com>
Date: Thu, 6 Jun 2019 12:52:10 +0200
Subject: [PATCH 1/2] [FIX] Hotel parameters settings views

---
 hotel_data_bi/views/inherit_res_company.xml   | 46 +++++++-------
 .../views/inherit_res_company.xml             | 38 ++++++------
 hotel_l10n_es/views/inherit_res_company.xml   | 62 ++++++++++---------
 3 files changed, 75 insertions(+), 71 deletions(-)

diff --git a/hotel_data_bi/views/inherit_res_company.xml b/hotel_data_bi/views/inherit_res_company.xml
index 05b3865ab..7f610c7e0 100644
--- a/hotel_data_bi/views/inherit_res_company.xml
+++ b/hotel_data_bi/views/inherit_res_company.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <!-- Hotel Settings -->
-    <data>
-        <!--  Inherit Company view to add 'Hotel dataBI' -->
-        <record id="data_bi_view_company_form" model="ir.ui.view">
-            <field name="name">databi.config.view_company_form</field>
-            <field name="model">res.company</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='cardex_warning']" position="after">
-                    <group string="DataBi Hotel Services" name="hotel_databi">
-                        <field name="id_hotel" />
-                        <field name="data_bi_days" />
-                        <field name="expedia_rate" />
-                    </group>
-                </xpath>
-            </field>
-        </record>
-    </data>
-
-</odoo>
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Hotel Settings -->
+    <data>
+        <!-- Inherit Company view to add 'Hotel dataBI' -->
+        <record id="data_bi_view_company_form" model="ir.ui.view">
+            <field name="name">databi.config.view_company_form</field>
+            <field name="model">res.company</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[@name='hotel_settings_page']" position="inside">
+                    <group string="DataBi Hotel Services" name="hotel_databi">
+                        <field name="id_hotel"/>
+                        <field name="data_bi_days"/>
+                        <field name="expedia_rate"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+    </data>
+
+</odoo>
diff --git a/hotel_door_codes/views/inherit_res_company.xml b/hotel_door_codes/views/inherit_res_company.xml
index b1638a40d..5c367bdd6 100644
--- a/hotel_door_codes/views/inherit_res_company.xml
+++ b/hotel_door_codes/views/inherit_res_company.xml
@@ -1,18 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-  <!-- Hotel Settings -->
-  <data>
-    <!--  Inherit Company view to add 'door_code' -->
-    <record id="door_code_view_company_form" model="ir.ui.view">
-      <field name="name">door_code.config.view_company_form</field>
-      <field name="model">res.company</field>
-      <field name="inherit_id" ref="base.view_company_form"/>
-      <field name="arch" type="xml">
-        <xpath expr="//field[@name='cardex_warning']" position="after">
-          <field name="precode" />
-          <field name="postcode" />
-        </xpath>
-      </field>
-    </record>
-  </data>
-</odoo>
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Hotel Settings -->
+    <data>
+        <!-- Inherit Company view to add 'door_code' -->
+        <record id="door_code_view_company_form" model="ir.ui.view">
+            <field name="name">door_code.config.view_company_form</field>
+            <field name="model">res.company</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[@name='hotel_settings_page']" position="inside">
+                    <group name="door_code" string="Door Codes">
+                        <field name="precode"/>
+                        <field name="postcode"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/hotel_l10n_es/views/inherit_res_company.xml b/hotel_l10n_es/views/inherit_res_company.xml
index a44eb3729..7cd516fc6 100755
--- a/hotel_l10n_es/views/inherit_res_company.xml
+++ b/hotel_l10n_es/views/inherit_res_company.xml
@@ -1,30 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <!-- Hotel Settings -->
-        <record id="view_company_form" model="ir.ui.view">
-            <field name="name">view.company.form</field>
-            <field name="model">res.company</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page" position="after">
-                        <page string="Hotel Settings">
-                            <group>
-                                <group name="aldahotels_grp" string="INE and Police data">
-                                    <field name="property_name" />
-                                    <field name="ine_tourism" />
-                                    <field name="ine_category_id" widget="selection"/>
-                                    <field name="ine_seats" />
-                                    <field name="ine_permanent_staff" />
-                                    <field name="ine_eventual_staff" />
-                                    <field name="police_number" />
-                                    <field name="cardex_warning" />
-                                    <field name="checkin_img" widget="image" class="oe_avatar"/>
-                                </group>
-                            </group>
-                        </page>
-                </xpath>
-            </field>
-        </record>
-
-</odoo>
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Hotel Settings -->
+    <record id="view_company_form" model="ir.ui.view">
+        <field name="name">view.company.form</field>
+        <field name="model">res.company</field>
+        <field name="inherit_id" ref="base.view_company_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page" position="after">
+                <page string="Hotel Settings" name="hotel_settings_page">
+                    <group name="hotel_data" string="Property data">
+                        <field name="property_name"/>
+                        <field name="ine_tourism"/>
+                        <field name="police_number"/>
+                    </group>
+                    <group name="ine_data" string="INE parameters">
+                        <field name="ine_category_id" widget="selection"/>
+                        <field name="ine_seats"/>
+                        <field name="ine_permanent_staff"/>
+                        <field name="ine_eventual_staff"/>
+                    </group>
+                    <group name="cardes_data" string="Print in cardex">
+                        <field name="cardex_warning"/>
+                        <field name="checkin_img" widget="image" class="oe_avatar"/>
+                    </group>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

From b5772c260ee0f9324c4bab9464022e3fc15691b8 Mon Sep 17 00:00:00 2001
From: Jose Luis <osotranquilo@gmail.com>
Date: Thu, 6 Jun 2019 19:42:49 +0200
Subject: [PATCH 2/2] [FIX] Send the room blocked, not the one reserved

---
 hotel_data_bi/models/data_bi.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hotel_data_bi/models/data_bi.py b/hotel_data_bi/models/data_bi.py
index 308d34f24..5863faa81 100644
--- a/hotel_data_bi/models/data_bi.py
+++ b/hotel_data_bi/models/data_bi.py
@@ -358,7 +358,6 @@ class Data_Bi(models.Model):
                        n.reservation_id.state != 'cancelled'))
         _logger.info("DataBi: Calculating %s Bloqued", str(len(lines)))
         for line in lines:
-            # if linea.reservation_id.state != 'cancelled':
             if line.reservation_id.reservation_type == 'out':
                 id_m_b = 1
             else:
@@ -368,7 +367,7 @@ class Data_Bi(models.Model):
                 'Fecha_desde': line.date,
                 'Fecha_hasta': (datetime.strptime(line.date, "%Y-%m-%d") +
                                 timedelta(days=1)).strftime("%Y-%m-%d"),
-                'ID_Tipo_Habitacion': line.reservation_id.room_type_id.id,
+                'ID_Tipo_Habitacion': line.reservation_id.room_id.room_type_id.id,
                 'ID_Motivo_Bloqueo': id_m_b,
                 'Nro_Habitaciones': 1})
         return dic_bloqueos