From 72569ca05f09f08346542c9d1d301d2732abf06d Mon Sep 17 00:00:00 2001
From: Pablo <pabloqb@gmail.com>
Date: Mon, 9 Sep 2019 16:42:57 +0200
Subject: [PATCH] [WIP] refactoring default_ arrival and departure hours

---
 hotel/models/hotel_property.py                       | 9 +++++----
 hotel/models/hotel_reservation.py                    | 4 ++--
 hotel/views/hotel_property_views.xml                 | 4 ++--
 hotel/views/hotel_reservation_views.xml              | 4 ++--
 hotel_calendar/models/inherited_hotel_reservation.py | 4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/hotel/models/hotel_property.py b/hotel/models/hotel_property.py
index cc9f47e9f..bc0331b05 100644
--- a/hotel/models/hotel_property.py
+++ b/hotel/models/hotel_property.py
@@ -32,17 +32,18 @@ class HotelProperty(models.Model):
                                              required=True)
 
     # TODO: refactoring 'res.config.settings', 'default_arrival_hour' by the current hotel.property.arrival_hour
-    arrival_hour = fields.Char('Arrival Hour (GMT)',
-                               help="HH:mm Format", default="14:00")
+    default_arrival_hour = fields.Char('Arrival Hour (GMT)',
+                                       help="HH:mm Format", default="14:00")
     # TODO: refactoring 'res.config.settings', 'default_departure_hour' by the current hotel.property.departure_hour
-    departure_hour = fields.Char('Departure Hour (GMT)',
-                                 help="HH:mm Format", default="12:00")
+    default_departure_hour = fields.Char('Departure Hour (GMT)',
+                                         help="HH:mm Format", default="12:00")
 
     # TODO: refactoring 'res.config.settings', 'tz_hotel' by the current hotel.property.tz (inherited in res.partner)
 
     default_cancel_policy_days = fields.Integer('Cancellation Days')
     default_cancel_policy_percent = fields.Float('Percent to pay')
 
+    @api.constrains('default_arrival_hour', 'default_departure_hour')
     def _check_hours(self):
         r = re.compile('[0-2][0-9]:[0-5][0-9]')
         if not r.match(self.arrival_hour):
diff --git a/hotel/models/hotel_reservation.py b/hotel/models/hotel_reservation.py
index 6a512b90b..eacba2098 100644
--- a/hotel/models/hotel_reservation.py
+++ b/hotel/models/hotel_reservation.py
@@ -51,7 +51,7 @@ class HotelReservation(models.Model):
 
     def _get_default_arrival_hour(self):
         folio = False
-        default_arrival_hour = self.env.user.hotel_id.arrival_hour
+        default_arrival_hour = self.env.user.hotel_id.default_arrival_hour
         if 'folio_id' in self._context:
             folio = self.env['hotel.folio'].search([
                 ('id', '=', self._context['folio_id'])
@@ -63,7 +63,7 @@ class HotelReservation(models.Model):
 
     def _get_default_departure_hour(self):
         folio = False
-        default_departure_hour = self.env.user.hotel_id.departure_hour
+        default_departure_hour = self.env.user.hotel_id.default_departure_hour
         if 'folio_id' in self._context:
             folio = self.env['hotel.folio'].search([
                 ('id', '=', self._context['folio_id'])
diff --git a/hotel/views/hotel_property_views.xml b/hotel/views/hotel_property_views.xml
index b7e368d50..7befee792 100644
--- a/hotel/views/hotel_property_views.xml
+++ b/hotel/views/hotel_property_views.xml
@@ -28,8 +28,8 @@
                                 <field name="tz" widget="timezone_mismatch"/>
                             </group>
                             <group colspan="4" col="4" string="Check-in hours">
-                                <field name="arrival_hour" />
-                                <field name="departure_hour"  />
+                                <field name="default_arrival_hour" />
+                                <field name="default_departure_hour"  />
                             </group>
                             <group colspan="4" col="4" string="Cancellation policies">
                                 <field name="default_cancel_policy_days" />
diff --git a/hotel/views/hotel_reservation_views.xml b/hotel/views/hotel_reservation_views.xml
index 92702a332..b63fccc2b 100644
--- a/hotel/views/hotel_reservation_views.xml
+++ b/hotel/views/hotel_reservation_views.xml
@@ -196,8 +196,8 @@
                                 attrs="{'invisible': [('reservation_type','in',('out'))]}"/>
                             <field nolabel="1" colspan="2" placeholder="Description in Guest Documents" name="name"/>
                             <field name="nights"/>
-                            <field placeholder="Arriva Hour" name="arrival_hour"/>
-                            <field placeholder="Departure our" name="departure_hour"/>
+                            <field placeholder="Arrival Hour" name="arrival_hour"/>
+                            <field placeholder="Departure Hour" name="departure_hour"/>
                         </group>
                         <group colspan="2" col="3" string="Reservation Details" name="reservation_details">
                             <field name="pricelist_id"
diff --git a/hotel_calendar/models/inherited_hotel_reservation.py b/hotel_calendar/models/inherited_hotel_reservation.py
index 5265762e9..124d98294 100644
--- a/hotel_calendar/models/inherited_hotel_reservation.py
+++ b/hotel_calendar/models/inherited_hotel_reservation.py
@@ -359,8 +359,8 @@ class HotelReservation(models.Model):
             'days': self.env.user.hotel_id.pms_default_num_days,
             'allow_invalid_actions': type_move == 'allow_invalid',
             'assisted_movement': type_move == 'assisted',
-            'default_arrival_hour': self.env.user.hotel_id.arrival_hour,
-            'default_departure_hour': self.env.user.hotel_id.departure_hour,
+            'default_arrival_hour': self.env.user.hotel_id.default_arrival_hour,
+            'default_departure_hour': self.env.user.hotel_id.default_departure_hour,
             'show_notifications': self.env.user.pms_show_notifications,
             'show_pricelist': self.env.user.pms_show_pricelist,
             'show_availability': self.env.user.pms_show_availability,