diff --git a/booking.py b/booking.py
index 7a862e6..41392e7 100644
--- a/booking.py
+++ b/booking.py
@@ -134,7 +134,7 @@ class Booking(Workflow, ModelSQL, ModelView):
depends=['party'])
vehicles_num = fields.Integer('Vehicles Number', states=STATES,
help="Number of vehicles that bring with guests.")
- vehicle_plate = fields.Integer('Vehicle Plate', states=STATES)
+ vehicle_plate = fields.Char('Vehicle Plate', states=STATES)
travel_cause = fields.Char('Travel Cause', states=STATES)
taxes_exception = fields.Boolean('Taxes Exception', states=STATES)
total_advance = fields.Function(fields.Numeric('Total Advance',
@@ -230,11 +230,10 @@ class Booking(Workflow, ModelSQL, ModelView):
def get_stock_moves(self, name=None):
moves = []
- # for folio in self.lines:
- # for charge in folio.charges:
- # if charge.move:
- # moves.append(charge.move.id)
- # return moves
+ for folio in self.lines:
+ for charge in folio.charges:
+ if charge.move:
+ moves.append(charge.move.id)
return moves
@classmethod
@@ -1462,6 +1461,7 @@ class UpdateHolderStart(ModelView):
customer_email = fields.Char('Customer Email')
customer_type_document = fields.Selection(TYPE_DOCUMENT, 'Tipo de Documento Cliente')
main_guest = fields.Boolean('Main Guest')
+ vehicle_plate = fields.Char('Vehicle Plate')
@fields.depends('id_number','name', 'sex', 'email', 'mobile',
'visa_number', 'visa_date', 'address', 'birthday', 'nationality')
@@ -1564,6 +1564,9 @@ class UpdateHolder(Wizard):
_party = self.start
rec_company = {}
to_folio = {}
+ if _party.vehicle_plate:
+ to_folio['vehicle_plate'] = _party.vehicle_plate
+
nationality_id = _party.nationality.id if _party.nationality else None
rec = {
'name': _party.name.upper(),
diff --git a/folio.py b/folio.py
index 67c8f03..517d5f4 100644
--- a/folio.py
+++ b/folio.py
@@ -129,8 +129,8 @@ class Folio(ModelSQL, ModelView):
room_amount = fields.Function(fields.Numeric('Room Amount',
digits=(16, 2), depends=['nights_quantity', 'unit_price']
), 'on_change_with_room_amount')
- stock_moves = fields.Many2Many('hotel.folio-stock.move', 'folio',
- 'move', 'Stock Moves', states={'readonly': True})
+ # stock_moves = fields.Many2Many('hotel.folio-stock.move', 'folio',
+ # 'move', 'Stock Moves', states={'readonly': True})
channel = fields.Function(fields.Many2One('hotel.channel', 'Channel'),
'get_channel')
num_children = fields.Function(fields.Integer('Num. Children'),
@@ -139,6 +139,7 @@ class Folio(ModelSQL, ModelView):
'get_num_guests')
stock_moves = fields.Function(fields.One2Many('stock.move', 'origin', 'Moves',
readonly=True), 'get_stock_moves')
+ vehicle_plate = fields.Char('Vehicle Plate')
@classmethod
def __setup__(cls):
@@ -292,7 +293,8 @@ class Folio(ModelSQL, ModelView):
def get_stock_moves(self, name=None):
moves = []
for charge in self.charges:
- moves.append(charge.move)
+ if charge.move:
+ moves.append(charge.move.id)
return moves
def create_invoice(self):
diff --git a/locale/es.po b/locale/es.po
index bebad0a..a1ef8eb 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -150,6 +150,10 @@ msgctxt "field:hotel.booking,payment_term:"
msgid "Payment Term"
msgstr "Plazo de Pago"
+msgctxt "field:hotel.booking,payments:"
+msgid "Payments"
+msgstr "Pagos"
+
msgctxt "field:hotel.booking,pending_to_pay:"
msgid "Pending to Pay"
msgstr "Pendiente por Pagar"
@@ -168,7 +172,7 @@ msgstr "Lista de precios"
msgctxt "field:hotel.booking,reason:"
msgid "Tourism Segment"
-msgstr "Turismo"
+msgstr "Segmento"
msgctxt "field:hotel.booking,registration_state:"
msgid "State Registration"
@@ -182,6 +186,10 @@ msgctxt "field:hotel.booking,state:"
msgid "State"
msgstr "Estado"
+msgctxt "field:hotel.booking,stock_moves:"
+msgid "Moves"
+msgstr "Movimientos de Inventario"
+
msgctxt "field:hotel.booking,tax_amount:"
msgid "Tax Amount"
msgstr "Impuestos"
@@ -242,6 +250,14 @@ msgctxt "field:hotel.booking-channel.commission,commission:"
msgid "Channel Commission"
msgstr "Comisión del Canal"
+msgctxt "field:hotel.booking-statement.line,booking:"
+msgid "Booking"
+msgstr "Reservas"
+
+msgctxt "field:hotel.booking-statement.line,statement_line:"
+msgid "Statement Line"
+msgstr "Linea de Estado de Cuenta"
+
msgctxt "field:hotel.booking.select_rooms.ask,accommodation:"
msgid "Accommodation"
msgstr "Acomodación"
@@ -555,8 +571,12 @@ msgid "Room Amount"
msgstr "Importe Habitación"
msgctxt "field:hotel.folio,stock_moves:"
-msgid "Stock Moves"
-msgstr "Movimientos de existencias"
+msgid "Moves"
+msgstr "Movimientos de Inventarios"
+
+msgctxt "field:hotel.folio,storage:"
+msgid "Storage"
+msgstr "Almacen"
msgctxt "field:hotel.folio,to_invoice:"
msgid "To Invoice"
@@ -590,6 +610,10 @@ msgctxt "field:hotel.folio,uom:"
msgid "UOM"
msgstr "UdM"
+msgctxt "field:hotel.folio,vehicle_plate:"
+msgid "Vehicle Plate"
+msgstr "Placa Vehículo"
+
msgctxt "field:hotel.folio-stock.move,folio:"
msgid "Folio"
msgstr "Folio"
@@ -622,6 +646,10 @@ msgctxt "field:hotel.folio.charge,invoice_to:"
msgid "Invoice To"
msgstr "Facturar a"
+msgctxt "field:hotel.folio.charge,move:"
+msgid "Move"
+msgstr "Movimiento de Inventario"
+
msgctxt "field:hotel.folio.charge,order:"
msgid "Order"
msgstr "Orden"
@@ -638,6 +666,10 @@ msgctxt "field:hotel.folio.charge,state:"
msgid "State"
msgstr "Estado"
+msgctxt "field:hotel.folio.charge,storage:"
+msgid "Storage"
+msgstr "Almacen"
+
msgctxt "field:hotel.folio.charge,taxed_amount:"
msgid "Amount with Tax"
msgstr "Valor Total"
@@ -1218,6 +1250,10 @@ msgctxt "field:hotel.update_holder.start,type_document:"
msgid "Tipo de Documento"
msgstr "Tipo de Documento"
+msgctxt "field:hotel.update_holder.start,vehicle_plate:"
+msgid "Vehicle Plate"
+msgstr "Placa Vehículo"
+
msgctxt "field:hotel.update_holder.start,visa_date:"
msgid "Visa Date"
msgstr "Fecha de Expedición de Visa"
@@ -1270,6 +1306,34 @@ msgctxt "field:sale.sale-account.voucher,voucher:"
msgid "Voucher"
msgstr "Comprobante"
+msgctxt "field:sale_shop.payment_form.start,amount_to_pay:"
+msgid "Amount to Pay"
+msgstr "Importe a pagar"
+
+msgctxt "field:sale_shop.payment_form.start,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimales de Moneda"
+
+msgctxt "field:sale_shop.payment_form.start,party:"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:sale_shop.payment_form.start,require_voucher:"
+msgid "Require Voucher"
+msgstr "Requiere Voucher"
+
+msgctxt "field:sale_shop.payment_form.start,statement:"
+msgid "Statement"
+msgstr "Estado de Cuenta"
+
+msgctxt "field:sale_shop.payment_form.start,user:"
+msgid "User"
+msgstr "Usuario"
+
+msgctxt "field:sale_shop.payment_form.start,voucher:"
+msgid "Voucher"
+msgstr "Comprobante"
+
msgctxt "help:company.company,property_code:"
msgid "Code on channel manager"
msgstr "Código en gestor de canales"
@@ -1360,6 +1424,10 @@ msgctxt "model:hotel.booking-channel.commission,name:"
msgid "Booking Channel Commision"
msgstr "Comisión del Canal"
+msgctxt "model:hotel.booking-statement.line,name:"
+msgid "Booking - Statement Line"
+msgstr "Reserva - Linea de Estado de Cuenta"
+
msgctxt "model:hotel.booking.select_rooms.ask,name:"
msgid "Select Rooms Assistant"
msgstr "Seleccionar Habitaciones"
@@ -1453,7 +1521,7 @@ msgid "Guests List Start"
msgstr "Lista de Huespedes"
msgctxt "model:hotel.print_housekeeping_service.start,name:"
-msgid "Print Housekeeping service Start"
+msgid "Print Housekeeping Service Start"
msgstr "Ama de Llaves"
msgctxt "model:hotel.print_manager.start,name:"
@@ -1676,6 +1744,10 @@ msgctxt "model:ir.action,name:wizard_select_rooms"
msgid "Select Rooms"
msgstr "Selecionar Habitaciones"
+msgctxt "model:ir.action,name:wizard_statement_payment_form"
+msgid "Pay"
+msgstr "Pago"
+
msgctxt "model:ir.action,name:wizard_update_holder"
msgid "Create / Update Guest"
msgstr "Crear / Actualizar Huesped"
@@ -1808,6 +1880,10 @@ msgctxt "model:ir.message,text:msg_missing_main_guest"
msgid "Missing main guest in lines!"
msgstr "Falta el huesped principal en las líneas!"
+msgctxt "model:ir.message,text:msg_missing_party_holder"
+msgid "Missing party holder!"
+msgstr "Falta el cliente / titular!"
+
msgctxt "model:ir.message,text:msg_missing_select_room"
msgid "Missing select room!"
msgstr "Falta seleccionar la habitación!"
@@ -2008,6 +2084,10 @@ msgctxt "model:sale.sale-account.voucher,name:"
msgid "Sale - Voucher"
msgstr "Venta - Comprobante"
+msgctxt "model:sale_shop.payment_form.start,name:"
+msgid "Statement Payment Form"
+msgstr "Formulario de Pago"
+
msgctxt "report:hotel.booking:"
msgid "$"
msgstr "$"
@@ -3205,17 +3285,8 @@ msgctxt "report:hotel.booking_statement:"
msgid ":"
msgstr ":"
-#, fuzzy
msgctxt "report:hotel.booking_statement:"
-msgid "A"
-msgstr "A"
-
-msgctxt "report:hotel.booking_statement:"
-msgid "ACCOMMODATION"
-msgstr ""
-
-msgctxt "report:hotel.booking_statement:"
-msgid "ALOJAMIENTO"
+msgid "ADVANCES"
msgstr ""
#, fuzzy
@@ -3231,6 +3302,10 @@ msgctxt "report:hotel.booking_statement:"
msgid "ANTICIPOS"
msgstr ""
+msgctxt "report:hotel.booking_statement:"
+msgid "ARRIVAL:"
+msgstr ""
+
msgctxt "report:hotel.booking_statement:"
msgid "ARTY"
msgstr ""
@@ -3252,12 +3327,17 @@ msgctxt "report:hotel.booking_statement:"
msgid "CHANNEL"
msgstr ""
+#, fuzzy
+msgctxt "report:hotel.booking_statement:"
+msgid "CLIENTE"
+msgstr "CLIENTE"
+
msgctxt "report:hotel.booking_statement:"
msgid "CUENTA"
msgstr ""
msgctxt "report:hotel.booking_statement:"
-msgid "CUSTOMER / CLIENTE"
+msgid "CUSTOMER /"
msgstr ""
#, fuzzy
@@ -3265,8 +3345,13 @@ msgctxt "report:hotel.booking_statement:"
msgid "D"
msgstr "D"
+#, fuzzy
msgctxt "report:hotel.booking_statement:"
msgid "DATE"
+msgstr "FECHA"
+
+msgctxt "report:hotel.booking_statement:"
+msgid "DEPARTURE:"
msgstr ""
#, fuzzy
@@ -3361,6 +3446,14 @@ msgctxt "report:hotel.booking_statement:"
msgid "Recepcionista"
msgstr ""
+msgctxt "report:hotel.booking_statement:"
+msgid "SERVICES"
+msgstr ""
+
+msgctxt "report:hotel.booking_statement:"
+msgid "SERVICIOS"
+msgstr ""
+
msgctxt "report:hotel.booking_statement:"
msgid "SOFTWARE TRYTON HOTELES"
msgstr ""
@@ -3397,6 +3490,10 @@ msgctxt "report:hotel.booking_statement:"
msgid "–"
msgstr ""
+msgctxt "report:hotel.booking_statement:"
+msgid "– PAYMENTS / PAGOS"
+msgstr ""
+
msgctxt "report:hotel.folio.registration_card:"
msgid ""
". El día hotelero comprende el lapso de 24 horas de permanencia del HUÉSPED "
@@ -3872,16 +3969,20 @@ msgctxt "report:hotel.folio:"
msgid "/"
msgstr "/"
+msgctxt "report:hotel.folio:"
+msgid "/ CLIENTE"
+msgstr ""
+
msgctxt "report:hotel.folio:"
msgid "/ DESCRIPCIÓN"
msgstr ""
msgctxt "report:hotel.folio:"
-msgid "/ NUMBER"
+msgid "/ FECHA SALIDA"
msgstr ""
msgctxt "report:hotel.folio:"
-msgid "/ PAY MODE"
+msgid "/ NUMBER"
msgstr ""
#, fuzzy
@@ -3920,7 +4021,7 @@ msgid "ANTICIPOS"
msgstr ""
msgctxt "report:hotel.folio:"
-msgid "ARRIVAL DATE /"
+msgid "ARRIVAL DATE"
msgstr ""
msgctxt "report:hotel.folio:"
@@ -3932,7 +4033,7 @@ msgid "ATE"
msgstr ""
msgctxt "report:hotel.folio:"
-msgid "BOOKING /"
+msgid "BOOKING"
msgstr ""
#, fuzzy
@@ -3953,7 +4054,7 @@ msgid "CUENTA"
msgstr ""
msgctxt "report:hotel.folio:"
-msgid "CUSTOMER / CLIENTE"
+msgid "CUSTOMER"
msgstr ""
#, fuzzy
@@ -3962,7 +4063,7 @@ msgid "D"
msgstr "D"
msgctxt "report:hotel.folio:"
-msgid "DEPARTURE DATE / FECHA SALIDA"
+msgid "DEPARTURE DATE"
msgstr ""
#, fuzzy
@@ -3978,10 +4079,6 @@ msgctxt "report:hotel.folio:"
msgid "ECIO UNIT."
msgstr ""
-msgctxt "report:hotel.folio:"
-msgid "ESTADO"
-msgstr ""
-
msgctxt "report:hotel.folio:"
msgid "F"
msgstr ""
@@ -3999,13 +4096,17 @@ msgid "FOLIO(S)"
msgstr ""
msgctxt "report:hotel.folio:"
-msgid "GUEST /"
+msgid "GUEST"
msgstr ""
msgctxt "report:hotel.folio:"
msgid "H"
msgstr ""
+msgctxt "report:hotel.folio:"
+msgid "HABITACIÓN"
+msgstr ""
+
msgctxt "report:hotel.folio:"
msgid "INVOICE TO"
msgstr ""
@@ -4018,6 +4119,14 @@ msgctxt "report:hotel.folio:"
msgid "MAIN"
msgstr ""
+msgctxt "report:hotel.folio:"
+msgid "MEDIO DE PAGO"
+msgstr ""
+
+msgctxt "report:hotel.folio:"
+msgid "MODE"
+msgstr ""
+
#, fuzzy
msgctxt "report:hotel.folio:"
msgid "N"
@@ -4054,7 +4163,7 @@ msgid "P"
msgstr "P"
msgctxt "report:hotel.folio:"
-msgid "PAYMENT AMOUNT"
+msgid "PAYMENT"
msgstr ""
msgctxt "report:hotel.folio:"
@@ -4074,7 +4183,7 @@ msgid "RESERVA:"
msgstr ""
msgctxt "report:hotel.folio:"
-msgid "ROOM / HABITACIÓN"
+msgid "ROOM /"
msgstr ""
msgctxt "report:hotel.folio:"
@@ -4085,10 +4194,6 @@ msgctxt "report:hotel.folio:"
msgid "SOFTWARE TRYTON HOTELES"
msgstr ""
-msgctxt "report:hotel.folio:"
-msgid "STATE"
-msgstr ""
-
msgctxt "report:hotel.folio:"
msgid "SUB"
msgstr ""
@@ -4105,6 +4210,14 @@ msgctxt "report:hotel.folio:"
msgid "TOTAL"
msgstr "TOTAL"
+msgctxt "report:hotel.folio:"
+msgid "TOTAL PAGOS /"
+msgstr ""
+
+msgctxt "report:hotel.folio:"
+msgid "TOTAL PAYMENTS"
+msgstr ""
+
msgctxt "report:hotel.folio:"
msgid "UESPED"
msgstr ""
@@ -6273,10 +6386,6 @@ msgctxt "view:hotel.booking:"
msgid "Create/Update Holder"
msgstr "Crear / Actualizar Titular"
-msgctxt "view:hotel.booking:"
-msgid "Do Pay"
-msgstr "Hacer un Pago"
-
msgctxt "view:hotel.booking:"
msgid "Lines"
msgstr "Líneas"
@@ -6289,6 +6398,14 @@ msgctxt "view:hotel.booking:"
msgid "Offer"
msgstr "Oferta"
+msgctxt "view:hotel.booking:"
+msgid "Pay / Advance"
+msgstr "Pagar / Anticipo"
+
+msgctxt "view:hotel.booking:"
+msgid "Payments"
+msgstr "Pagos"
+
msgctxt "view:hotel.booking:"
msgid "Select Rooms"
msgstr "Selecionar Habitaciones"
@@ -6297,6 +6414,10 @@ msgctxt "view:hotel.booking:"
msgid "Send Email"
msgstr "Enviar Email"
+msgctxt "view:hotel.booking:"
+msgid "Stock"
+msgstr "Logística"
+
msgctxt "view:hotel.folio.charge:"
msgid "Transfer"
msgstr "Transferencia"
@@ -6532,3 +6653,11 @@ msgstr "Cancelar"
msgctxt "wizard_button:hotel.update_holder,start,update:"
msgid "Update"
msgstr "Actualizar"
+
+msgctxt "wizard_button:sale_shop.payment_form,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:sale_shop.payment_form,start,pay_:"
+msgid "Pay"
+msgstr "Pago"
diff --git a/view/board_folio_form.xml b/view/board_folio_form.xml
index 211e564..180d3c9 100644
--- a/view/board_folio_form.xml
+++ b/view/board_folio_form.xml
@@ -20,8 +20,6 @@ this repository contains the full copyright notices and license terms. -->
-
@@ -32,13 +30,15 @@ this repository contains the full copyright notices and license terms. -->
+
+
-
+
diff --git a/view/booking_folio_form.xml b/view/booking_folio_form.xml
index 7c28f31..b5b37d7 100644
--- a/view/booking_folio_form.xml
+++ b/view/booking_folio_form.xml
@@ -28,6 +28,8 @@ this repository contains the full copyright notices and license terms. -->
+
+
diff --git a/view/booking_form.xml b/view/booking_form.xml
index 42cc6f6..db4969f 100644
--- a/view/booking_form.xml
+++ b/view/booking_form.xml
@@ -30,7 +30,7 @@ this repository contains the full copyright notices and license terms. -->
-
+
diff --git a/view/folio_charge_form.xml b/view/folio_charge_form.xml
index 2978c01..456322f 100644
--- a/view/folio_charge_form.xml
+++ b/view/folio_charge_form.xml
@@ -16,8 +16,8 @@ this repository contains the full copyright notices and license terms. -->
-
+
+
diff --git a/view/folio_charge_tree.xml b/view/folio_charge_tree.xml
index e66b1dd..a0a68d9 100644
--- a/view/folio_charge_tree.xml
+++ b/view/folio_charge_tree.xml
@@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. -->
-
+
diff --git a/view/update_holder_form.xml b/view/update_holder_form.xml
index c8caa2b..5fddd9c 100644
--- a/view/update_holder_form.xml
+++ b/view/update_holder_form.xml
@@ -21,6 +21,8 @@ this repository contains the full copyright notices and license terms. -->
+
+