audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] datetime by date

Browse Source
This commit is contained in:
Pablo Quesada Barriuso
2018-07-31 11:31:13 +02:00
parent 4d448e9fc1
commit fbca316b09
1 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
hotel/models/hotel_reservation.py
View File

@@ -10,6 +10,7 @@ from odoo.tools import (
from odoo import models, fields, api, _ from odoo import models, fields, api, _
from decimal import Decimal from decimal import Decimal
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from dateutil import tz
from datetime import datetime, timedelta, date from datetime import datetime, timedelta, date
from odoo.addons.hotel import date_utils from odoo.addons.hotel import date_utils
import pytz import pytz
@@ -155,8 +156,6 @@ class HotelReservation(models.Model):
def _get_default_checkin(self): def _get_default_checkin(self):
folio = False folio = False
# default_arrival_hour = self.env['ir.default'].sudo().get(
# 'res.config.settings', 'default_arrival_hour')
if 'folio_id' in self._context: if 'folio_id' in self._context:
folio = self.env['hotel.folio'].search([ folio = self.env['hotel.folio'].search([
('id', '=', self._context['folio_id']) ('id', '=', self._context['folio_id'])
@@ -164,22 +163,13 @@ class HotelReservation(models.Model):
if folio and folio.room_lines: if folio and folio.room_lines:
return folio.room_lines[0].checkin return folio.room_lines[0].checkin
else: else:
# tz_hotel = self.env['ir.default'].sudo().get( tz_hotel = self.env['ir.default'].sudo().get(
# 'res.config.settings', 'tz_hotel') 'res.config.settings', 'tz_hotel')
# now_utc_dt = date_utils.now() tzinfo = tz.gettz(tz_hotel and str(tz_hotel) or 'UTC')
# ndate = "%s %s:00" % \ return datetime.date(datetime.now(tz=tzinfo)).strftime(DEFAULT_SERVER_DATE_FORMAT)
# (now_utc_dt.strftime(DEFAULT_SERVER_DATE_FORMAT),
# default_arrival_hour)
# ndate_dt = date_utils.get_datetime(ndate, stz=tz_hotel)
# ndate_dt = date_utils.dt_as_timezone(ndate_dt, 'UTC')
# return ndate_dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
return fields.Date.today()
# return fields.Date.context_today(self)
def _get_default_checkout(self): def _get_default_checkout(self):
folio = False folio = False
# default_departure_hour = self.env['ir.default'].sudo().get(
# 'res.config.settings', 'default_departure_hour')
if 'folio_id' in self._context: if 'folio_id' in self._context:
folio = self.env['hotel.folio'].search([ folio = self.env['hotel.folio'].search([
('id', '=', self._context['folio_id']) ('id', '=', self._context['folio_id'])
@@ -187,17 +177,10 @@ class HotelReservation(models.Model):
if folio and folio.room_lines: if folio and folio.room_lines:
return folio.room_lines[0].checkout return folio.room_lines[0].checkout
else: else:
# tz_hotel = self.env['ir.default'].sudo().get( tz_hotel = self.env['ir.default'].sudo().get(
# 'res.config.settings', 'tz_hotel') 'res.config.settings', 'tz_hotel')
# now_utc_dt = date_utils.now() + timedelta(days=1) tzinfo = tz.gettz(tz_hotel and str(tz_hotel) or 'UTC')
# ndate = "%s %s:00" % \ return datetime.date(datetime.now(tz=tzinfo) + timedelta(days=1)).strftime(DEFAULT_SERVER_DATE_FORMAT)
# (now_utc_dt.strftime(DEFAULT_SERVER_DATE_FORMAT),
# default_departure_hour)
# ndate_dt = date_utils.get_datetime(ndate, stz=tz_hotel)
# ndate_dt = date_utils.dt_as_timezone(ndate_dt, 'UTC')
# return ndate_dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
# return fields.Date.today() ¿?
return fields.Date.from_string(fields.Date.today()) + timedelta(days=1)
def _get_default_arrival_hour(self): def _get_default_arrival_hour(self):
folio = False folio = False