diff --git a/Files/principal.bal b/Files/principal.bal
index daa87d0..78700c4 100644
Binary files a/Files/principal.bal and b/Files/principal.bal differ
diff --git a/Lanterna2.b4a b/Lanterna2.b4a
index 7e23b22..8106ea6 100644
--- a/Lanterna2.b4a
+++ b/Lanterna2.b4a
@@ -86,7 +86,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: Lanterna
 	#VersionCode: 1
-	#VersionName: 4.05.24
+	#VersionName: 4.06.09
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: landscape
 	#CanInstallToExternalStorage: False
diff --git a/Lanterna2.b4a.meta b/Lanterna2.b4a.meta
index febe768..7ba4cdb 100644
--- a/Lanterna2.b4a.meta
+++ b/Lanterna2.b4a.meta
@@ -22,6 +22,6 @@ ModuleClosedNodes4=
 ModuleClosedNodes5=
 ModuleClosedNodes6=
 ModuleClosedNodes7=
-NavigationStack=Principal,b_resumen_Click,3328,6,Principal,acomodaResItems,3343,6,Main,JobDone,282,0,Principal,b_reabrirMesa_Click,2710,0,Principal,p_transparenteVerOrden_Click,2695,0,Principal,b_imp_Click,1802,0,Principal,b_imp2_Click,2052,6,Principal,cb_factura_CheckedChange,3519,0,Visual Designer,principal.bal,-100,6,Principal,b_imp3_Click,2109,6
+NavigationStack=Principal,b_imp3_Click,2107,6,Principal,agregaFormaDePago,2604,0,Principal,b_mesaCerrar_Click,1285,0,Subs,actualizaProducto,1307,0,Subs,guardaProductoSinGestion,1346,0,Principal,b_cambioMesa_Click,1233,0,Principal,b_abrirMesa_Click,1247,0,Principal,b_pagoCerrar_Click,1411,6,Principal,b_reabrirMesa_Click,2842,1,Principal,b_reabrirMesaMulti_Click,2869,1,Principal,b_imp2_Click,1900,0
 SelectedBuild=0
 VisibleModules=6,5,7
diff --git a/Principal.bas b/Principal.bas
index caf0160..a376501 100644
--- a/Principal.bas
+++ b/Principal.bas
@@ -1296,7 +1296,7 @@ Private Sub b_mesaCerrar_Click
 	cb_opcionEfectivo.Checked = False
 	p_formasDePago.Height = 40dip
 	p_propina.Top = 143dip
-	p_botonesCerrar.Top = 295dip
+	p_botonesCerrar.Top = 270dip ' 295dip
 	p_pago.Height = 390dip
 	p_formasDePago.RemoveAllViews
 	Private c As Cursor = Starter.skmt.ExecQuery($"select PE_MESA from PEDIDO where PE_MESA = '${Starter.mesaActual}' and PE_TIPO = 'VENTA'"$)
@@ -1371,11 +1371,18 @@ End Sub
 Private Sub b_pagoCerrar_Click
 	listaTickets.Initialize
 	p_transparentePago.Visible = False
+'	Private pt As ResultSet = Starter.skmt.ExecQuery($"select * from PEDIDO_TICKET where PT_MESA = '${Starter.mesaActual}' and PT_TICKET = '${Starter.ticketActual}' and PT_PAGO = 'VENTA'"$)
+'	Do While pt.NextRow
+'		Private laPropina As String = pt.GetString("PT_PROPINA")
+'		Private laPropinaPago As String = pt.GetString("PT_PAGO_PROPINA")
+'	Loop
+'	Log($"${laPropina}, ${laPropinaPago}"$)
 	Log("######################   " & listaFormasDePagoCB.Size)
 	If listaFormasDePagoCB.Size > 1 Then
 		Log(">>>>>>>> VARIOS PAGOS")
 		Private sigTicketMT As String = Subs.traeConsecutivoTicket("CERRADA", "MULTI-TICKET")
 		Starter.skmt.ExecNonQuery($"update PEDIDO set PE_TIPO = 'MULTI-TICKET', PE_TICKET = '${sigTicketMT}' where PE_MESA = '${Starter.mesaActual}' and PE_TIPO = 'VENTA' and PE_TICKET = '${Starter.ticketActual}'"$)
+		Log(1)
 		Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_PAGO = 'MULTI-TICKET', PT_TICKET = '${sigTicketMT}', PT_PROPINA = '0', PT_PAGO_PROPINA = '0' where PT_MESA = '${Starter.mesaActual}' and PT_TICKET = '${Starter.ticketActual}' and PT_PAGO = 'VENTA'"$)
 		Starter.skmt.ExecNonQuery($"update CAT_MESAS set M_PAGO = null, M_TICKET = null, M_ESTATUS = null, M_MESERO = null, M_COMENSALES = null where M_ID = '${Starter.mesaActual}'"$) 'Reseteamos la mesa a cerrada.
 		Private primeraVez As Boolean = True
@@ -1393,7 +1400,11 @@ Private Sub b_pagoCerrar_Click
 			Private sigTicket As String = Subs.traeConsecutivoTicket("CERRADA", tipoPago)
 '			LogColor($"${primeraVez} - ${tipoPago} - |${formaPago}|"$, Colors.Red)
 			If primeraVez And tipoPago = "TARJETA" Then
-'				Log("INSERTAMOS TARJETA")
+				Private laPropina As String = "0"
+				If et_propina.Text <> "" Then
+					laPropina = et_propina.Text
+				End If
+				Log("INSERTAMOS TARJETA")
 				Private pa As ResultSet = Starter.skmt.ExecQuery($"select * from PEDIDO where PE_MESA = '${Starter.mesaActual}' and PE_TICKET = '${sigTicketMT}' and PE_TIPO = 'MULTI-TICKET'"$)
 '				Log($"select * from PEDIDO where PE_MESA = '${Starter.mesaActual}' and PE_TICKET = '${sigTicketMT}' and PE_TIPO = 'MULTI-TICKET'"$)
 '				Log(pa.RowCount)
@@ -1402,8 +1413,9 @@ Private Sub b_pagoCerrar_Click
 					Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_TICKET, PE_FECHA, PE_MESERO, PE_MESA, PE_COSTO_SIN, PE_TIPO, PE_TIPO2, PE_ORIGEN) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?) ", _
 					 Array As Object (pa.GetString("PE_COSTO_TOT"), pa.GetString("PE_COSTOU"), pa.GetString("PE_CANT"), pa.GetString("PE_PRONOMBRE"), pa.GetString("PE_PROID"), sigTicket, pa.GetString("PE_FECHA"), pa.GetString("PE_MESERO"), pa.GetString("PE_MESA"), pa.GetString("PE_COSTO_SIN"), "TARJETA", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$))
 				Loop
-				Starter.skmt.ExecNonQuery2("insert into PEDIDO_TICKET(PT_TICKET, PT_PAGO, PT_FECHA, PT_MESERO, PT_NOART, PT_MONTO, PT_MESA, PT_COSTO_SIN, PT_COMENSALES, PT_ALMACEN, PT_PAGO2, PT_ORIGEN) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object(sigTicket, tipoPago, Subs.traeFecha, Starter.meseroActual, 1, listaMontoDePago.Get(fdp).As(EditText).text, Starter.mesaActual, listaMontoDePago.Get(fdp).As(EditText).text, Starter.comensalesActuales, "MULTI-TICKET", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$))
-'				Log("INSERTAMOS EN PT")
+				Log("INSERTAMOS TARJETA EN PT")
+				Log($"${laPropina}, ${cb_pagoPropina.SelectedItem} ${pa.RowCount}"$)
+				Starter.skmt.ExecNonQuery2("insert into PEDIDO_TICKET(PT_TICKET, PT_PAGO, PT_FECHA, PT_MESERO, PT_NOART, PT_MONTO, PT_MESA, PT_COSTO_SIN, PT_COMENSALES, PT_ALMACEN, PT_PAGO2, PT_ORIGEN, PT_PROPINA, PT_PAGO_PROPINA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object(sigTicket, tipoPago, Subs.traeFecha, Starter.meseroActual, pa.RowCount, listaMontoDePago.Get(fdp).As(EditText).text, Starter.mesaActual, listaMontoDePago.Get(fdp).As(EditText).text, Starter.comensalesActuales, "MULTI-TICKET", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$, laPropina, cb_pagoPropina.SelectedItem))
 				ticketAnt = sigTicket
 				pagoAnt = formaPago
 				primeraVez = False
@@ -1412,7 +1424,7 @@ Private Sub b_pagoCerrar_Click
 				Log("INSERTAMOS EFECTIVO")
 				Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_TICKET, PE_FECHA, PE_MESERO, PE_MESA, PE_COSTO_SIN, PE_TIPO, PE_TIPO2, PE_ORIGEN) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (listaMontoDePago.Get(fdp).As(EditText).text, listaMontoDePago.Get(fdp).As(EditText).text, 1, "Consumo de alimentos", "CDA01", sigTicket, Subs.traeFecha, Starter.meseroActual, Starter.mesaActual, listaMontoDePago.Get(fdp).As(EditText).text, tipoPago, formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$))
 				Starter.skmt.ExecNonQuery2("insert into PEDIDO_TICKET(PT_TICKET, PT_PAGO, PT_FECHA, PT_MESERO, PT_NOART, PT_MONTO, PT_MESA, PT_COSTO_SIN, PT_COMENSALES, PT_ALMACEN, PT_PAGO2, PT_ORIGEN) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object(sigTicket, tipoPago, Subs.traeFecha, Starter.meseroActual, 1, listaMontoDePago.Get(fdp).As(EditText).text, Starter.mesaActual, listaMontoDePago.Get(fdp).As(EditText).text, Starter.comensalesActuales, "MULTI-TICKET", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$))
-				Log("INSERTAMOS EN PT")
+				Log("INSERTAMOS EFECTIVO EN PT")
 				descXEfectivo = listaMontoDePago.Get(fdp).As(EditText).text
 			End If
 '			If Not(descuentoAplicado) And pagoAnt <> "" And ticketAnt <> "" And descXEfectivo <> "" Then
@@ -1420,10 +1432,7 @@ Private Sub b_pagoCerrar_Click
 '				Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_TICKET, PE_FECHA, PE_MESERO, PE_MESA, PE_COSTO_SIN, PE_TIPO, PE_TIPO2, PE_ORIGEN) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ((descXEfectivo * -1), (descXEfectivo * -1), 1, "DESCUENTO", "DESC01", ticketAnt, Subs.traeFecha, Starter.meseroActual, Starter.mesaActual, descXEfectivo, "TARJETA", pagoAnt, $"${Starter.mesaActual}|${sigTicketMT}"$)) 'Agregamos el descuento al pedido de tarjeta.
 '				descuentoAplicado = True
 '			End If
-			Private laPropina As String = "0"
-			If et_propina.Text <> "" Then
-				laPropina = et_propina.Text
-			End If
+
 			Starter.ticketActual = sigTicket
 			Private tm As Map = CreateMap("ticket":sigTicket, "pago":tipoPago)
 			listaTickets.Add(tm) 'Agregamos el ticket y pago a la lista para imprimir el ticket con estos datos al llamar b_imprimirTicket_Click
@@ -1458,6 +1467,7 @@ Private Sub b_pagoCerrar_Click
 		If et_propina.Text <> "" Then
 			laPropina = et_propina.Text
 		End If
+		Log(2)
 		Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_PAGO = '${tipoPago}', PT_TICKET = '${sigTicket}', PT_TARJETA = '${formaPago}', PT_PROPINA = '${laPropina}', PT_PAGO_PROPINA = '${cb_pagoPropina.SelectedItem}', PT_PAGO2 = '${formaPago}' where PT_MESA = '${Starter.mesaActual}' and PT_TICKET = '${Starter.ticketActual}' and PT_PAGO = 'VENTA'"$)
 '		Log(tipoPago)
 		Starter.ticketActual = sigTicket
@@ -1919,8 +1929,8 @@ Sub b_imp2_Click
 				For n = 1 To primerEspacioLargo
 					primerEspacio = primerEspacio & "."
 				Next
-'					If imprimirAqui Then Printer1.WriteString($"${elNombre}${Subs.alineaDerecha(c.GetString("cuantos"), (31 - elNombre.Length), ".")} ${CRLF}"$)
-				If imprimirAqui Then Printer1.WriteString($"${elNombre}${primerEspacio}${cuantos}..${monto} ${CRLF}"$)
+'				If imprimirAqui Then Printer1.WriteString($"${elNombre}${Subs.alineaDerecha(c.GetString("cuantos"), (31 - elNombre.Length), ".")} ${CRLF}"$)
+				If imprimirAqui Then Printer1.WriteString($"${elNombre}${primerEspacio}${c.GetString("cuantos")}..${monto} ${CRLF}"$)
 				catTotal = catTotal + c.GetString("cuantos")
 '					Log($">>>>  ${catAnt} - ${c.GetString("CAT_GP_CLASIF")}"$)
 				If i = c.RowCount - 1 Then
@@ -2634,7 +2644,7 @@ Private Sub cb_pago2_SelectedIndexChanged (Index As Int)
 		c.Position = 0
 		l_opcionEfectivo.Text = $"${c.GetString("CAT_VA_VALOR")}% desc."$
 		p_opcionEfectivo.Visible = True
-		cb_opcionEfectivo.Checked = True
+'		cb_opcionEfectivo.Checked = False
 		
 	Else
 '		Log(listaFormaDePago.Size)
@@ -2831,6 +2841,7 @@ Private Sub b_reabrirMesa_Click
 			Starter.skmt.BeginTransaction
 			Starter.skmt.ExecNonQuery($"update CAT_MESAS set M_ESTATUS = 'ABIERTA', M_TICKET = '${d(1)}', M_MESERO = '${d(3)}', M_COMENSALES = '${d(4)}' where M_ID = '${d(0)}'"$)
 			Starter.skmt.ExecNonQuery($"update PEDIDO set PE_TIPO = 'VENTA', PE_TIPO2 = Null where PE_TIPO = '${d(2)}' and PE_MESA = '${d(0)}' and PE_TICKET = '${d(1)}'"$)
+			Log(3)
 			Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_PAGO = 'VENTA', PT_TARJETA = Null, PT_PAGO_PROPINA = Null, PT_PROPINA = Null, PT_PAGO2 = Null where PT_PAGO = '${d(2)}' and PT_MESA = '${d(0)}' and PT_TICKET = '${d(1)}'"$)
 			Starter.skmt.TransactionSuccessful
 			Starter.skmt.EndTransaction
@@ -2854,6 +2865,7 @@ Private Sub b_reabrirMesaMulti_Click
 '	Log($"delete from PEDIDO_TICKET where PT_ORIGEN = '${d(6)}|${d(7)}' and PT_ALMACEN = 'MULTI-TICKET'"$)
 	Starter.skmt.ExecNonQuery($"update CAT_MESAS set M_ESTATUS = 'ABIERTA', M_TICKET = '${d(7)}', M_MESERO = '${d(3)}', M_COMENSALES = '${d(4)}' where M_ID = '${d(6)}'"$)
 	Starter.skmt.ExecNonQuery($"update PEDIDO set PE_TIPO = 'VENTA', PE_TIPO2 = Null where PE_TIPO = 'MULTI-TICKET' and PE_MESA = '${d(6)}' and PE_TICKET = '${d(7)}'"$)
+	Log(4)
 	Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_PAGO = 'VENTA', PT_TARJETA = Null, PT_PAGO_PROPINA = Null, PT_PROPINA = Null, PT_PAGO2 = Null where PT_PAGO = 'MULTI-TICKET' and PT_MESA = '${d(6)}' and PT_TICKET = '${d(7)}'"$)
 	Starter.skmt.TransactionSuccessful
 	Starter.skmt.EndTransaction