diff --git a/booking.py b/booking.py
index e104552..155fc4a 100644
--- a/booking.py
+++ b/booking.py
@@ -425,7 +425,6 @@ class Booking(Workflow, ModelSQL, ModelView):
     @ModelView.button
     @Workflow.transition('confirmed')
     def confirm(cls, records):
-        cls.set_number(records)
         for rec in records:
             # FIXME check if does not exist previous occupancy if exist update state
             rec.update_folio('pending')
@@ -594,7 +593,7 @@ class Booking(Workflow, ModelSQL, ModelView):
                     'currency': bk.currency.id,
                     'payment_term': bk.payment_term,
                     'number': bk.number,
-                    'guests_qty': len(fo.guests) + 1,
+                    'guests_qty': len(fo.guests),
                     'reference': reference,
                     'agent': agent_id,
                     'rooms': fo.room.name,
@@ -609,6 +608,7 @@ class Booking(Workflow, ModelSQL, ModelView):
                         'quantity': fo.nights_quantity,
                         'product': fo.product,
                         'unit_price': fo.unit_price,
+                        'taxes': fo.taxes,
                         'origin': str(bk),
                         'taxes_exception': bk.taxes_exception,
                     }]
@@ -621,20 +621,19 @@ class Booking(Workflow, ModelSQL, ModelView):
                     'quantity': fo.nights_quantity,
                     'product': fo.product,
                     'unit_price': fo.unit_price,
+                    'taxes': fo.taxes,
                     'origin': str(bk),
                     'taxes_exception': bk.taxes_exception,
                 })
 
         for charge in charges:
             bk = charge.folio.booking
-            invoice_party = fo.booking.party
-            if charge.invoice_to:
-                invoice_party = charge.invoice_to
+            invoice_party = charge.invoice_to or bk.party
 
             invoice_party_id = invoice_party.id
             unit_price = bk.currency.round(charge.unit_price)
             if invoice_party_id not in res.keys():
-                res[invoice_party.id] = {
+                res[invoice_party_id] = {
                     'party': invoice_party,
                     'currency': bk.currency.id,
                     'payment_term': bk.payment_term,
@@ -654,6 +653,7 @@ class Booking(Workflow, ModelSQL, ModelView):
                 'unit_price': unit_price,
                 'charge': charge,
                 'origin': str(bk),
+                'taxes': charge.folio.taxes,
                 'taxes_exception': bk.taxes_exception,
             })
         return res
@@ -672,12 +672,13 @@ class Booking(Workflow, ModelSQL, ModelView):
             'product': product.id,
             'party': invoice.party.id,
             'description': line['description'],
+            'taxes': line['taxes'],
             'origin': line['origin'],
         }
-        if not line['taxes_exception']:
-            taxes_ids = cls.get_taxes(line['product'], invoice.party, invoice.currency)
-            if taxes_ids:
-                new_line.update({'taxes': [('add', taxes_ids)]})
+        # if not line['taxes_exception']:
+        #     taxes_ids = cls.get_taxes(line['product'], invoice.party, invoice.currency)
+        #     if taxes_ids:
+        #         new_line.update({'taxes': [('add', taxes_ids)]})
         return new_line
 
     def do_moves(self):
@@ -870,6 +871,7 @@ class Booking(Workflow, ModelSQL, ModelView):
                         'quantity': rec['guests_qty'],
                         'unit_price': product.template.list_price,
                         'product': product.id,
+                        'taxes': rec['taxes'],
                         'description': product.rec_name,
                         'origin': str(self),
                     }
@@ -911,8 +913,9 @@ class Booking(Workflow, ModelSQL, ModelView):
         company_id = Transaction().context.get('company')
         party = data['party']
         # party is instance or id fixme
-        if type(party) == int:
-            party = Party(party)
+        # if type(party) == int:
+        #     party = Party(party)
+
         ota_code = data.get('ota_booking_code', '')
         if data.get('description'):
             description = data['description']
diff --git a/locale/es.po b/locale/es.po
index 0ee46f3..9030717 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -226,10 +226,6 @@ msgctxt "field:hotel.booking,untaxed_amount:"
 msgid "Untaxed Amount"
 msgstr "Subtotal Base"
 
-msgctxt "field:hotel.booking,vehicle_plate:"
-msgid "Vehicle Plate"
-msgstr "Placa Vehículo"
-
 msgctxt "field:hotel.booking,vehicles_num:"
 msgid "Vehicles Number"
 msgstr "Número de vehiculos"
@@ -422,26 +418,10 @@ msgctxt "field:hotel.configuration,cleaning_occupied:"
 msgid "Cleaning Occupied"
 msgstr "Limpieza Ocupada"
 
-msgctxt "field:hotel.configuration,cleaning_type_deep:"
-msgid "Cleaning Deep"
-msgstr "Limpieza Profunda"
-
-msgctxt "field:hotel.configuration,cleaning_type_standard:"
-msgid "Cleaning Standard"
-msgstr "Limpieza Estandar"
-
-msgctxt "field:hotel.configuration,cleaning_type_tweak:"
-msgid "Cleaning Tweak"
-msgstr "Retoque"
-
 msgctxt "field:hotel.configuration,company:"
 msgid "Company"
 msgstr "Empresa"
 
-msgctxt "field:hotel.configuration,default_accommodation:"
-msgid "Default Accommodation"
-msgstr "Acomodación por Defecto"
-
 msgctxt "field:hotel.configuration,default_channel_seller:"
 msgid "Default Channel"
 msgstr "Canal por Defecto"
@@ -560,7 +540,7 @@ msgstr "Línea de factura"
 
 msgctxt "field:hotel.folio,invoice_state:"
 msgid "Invoice State"
-msgstr "Estado de la factura"
+msgstr "Estado de Factura"
 
 msgctxt "field:hotel.folio,main_guest:"
 msgid "Main Guest"
@@ -618,6 +598,10 @@ msgctxt "field:hotel.folio,storage:"
 msgid "Storage"
 msgstr "Almacen"
 
+msgctxt "field:hotel.folio,taxes:"
+msgid "Taxes"
+msgstr "Impuestos"
+
 msgctxt "field:hotel.folio,to_invoice:"
 msgid "To Invoice"
 msgstr "A facturar"
@@ -654,6 +638,14 @@ msgctxt "field:hotel.folio,vehicle_plate:"
 msgid "Vehicle Plate"
 msgstr "Placa Vehículo"
 
+msgctxt "field:hotel.folio-account.tax,folio:"
+msgid "Folio"
+msgstr "Folio"
+
+msgctxt "field:hotel.folio-account.tax,tax:"
+msgid "Tax"
+msgstr "Impuestos"
+
 msgctxt "field:hotel.folio-stock.move,folio:"
 msgid "Folio"
 msgstr "Folio"
@@ -814,86 +806,6 @@ msgctxt "field:hotel.folio.guest,visa_number:"
 msgid "Visa Number"
 msgstr "Número de Visa"
 
-msgctxt "field:hotel.housekeeping,amenities:"
-msgid "Amenities"
-msgstr "Comodidades"
-
-msgctxt "field:hotel.housekeeping,availability:"
-msgid "Availability"
-msgstr "Disponibilidad"
-
-msgctxt "field:hotel.housekeeping,check_in_time:"
-msgid "Check In Time"
-msgstr "Hora de Check In"
-
-msgctxt "field:hotel.housekeeping,check_list:"
-msgid "Check List"
-msgstr "Lista de Chequeo"
-
-msgctxt "field:hotel.housekeeping,check_out_time:"
-msgid "Check In Time"
-msgstr "Hora de Check In"
-
-msgctxt "field:hotel.housekeeping,cleaning_type:"
-msgid "Cleaning Type"
-msgstr "Tipo de Limipeza"
-
-msgctxt "field:hotel.housekeeping,employee:"
-msgid "Employee"
-msgstr "Empleado"
-
-msgctxt "field:hotel.housekeeping,end_date_assigned:"
-msgid "End Date Assigned"
-msgstr "Fecha Final Asignada"
-
-msgctxt "field:hotel.housekeeping,notes:"
-msgid "Notes"
-msgstr "Notas"
-
-msgctxt "field:hotel.housekeeping,room:"
-msgid "Room"
-msgstr "Habitación"
-
-msgctxt "field:hotel.housekeeping,start_date_assigned:"
-msgid "Start Date Assigned"
-msgstr "Fecha Inicial Asignada"
-
-msgctxt "field:hotel.housekeeping,state:"
-msgid "Status"
-msgstr "Estado"
-
-msgctxt "field:hotel.housekeeping,tasks:"
-msgid "House Tasks"
-msgstr "Tareas de la Casa"
-
-msgctxt "field:hotel.housekeeping.cleaning_type,description:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "field:hotel.housekeeping.cleaning_type,kind:"
-msgid "Kind"
-msgstr "Clase"
-
-msgctxt "field:hotel.housekeeping.cleaning_type,name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:hotel.housekeeping.task,frecuency:"
-msgid "Frecuency"
-msgstr "Frecuencia"
-
-msgctxt "field:hotel.housekeeping.task,housekeeping:"
-msgid "Hotel Housekeeping"
-msgstr "Ama de Llaves"
-
-msgctxt "field:hotel.housekeeping.task,quantity:"
-msgid "Quantity"
-msgstr "Cantidad"
-
-msgctxt "field:hotel.housekeeping.task,task:"
-msgid "Task"
-msgstr "Tarea"
-
 msgctxt "field:hotel.invoice_income_daily.start,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -930,10 +842,6 @@ msgctxt "field:hotel.maintenance,criticality:"
 msgid "Criticality"
 msgstr "Criticidad"
 
-msgctxt "field:hotel.maintenance,description:"
-msgid "Description"
-msgstr "Descripción"
-
 msgctxt "field:hotel.maintenance,end_date:"
 msgid "End Maintenance"
 msgstr "Fin de Matenimiento"
@@ -1026,18 +934,6 @@ msgctxt "field:hotel.print_housekeeping.start,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
-msgctxt "field:hotel.print_housekeeping_service.start,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:hotel.print_housekeeping_service.start,date:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "field:hotel.print_housekeeping_service.start,employee:"
-msgid "Employee"
-msgstr "Empleado"
-
 msgctxt "field:hotel.print_manager.start,company:"
 msgid "Company"
 msgstr "Empresa"
@@ -1532,10 +1428,6 @@ msgctxt "help:hotel.folio,to_invoice:"
 msgid "Mark this checkbox if you want to invoice this item"
 msgstr "Marque esta casilla si desea facturar este item."
 
-msgctxt "help:hotel.housekeeping.task,frecuency:"
-msgid "In days"
-msgstr "En días"
-
 msgctxt "help:hotel.maintenance,register_date:"
 msgid "The date of register of the issue"
 msgstr "Fecha de registro del problema"
@@ -1608,6 +1500,10 @@ msgctxt "model:hotel.folio,name:"
 msgid "Folio"
 msgstr "Folio"
 
+msgctxt "model:hotel.folio-account.tax,name:"
+msgid "Hotel Folio - Tax"
+msgstr "Folio - Impuestos"
+
 msgctxt "model:hotel.folio-stock.move,name:"
 msgid "Folio - Stock Move"
 msgstr "Folio - Movimiento de Stock"
@@ -1620,18 +1516,6 @@ msgctxt "model:hotel.folio.guest,name:"
 msgid "Folio Guest"
 msgstr "Huesped"
 
-msgctxt "model:hotel.housekeeping,name:"
-msgid "HouseKeeping"
-msgstr "Ama de Llaves"
-
-msgctxt "model:hotel.housekeeping.cleaning_type,name:"
-msgid "Housekeeping Cleaning Type"
-msgstr "Tipo de Limpieza"
-
-msgctxt "model:hotel.housekeeping.task,name:"
-msgid "Hotel Housekeeping Task"
-msgstr "Tarea - Ama de Llaves"
-
 msgctxt "model:hotel.invoice_income_daily.start,name:"
 msgid "Invoice Income Daily Start"
 msgstr "Relacion Diaria de Caja"
@@ -1672,10 +1556,6 @@ msgctxt "model:hotel.print_housekeeping.start,name:"
 msgid "Print Housekeeping Service Start"
 msgstr "Ama de Llaves"
 
-msgctxt "model:hotel.print_housekeeping_service.start,name:"
-msgid "Print Housekeeping Service Start"
-msgstr "Ama de Llaves"
-
 msgctxt "model:hotel.print_manager.start,name:"
 msgid "Manager Start"
 msgstr "Informe Gerencial"
@@ -2283,10 +2163,6 @@ msgctxt "report:hotel.booking:"
 msgid "("
 msgstr "("
 
-msgctxt "report:hotel.booking:"
-msgid "(S)"
-msgstr ""
-
 msgctxt "report:hotel.booking:"
 msgid ")"
 msgstr ")"
@@ -2299,6 +2175,11 @@ msgctxt "report:hotel.booking:"
 msgid "."
 msgstr ""
 
+#, fuzzy
+msgctxt "report:hotel.booking:"
+msgid "/"
+msgstr "/"
+
 msgctxt "report:hotel.booking:"
 msgid "17"
 msgstr ""
@@ -2320,16 +2201,53 @@ msgctxt "report:hotel.booking:"
 msgid "A"
 msgstr "A"
 
+msgctxt "report:hotel.booking:"
+msgid "ACCOMMODATION"
+msgstr ""
+
 msgctxt "report:hotel.booking:"
 msgid "ACO"
 msgstr ""
 
+msgctxt "report:hotel.booking:"
+msgid "ADA"
+msgstr ""
+
 msgctxt "report:hotel.booking:"
 msgid "ADVERTENCIA"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "BASE"
+msgid "ARRIVAL DATE"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "BASE /"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "BASE AMOUNT"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "BOOK."
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "BOOKING"
+msgstr ""
+
+#, fuzzy
+msgctxt "report:hotel.booking:"
+msgid "C"
+msgstr "C"
+
+msgctxt "report:hotel.booking:"
+msgid "CANAL /"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "CHANNEL"
 msgstr ""
 
 #, fuzzy
@@ -2338,19 +2256,44 @@ msgid "CLIENTE"
 msgstr "CLIENTE"
 
 msgctxt "report:hotel.booking:"
-msgid "CREATED BY"
-msgstr "CREADO POR"
-
-msgctxt "report:hotel.booking:"
-msgid "DESCRIPCIÓN"
+msgid "COMM"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "ECIO UNIT."
+msgid "CORREO /"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "EMAIL:"
+msgid "CURRENCY"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "CUSTOMER"
+msgstr ""
+
+#, fuzzy
+msgctxt "report:hotel.booking:"
+msgid "DATE"
+msgstr "FECHA"
+
+msgctxt "report:hotel.booking:"
+msgid "DEPARTURE DATE"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "ECIO UNIT. /"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "EMAIL"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "ERCIAL"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "ERP + PMS + CRM"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
@@ -2364,19 +2307,11 @@ msgid "FECHA"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "FECHA DE LLEGADA"
+msgid "H"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "FECHA DE SALIDA"
-msgstr ""
-
-msgctxt "report:hotel.booking:"
-msgid "FIRMA HUESPEDES"
-msgstr ""
-
-msgctxt "report:hotel.booking:"
-msgid "HABITACIÓN"
+msgid "HABITACIÓN /"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
@@ -2392,18 +2327,42 @@ msgctxt "report:hotel.booking:"
 msgid "ID"
 msgstr "UP"
 
+msgctxt "report:hotel.booking:"
+msgid "ID NUMBER"
+msgstr ""
+
 #, fuzzy
 msgctxt "report:hotel.booking:"
-msgid "IMPUESTOS"
+msgid "IMPUESTOS /"
 msgstr "IMPUESTOS"
 
+msgctxt "report:hotel.booking:"
+msgid "LLEG"
+msgstr ""
+
 #, fuzzy
 msgctxt "report:hotel.booking:"
 msgid "M"
 msgstr "M"
 
 msgctxt "report:hotel.booking:"
-msgid "MONEDA"
+msgid "MAIN GUEST"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "MERO"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "MOBILE"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "MONEDA /"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "MOVIL"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
@@ -2411,7 +2370,11 @@ msgid "N"
 msgstr "N"
 
 msgctxt "report:hotel.booking:"
-msgid "NOCHES"
+msgid "NIGHTS"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "NOCHES /"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
@@ -2419,11 +2382,11 @@ msgid "NOT"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "NUMERO"
+msgid "NOTES"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "OD."
+msgid "OD. /"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
@@ -2431,11 +2394,23 @@ msgid "OFERTA"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "PLAN COMERCIAL:"
+msgid "OFFER"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "PLAZO DE PAGO"
+msgid "PAYMENT TERM"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "PLAN"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "PLAN COMERCIAL"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "PLAZO DE PAGO /"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
@@ -2443,7 +2418,15 @@ msgid "PR"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "PRINCIPAL"
+msgid "PRICE LIST"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "PRINCIPAL /"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "R.N.T. No"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
@@ -2451,7 +2434,15 @@ msgid "RESERVA"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "SOFTWARE TRYTON HOTELES"
+msgid "ROOM"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "S"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "SALIDA /"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
@@ -2459,12 +2450,33 @@ msgid "TARIFA"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "TELÉFONO"
+msgid "TAXES"
+msgstr ""
+
+#, fuzzy
+msgctxt "report:hotel.booking:"
+msgid "TOTAL /"
+msgstr "TOTAL"
+
+msgctxt "report:hotel.booking:"
+msgid "TOTAL AMOUNT"
 msgstr ""
 
 msgctxt "report:hotel.booking:"
-msgid "TOTAL"
-msgstr "TOTAL"
+msgid "TRYTON"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "The"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "UNIT PRICE"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "Ultimate"
+msgstr ""
 
 msgctxt "report:hotel.booking:"
 msgid "VALOR"
@@ -2476,13 +2488,8 @@ msgstr "ADVERTENCIA"
 
 msgctxt "report:hotel.booking:"
 msgid ""
-"_______________________________________________________________________"
-msgstr ""
-
-msgctxt "report:hotel.booking:"
-msgid ""
-"advierte al huesped que la explotación, la pornografía , el turismo sexual y"
-" demás formas de abuso sexual a menores de edad, es castigado penal y "
+"advierte al huesped que la explotación, la pornografía, el turismo sexual y "
+"demás formas de abuso sexual a menores de edad, es castigado penal y "
 "civilmente conforme a las disposiciones legales."
 msgstr ""
 
@@ -2495,6 +2502,10 @@ msgctxt "report:hotel.booking:"
 msgid "civil"
 msgstr ""
 
+msgctxt "report:hotel.booking:"
+msgid "f"
+msgstr ""
+
 msgctxt "report:hotel.booking:"
 msgid "from"
 msgstr ""
@@ -2515,6 +2526,18 @@ msgctxt "report:hotel.booking:"
 msgid "of law"
 msgstr ""
 
+msgctxt "report:hotel.booking:"
+msgid "oftware"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "or"
+msgstr ""
+
+msgctxt "report:hotel.booking:"
+msgid "otels"
+msgstr ""
+
 msgctxt "report:hotel.booking:"
 msgid "phy"
 msgstr ""
@@ -2527,6 +2550,10 @@ msgctxt "report:hotel.booking:"
 msgid "proceeding and"
 msgstr ""
 
+msgctxt "report:hotel.booking:"
+msgid "reated by"
+msgstr ""
+
 msgctxt "report:hotel.booking:"
 msgid "the"
 msgstr ""
@@ -2543,6 +2570,15 @@ msgctxt "report:hotel.booking:"
 msgid "www.presik.com"
 msgstr ""
 
+#, fuzzy
+msgctxt "report:hotel.booking:"
+msgid "|"
+msgstr "|"
+
+msgctxt "report:hotel.booking:"
+msgid "Ú"
+msgstr ""
+
 msgctxt "report:hotel.booking:"
 msgid "–"
 msgstr ""
@@ -3570,6 +3606,15 @@ msgctxt "report:hotel.booking_statement:"
 msgid "FECHA"
 msgstr ""
 
+msgctxt "report:hotel.booking_statement:"
+msgid "IMPORTE TOTAL"
+msgstr ""
+
+#, fuzzy
+msgctxt "report:hotel.booking_statement:"
+msgid "IMPUESTOS"
+msgstr "IMPUESTOS"
+
 msgctxt "report:hotel.booking_statement:"
 msgid "INVOICE TO"
 msgstr ""
@@ -3653,10 +3698,18 @@ msgctxt "report:hotel.booking_statement:"
 msgid "T"
 msgstr ""
 
+msgctxt "report:hotel.booking_statement:"
+msgid "TAXES /"
+msgstr ""
+
 msgctxt "report:hotel.booking_statement:"
 msgid "TERCERO"
 msgstr ""
 
+msgctxt "report:hotel.booking_statement:"
+msgid "TOTAL AMOUNT /"
+msgstr ""
+
 msgctxt "report:hotel.booking_statement:"
 msgid "UNIT PRICE"
 msgstr ""
@@ -5405,168 +5458,167 @@ msgid "€"
 msgstr ""
 
 #, fuzzy
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "$"
 msgstr "$"
 
 #, fuzzy
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "("
 msgstr "("
 
 #, fuzzy
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid ")"
 msgstr ")"
 
 #, fuzzy
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid ","
 msgstr ","
 
 #, fuzzy
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "-"
 msgstr "-"
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "."
 msgstr ""
 
 #, fuzzy
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "/"
 msgstr "/"
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "/ HOUSEKEEPING"
+msgstr ""
+
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "/for"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "00/00/0000"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "00:00:00"
 msgstr ""
 
 #, fuzzy
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid ":"
 msgstr ":"
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "???"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "CHECK IN HOY"
-msgstr ""
-
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "CHECK OUT HOY"
-msgstr ""
-
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "DE AMA DE LLAVES / HOUSEKEEPING"
-msgstr ""
-
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "DETALLE DE LIMPIEZA"
-msgstr ""
-
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "DISPON."
-msgstr ""
-
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "EMPLEADO"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "ESTADO"
 msgstr ""
 
-#, fuzzy
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "FECHA:"
-msgstr "FECHA:"
-
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "HABITACION"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "FIRMA"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "NOTAS"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "GESTIÓN DE LIMPIEZA"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "HAB."
+msgstr ""
+
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "Impresión:"
+msgstr ""
+
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "Impreso por:"
+msgstr ""
+
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "Página"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "SERVICIO"
-msgstr ""
-
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "TIPO DE LIMPIEZA"
 msgstr ""
 
-#, fuzzy
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "company"
-msgstr "empresa"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "ULTIMA LIMPIEZA"
+msgstr ""
+
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "ULTIMO CHECK- IN"
+msgstr ""
+
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "ULTIMO CHECK-OUT"
+msgstr ""
 
 #, fuzzy
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "company.rec_name"
+msgstr "empresa"
+
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "company.time_now()"
+msgstr ""
+
+#, fuzzy
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "date"
 msgstr "fecha"
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "de"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "for each='hk in records'"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "for each='rec in records'"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "hk.availability_string"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "rec.cleaning_type and rec.cleaning_type.name"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "hk.check_in_time"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "rec.housekeeping and rec.housekeeping.party.name"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "hk.check_out_time"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "rec.last_check_in"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "hk.cleaning_type and hk.cleaning_type.description"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "rec.last_check_out"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "hk.cleaning_type and hk.cleaning_type.name"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "rec.last_clean"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "hk.employee and hk.employee.party.name"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "rec.name"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "hk.notes"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "rec.state_string"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "hk.room.name"
+msgctxt "report:hotel.print_housekeeping.report:"
+msgid "user.name"
 msgstr ""
 
-msgctxt "report:hotel.print_housekeeping_service.report:"
-msgid "hk.state_string"
-msgstr ""
-
-msgctxt "report:hotel.print_housekeeping_service.report:"
+msgctxt "report:hotel.print_housekeeping.report:"
 msgid "€"
 msgstr ""
 
@@ -6369,46 +6421,6 @@ msgctxt "selection:hotel.folio.guest,type_guest:"
 msgid "Child"
 msgstr "Niño/a"
 
-msgctxt "selection:hotel.housekeeping,availability:"
-msgid "Available"
-msgstr "Disponible"
-
-msgctxt "selection:hotel.housekeeping,availability:"
-msgid "Blocked"
-msgstr "Bloqueada"
-
-msgctxt "selection:hotel.housekeeping,availability:"
-msgid "Occupied"
-msgstr "Ocupada"
-
-msgctxt "selection:hotel.housekeeping,state:"
-msgid "Clean"
-msgstr "Limpia"
-
-msgctxt "selection:hotel.housekeeping,state:"
-msgid "Dirty"
-msgstr "Sucia"
-
-msgctxt "selection:hotel.housekeeping,state:"
-msgid "Inspected"
-msgstr "Inspecionada"
-
-msgctxt "selection:hotel.housekeeping,state:"
-msgid "Maintenance"
-msgstr "Mantenimiento"
-
-msgctxt "selection:hotel.housekeeping.cleaning_type,kind:"
-msgid "Deep"
-msgstr "Profunda"
-
-msgctxt "selection:hotel.housekeeping.cleaning_type,kind:"
-msgid "Standard"
-msgstr "Estándar"
-
-msgctxt "selection:hotel.housekeeping.cleaning_type,kind:"
-msgid "Tweak"
-msgstr "Retoque"
-
 msgctxt "selection:hotel.maintenance,criticality:"
 msgid "Important"
 msgstr "Importante"
@@ -6441,13 +6453,9 @@ msgctxt "selection:hotel.maintenance,state:"
 msgid "In progress"
 msgstr "En Progreso"
 
-msgctxt "selection:hotel.maintenance,state:"
-msgid "in_progress"
-msgstr ""
-
 msgctxt "selection:hotel.room,state:"
 msgid "Clean"
-msgstr "Limpiar"
+msgstr "Limpia"
 
 msgctxt "selection:hotel.room,state:"
 msgid "Dirty"
@@ -6645,10 +6653,6 @@ msgctxt "view:hotel.booking:"
 msgid "Additional Info"
 msgstr "Información Adicional"
 
-msgctxt "view:hotel.booking:"
-msgid "Advances and Invoices"
-msgstr "Facturas y Anticipos"
-
 msgctxt "view:hotel.booking:"
 msgid "Bill"
 msgstr "Facturar"
@@ -6663,7 +6667,7 @@ msgstr "Gestor de Canales"
 
 msgctxt "view:hotel.booking:"
 msgid "Confirm"
-msgstr "Confirmar"
+msgstr "Confirmada"
 
 msgctxt "view:hotel.booking:"
 msgid "Create/Update Holder"
@@ -6686,12 +6690,12 @@ msgid "Pay / Advance"
 msgstr "Pagar / Anticipo"
 
 msgctxt "view:hotel.booking:"
-msgid "Payments"
-msgstr "Pagos"
+msgid "Payments and Invoices"
+msgstr ""
 
 msgctxt "view:hotel.booking:"
-msgid "Select Rooms"
-msgstr "Selecionar Habitaciones"
+msgid "Rooms"
+msgstr "Habitaciones"
 
 msgctxt "view:hotel.booking:"
 msgid "Send Email"
@@ -6737,46 +6741,66 @@ msgctxt "view:hotel.folio:"
 msgid "Stock"
 msgstr "Logística"
 
-msgctxt "view:hotel.housekeeping:"
-msgid "Amenities"
-msgstr "Comodidades"
-
-msgctxt "view:hotel.housekeeping:"
-msgid "Check List"
-msgstr "Lista de Chequeo"
-
-msgctxt "view:hotel.housekeeping:"
-msgid "Clean"
-msgstr "Limpia"
-
-msgctxt "view:hotel.housekeeping:"
-msgid "Dirty"
-msgstr "Sucia"
-
-msgctxt "view:hotel.housekeeping:"
-msgid "Info Addtional"
-msgstr "Info. Adicional"
-
-msgctxt "view:hotel.housekeeping:"
-msgid "Inspected"
-msgstr "Inspecionada"
-
-msgctxt "view:hotel.housekeeping:"
-msgid "Maintenance"
-msgstr "Mantenimiento"
-
-msgctxt "view:hotel.housekeeping:"
-msgid "Notes"
-msgstr "Notas"
-
-msgctxt "view:hotel.housekeeping:"
-msgid "Tasks"
-msgstr "Tareas"
+msgctxt "view:hotel.folio:"
+msgid "Taxes"
+msgstr "Impuestos"
 
 msgctxt "view:hotel.location:"
 msgid "Children"
 msgstr "Niños"
 
+msgctxt "view:hotel.maintenance:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "view:hotel.maintenance:"
+msgid "Confirm"
+msgstr "Confirmada"
+
+msgctxt "view:hotel.maintenance:"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "view:hotel.maintenance:"
+msgid "Finish"
+msgstr "Terminado"
+
+msgctxt "view:hotel.maintenance:"
+msgid "In Progress"
+msgstr "En progreso"
+
+msgctxt "view:hotel.room:"
+msgid "Clean"
+msgstr "Limpias"
+
+msgctxt "view:hotel.room:"
+msgid "Dirty"
+msgstr "Sucia"
+
+msgctxt "view:hotel.room:"
+msgid "Info Addtional"
+msgstr "Info. Adicional"
+
+msgctxt "view:hotel.room:"
+msgid "Inspected"
+msgstr "Inspecionada"
+
+msgctxt "view:hotel.room:"
+msgid "Maintenance"
+msgstr "Mantenimiento"
+
+msgctxt "view:hotel.room:"
+msgid "Notes"
+msgstr "Observaciones"
+
+msgctxt "view:hotel.room:"
+msgid "Tasks"
+msgstr "Tareas"
+
+msgctxt "view:hotel.room:"
+msgid "Time"
+msgstr "Hora"
+
 msgctxt "view:hotel.service.line:"
 msgid "Load"
 msgstr "Cargar"
@@ -6787,7 +6811,7 @@ msgstr "Revisado"
 
 msgctxt "view:hotel.service:"
 msgid "Confirm"
-msgstr "Confirmar"
+msgstr "Confirmada"
 
 msgctxt "view:hotel.service:"
 msgid "Draft"
@@ -6905,14 +6929,6 @@ msgctxt "wizard_button:hotel.print_housekeeping,start,print_:"
 msgid "Open"
 msgstr "Abrir"
 
-msgctxt "wizard_button:hotel.print_housekeeping_service,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:hotel.print_housekeeping_service,start,print_:"
-msgid "Open"
-msgstr "Abrir"
-
 msgctxt "wizard_button:hotel.print_manager,start,end:"
 msgid "Cancel"
 msgstr "Cancelar"