From 7664e18ceb4f604694028f8c40327fa75f235be9 Mon Sep 17 00:00:00 2001 From: Jose Luis Date: Fri, 12 Jul 2019 11:12:34 +0200 Subject: [PATCH] [FIX] discount calculus, and cancelled reservations. --- hotel_data_bi/models/data_bi.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hotel_data_bi/models/data_bi.py b/hotel_data_bi/models/data_bi.py index e87f3a9ab..900a41393 100644 --- a/hotel_data_bi/models/data_bi.py +++ b/hotel_data_bi/models/data_bi.py @@ -380,8 +380,7 @@ class Data_Bi(models.Model): lineas = lines.filtered( lambda n: (n.reservation_id.reservation_type == 'normal') and - (n.price > 0) and - (n.reservation_id.state != 'cancelled') + (n.price > 0) ) _logger.info("DataBi: Calculating %s reservations", str(len(lineas))) channels = {'door': 0, @@ -423,9 +422,10 @@ class Data_Bi(models.Model): precio_iva = round((precio_neto-(precio_neto/1.1)), 2) precio_neto -= precio_iva - if linea.reservation_id.discount != 0: - precio_dto = linea.price * ( - linea.reservation_id.discount/100) + if (linea.discount != 0) or (linea.cancel_discount != 0): + precio_dto = linea.price * ((linea.discount or 0.0) * 0.01) + price = linea.price - precio_dto + precio_dto += price * ((linea.cancel_discount or 0.0) * 0.01) dic_reservas.append({ 'ID_Reserva': linea.reservation_id.folio_id.id,