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

Merge branch '11.0' of https://github.com/hootel/hootel into 11.0

Browse Source
This commit is contained in:
Dario Lodeiros
2019-05-20 20:21:31 +02:00
parent d6467db115 495dd9ef49
commit 01cfe7d4cb
1 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
hotel_data_bi/models/data_bi.py
View File

@@ -541,50 +541,47 @@ class Data_Bi(models.Model):
precio_neto -= precio_comision precio_neto -= precio_comision
precio_iva = (precio_neto*10/100) precio_iva = (precio_neto*10/100)
precio_neto -= precio_iva precio_neto -= precio_iva
data = json.loads( if reserva.reservation_id.channel_bind_ids.channel_raw_data:
data = json.loads(
reserva.reservation_id.channel_bind_ids.channel_raw_data) reserva.reservation_id.channel_bind_ids.channel_raw_data)
jsonBooked = data['booked_rooms'][0] jsonBooked = data['booked_rooms'][0]
if jsonBooked.get('ancillary').get( if jsonBooked.get('ancillary').get(
'channel_rate_name') is not None:
jsonRate = jsonBooked.get('ancillary').get(
'channel_rate_name')
# _logger.warning("EXPEDIA ancillary : %s - %s",
# jsonRate, reserva.id)
elif jsonBooked.get('roomdays')[0].get(
'ancillary').get(
'channel_rate_name') is not None: 'channel_rate_name') is not None:
jsonRate = jsonBooked.get( jsonRate = jsonBooked.get('ancillary').get(
'roomdays')[0].get( 'channel_rate_name')
'ancillary').get('channel_rate_name') # _logger.warning("EXPEDIA ancillary : %s - %s",
# _logger.warning("EXPEDIA roomdays : %s - %s", # jsonRate, reserva.id)
# jsonRate, reserva.id)
else: elif jsonBooked.get('roomdays')[0].get(
_logger.critical( 'ancillary').get(
"EXPEDIA Tarifa No Contemplada : " 'channel_rate_name') is not None:
+ jsonBooked) jsonRate = jsonBooked.get(
'roomdays')[0].get(
'ancillary').get('channel_rate_name')
# _logger.warning("EXPEDIA roomdays : %s - %s",
# jsonRate, reserva.id)
jsonRefundable = jsonRate.upper().find('REFUNDABLE') else:
# _logger.warning("EXPEDIA Tarifa : %s", jsonRate) _logger.critical(
# _logger.warning("EXPEDIA Tarifa : %s y %s", "EXPEDIA Tarifa No Contemplada : "
# jsonRate, str(jsonRefundable)) + jsonBooked)
# 10 % Iva jsonRefundable = jsonRate.upper().find('REFUNDABLE')
precio_iva = round((precio_neto-(precio_neto/1.1)), 2) # _logger.warning("EXPEDIA Tarifa : %s", jsonRate)
# 18 % comision ? # _logger.warning("EXPEDIA Tarifa : %s y %s",
precio_comision = inv_percent( # jsonRate, str(jsonRefundable))
# 10 % Iva
precio_iva = round((precio_neto-(precio_neto/1.1)), 2)
# 18 % comision ?
precio_comision = inv_percent(
precio_neto, self.env.user.company_id.expedia_rate) precio_neto, self.env.user.company_id.expedia_rate)
precio_neto += precio_comision precio_neto += precio_comision
# 3% Refundable ? # 3% Refundable ?
if jsonRefundable >= 0: if jsonRefundable >= 0:
precio_dto = inv_percent(precio_neto, 3) precio_dto = inv_percent(precio_neto, 3)
precio_neto += precio_dto precio_neto += precio_dto
# _logger.warning("ODOO: %s , precio_neto: %s , precio_comision: \
# %s , precio_iva: %s , precio_dto: %s", reserva.price,
# precio_neto, precio_comision, precio_iva,
# precio_dto)
response_dic.append({'ota': reserva.reservation_id.ota_id.id, response_dic.append({'ota': reserva.reservation_id.ota_id.id,
'ota_id': reserva.reservation_id.ota_id.ota_id, 'ota_id': reserva.reservation_id.ota_id.ota_id,