Version: 5.05.20

Esta version tiene el conteo de tickets y las letras de los productos ya son de color negro en lugar de grises.
2026-04-17 21:06:16 +00:00 · 2025-05-26 10:45:04 -06:00
parent b180ded7db
commit 174bb9e2a9
12 changed files with 304 additions and 92 deletions
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -208,6 +208,12 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS NOVENTA (NV_CLIENTE TEXT, NV_FECHA TEXT, NV_USER TEXT, NV_MOTIVO TEXT, NV_COMM TEXT, NV_LAT TEXT, NV_LON TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS PICK_CIEGO (PC_ID_PROD TEXT, PC_NOM_PROD TEXT, PC_CANT TEXT, PC_ALMACEN TEXT, PC_RUTA TEXT, PC_FECHA TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS ENV_MONTO_LIQ (EML_MONTO TEXT, EML_ALMACEN TEXT, EML_RUTA TEXT, EML_USUARIO TEXT, EML_FECHA_PED TEXT)")
+	
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS TICKET_TEL_CEDIS (TTC_TELEFONO TEXT, TTC_ID_ALMACEN TEXT, TTC_NUM_TICKET INTEGER, TTC_ID_CLIENTE TEXT, TTC_RUTA TEXT, TTC_FECHA TEXT, TTC_MONTO TEXT)")
+	
+	Subs.agregaColumna("TICKET_TEL_CEDIS", "TTC_FOLIO", "TEXT")
+	Subs.agregaColumna("TICKET_TEL_CEDIS", "TTC_USUARIO", "TEXT")
+	Subs.agregaColumna("TICKET_TEL_CEDIS", "TTC_FOLIO_UNICO", "INTEGER")
 	Subs.agregaColumna("PEDIDO", "PE_ENVIO_OK", "INT")
 	Subs.agregaColumna("PEDIDO", "PE_IMPRESO", "INT")
 	Subs.agregaColumna("PEDIDO_CLIENTE", "PC_IMPRESO", "INT")
@@ -887,7 +893,7 @@ End Sub
 Sub i_engrane_Click
 	lv_server.Clear
 	ime.HideKeyboard
-	lv_server.AddSingleLine("http://keymon.lat:1781")
+	lv_server.AddSingleLine("Http://192.99.93.204:1781")
 '	lv_server.AddSingleLine("http://keymon.lat:1781")
 	If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1781")
 '	lv_server.AddSingleLine("http://40.123.36.38:1782")
--- a/B4A/C_Bitacora.bas
+++ b/B4A/C_Bitacora.bas
@@ -34,7 +34,6 @@ End Sub
 Private Sub B4XPage_Created (Root1 As B4XView)
 	Root = Root1
 	'load the layout to Root
-	Subs.centraBoton(b_Inicio_Fin_venta2, Root.Width)
 End Sub

 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
@@ -186,10 +185,8 @@ private Sub cargamosPanel
 		p_transparenteInicioFin2.Width = Root2.Width
 		p_transparenteInicioFin2.Height = Root2.Height
 		b_Inicio_Fin_venta2.top = 700
-		if B4XPages.MainPage.cliente.Tar.IsInitialized then b_Inicio_Fin_venta2.top = B4XPages.MainPage.cliente.Tar.top
 		b_Inicio_Fin_venta2.Left = 5
 		b_Inicio_Fin_venta2.Width = Root2.Width - 20
-		b_Inicio_Fin_venta2.Left = (Root2.Width / 2) - (b_Inicio_Fin_venta2.width / 2)
 		b_Inicio_Fin_venta2.Text = "INICIAR VENTA"
 		p_transparenteInicioFin2.BringToFront
 	End If
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -15,7 +15,7 @@ Sub Class_Globals
 	Dim reqManager As DBRequestManager
 	Dim cmd As DBCommand
 	Dim ime As IME
-
+	Dim Var As String
 	Dim g As GPS
 	Dim ruta As String
 	Dim skmt As SQL
@@ -173,7 +173,6 @@ Sub Class_Globals
 	Dim siimprimio As String = 0

 	
-	Private p_transparenteInicioFin As Panel
 End Sub

 'You can add more parameters here.
@@ -250,7 +249,9 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 '	End If
 '	h.Close
 '	j.Close
-	p_transparenteInicioFin.Top = 0 : p_transparenteInicioFin.Left = 0
+
+	
+	
 End Sub

 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
@@ -544,7 +545,7 @@ Sub GPS_LocationChanged (Location1 As Location)
 	'now we need the distance between our location and the target location
 	distance =    l1.DistanceTo(l2)  'the result is in meter
 	gest.Visible = True
-	If distance < 500000000000 Then
+	If distance < 500000000000000 Then
 		LA_GEO.TextColor = Colors.Blue
 		Tels.Visible = True
 		gest.Visible = True
@@ -872,7 +873,9 @@ Sub GuardaVenta
 	Else
 		comprarar = l_total.Text
 	End If
-	LogColor(comprarar,Colors.Green)
+	LogColor(comprarar, Colors.Green)
+
+	' Verificar si el monto de la venta es igual al monto anterior
 	If comprarar = Starter.pre_viejo Then
 		If bitacora.enVenta Then
 			bitacora.b_Inicio_Fin_venta2.Text = "TERMINAR VENTA"
@@ -886,7 +889,6 @@ Sub GuardaVenta
 			banderaimp = 0
 			Log("2.2")
 		End If
-		
 	Else
 		Dim minimocompra As Int
 		Dim mini As Cursor = Starter.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES where CAT_VA_DESCRIPCION = 'minimoventa'")
@@ -894,29 +896,25 @@ Sub GuardaVenta
 			mini.Position = 0
 			minimocompra = mini.GetString("CAT_VA_VALOR")
 		Else
-			minimocompra = 0 
+			minimocompra = 0
 		End If
-		If minimocompra > 0 Then		
+
+		If minimocompra > 0 Then
 			If comprarar < minimocompra Then
-			
-				Msgbox2Async("La venta es menor al monto minimo permitido."&CRLF& "La venta se eliminara."&CRLF&"¿Deseas continuar?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False)
+				Msgbox2Async("La venta es menor al monto minimo permitido." & CRLF & "La venta se eliminara." & CRLF & "¿Deseas continuar?", "ATENCION", "SI", "", "NO", LoadBitmap(File.DirAssets, "alert2.png"), False)
 				Wait For Msgbox_Result (resultado As Int)
 				If resultado = DialogResponse.POSITIVE Then
 					DateTime.DateFormat = "MM/dd/yyyy"
-					sDate=DateTime.Date(DateTime.Now)
-					sTime=DateTime.Time(DateTime.Now)
+					sDate = DateTime.Date(DateTime.Now)
+					sTime = DateTime.Time(DateTime.Now)
 					Subs.borraPedidoClienteActual
-					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO  NOVENTA (NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON) VALUES(?,?,?,?,?,?,?) ", Array As Object (cuenta,sDate & sTime, usuario, "Monto de venta menor a 190","", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps))
-					B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 3  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
-					bitacora.mandaBitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRutaBitacora, "NO VENTA", Subs.traeCliente,Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, "Monto de venta menor a 190", "")
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO NOVENTA (NV_CLIENTE, NV_FECHA, NV_USER, NV_MOTIVO, NV_COMM, NV_LAT, NV_LON) VALUES(?,?,?,?,?,?,?) ", Array As Object(cuenta, sDate & sTime, usuario, "Monto de venta menor a 190", "", B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps))
+					B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 3 where CAT_CL_CODIGO In (select cuenta from cuentaa)")
+					bitacora.mandaBitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRutaBitacora, "NO VENTA", Subs.traeCliente, Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, "Monto de venta menor a 190", "")
 					B4XPages.ShowPage("Principal")
 					Log("si entre")
 				End If
-			
-			
-			
 			Else If comprarar >= minimocompra Then
-		
 				Log("1.2")
 				Log(pre_act)
 				If comprarar <> Starter.pre_viejo Then
@@ -939,14 +937,11 @@ Sub GuardaVenta
 						B_IMP_Click
 					Else
 						Log("1.6")
-
 						GUADAVENTA2
 					End If
-		
 				End If
 			End If
 		Else If minimocompra = 0 Then
-			
 			Log("1.2")
 			If comprarar <> Starter.pre_viejo Then
 				Log("1.3")
@@ -968,15 +963,93 @@ Sub GuardaVenta
 					B_IMP_Click
 				Else
 					Log("1.6")
-
 					GUADAVENTA2
 				End If
-		
 			End If
-			
 		End If
-		
 	End If
+
+End Sub
+
+Sub InsertarTicketTELCEDIS(XXX As String)
+	Dim c As Cursor = skmt.ExecQuery("SELECT CAT_CL_CODIGO, CAT_CL_RUTA, CAT_CL_NOMBRE, CAT_CL_ATIENDE1, CAT_CL_ATIENTE2, CAT_CL_TELEFONO, CAT_CL_EMAIL, CAT_CL_CALLE, CAT_CL_NOEXT, CAT_CL_NOINT, CAT_CL_CALLE1, CAT_CL_CALLE2, CAT_CL_COLONIA, CAT_CL_MUNI, CAT_CL_EDO, CAT_CL_CP, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_MTOCOMPRA FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT cuenta FROM cuentaa)")
+	If c.RowCount > 0 Then
+		c.Position = 0
+		Dim ClieSel As String = c.GetString("CAT_CL_CODIGO")
+		Dim c2 As Cursor = skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'TEL_CEDIS'")
+		Dim TEL_CEDIS As String = ""
+		If c2.RowCount > 0 Then
+			c2.Position = 0
+			TEL_CEDIS = c2.GetString("CAT_VA_VALOR")
+		End If
+		c2.Close
+		Dim c4 As Cursor = skmt.ExecQuery("SELECT IFNULL(MAX(TTC_NUM_TICKET), 0) AS MaxTicket FROM TICKET_TEL_CEDIS")
+		Dim SigNumero As Int = 0
+		If c4.RowCount > 0 Then
+			c4.Position = 0
+			SigNumero = c4.GetInt("MaxTicket") + 1
+			Log("Lo sume--------------------->")
+		End If
+		c4.Close
+		
+		Dim cur As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT DISTINCT PE_FOLIO FROM PEDIDO WHERE PE_CLIENTE = ? AND PE_FOLIO = ?", Array As String(ClieSel, XXX))
+		If cur.RowCount > 0 Then
+			cur.Position = 0
+			Do While cur.Position < cur.RowCount
+				Dim PE_FOLIO As String = cur.GetString("PE_FOLIO")
+				Log("------------------> Folio de pedido seleccionado: " & PE_FOLIO & " <--------------")
+				Dim cur2 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT SUM(PE_COSTO_TOT) AS PE_COSTO_TOT FROM PEDIDO WHERE PE_CLIENTE = ? AND PE_FOLIO = ?", Array As String(ClieSel, PE_FOLIO))
+				Dim montoTotal As Double = 0
+				If cur2.RowCount > 0 Then
+					cur2.Position = 0
+					montoTotal = cur2.GetDouble("PE_COSTO_TOT")
+				End If
+				cur2.Close
+				
+				DateTime.DateFormat = "dd/MM/yyyy"
+				DateTime.TimeFormat = "HH:mm:ss"
+				Dim TTC_TELEFONO As String = TEL_CEDIS
+				Dim TTC_ID_ALMACEN As String = ALMACEN
+				Dim TTC_ID_CLIENTE As String = ClieSel
+				Dim TTC_RUTA As String = Subs.traeRuta(la_cuenta.Text)
+				Dim TTC_FECHA As String = DateTime.Date(DateTime.Now)&" "&DateTime.Time(DateTime.Now)
+				Dim TTC_MONTO As String = NumberFormat2(montoTotal, 0, 2, 2, False)
+				Dim TTC_FOLIO As String = cur.GetString("PE_FOLIO")
+				Dim TTC_USUARIO As String = Subs.traeUsuarioDeBD
+		
+				Dim c5 As Cursor = skmt.ExecQuery2("SELECT IFNULL(MAX(TTC_FOLIO_UNICO), 0) AS FolioUnico FROM TICKET_TEL_CEDIS WHERE TTC_ID_CLIENTE = ? AND TTC_FOLIO = ?", Array As String(ClieSel,TTC_FOLIO))
+				Dim Foliosig As Int = 0
+				If c5.RowCount > 0 Then
+					c5.Position = 0
+					Foliosig = c5.GetInt("FolioUnico")
+    
+					If Foliosig = 0 Then
+						Dim cMaxFolio As Cursor = skmt.ExecQuery("SELECT IFNULL(MAX(TTC_FOLIO_UNICO), 0) AS MaxFolio FROM TICKET_TEL_CEDIS")
+						If cMaxFolio.RowCount > 0 Then
+							cMaxFolio.Position = 0
+							Foliosig = cMaxFolio.GetInt("MaxFolio") + 1
+						End If
+						cMaxFolio.Close
+					End If
+				End If
+				c5.Close
+				
+				skmt.ExecNonQuery2("INSERT INTO TICKET_TEL_CEDIS(TTC_TELEFONO, TTC_ID_ALMACEN, TTC_NUM_TICKET, TTC_ID_CLIENTE, TTC_RUTA, TTC_FECHA, TTC_MONTO, TTC_FOLIO, TTC_USUARIO, TTC_FOLIO_UNICO) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", _
+                                   Array As Object(TTC_TELEFONO, TTC_ID_ALMACEN, SigNumero, TTC_ID_CLIENTE, TTC_RUTA, TTC_FECHA, TTC_MONTO, TTC_FOLIO, TTC_USUARIO, Foliosig))
+				
+				Log("------->" & TTC_TELEFONO & " " & TTC_ID_ALMACEN & " " & SigNumero & " " & TTC_ID_CLIENTE & " " & TTC_RUTA & " " & TTC_FECHA & " " & TTC_MONTO & " " & TTC_FOLIO)
+				Log("Nuevo registro insertado en TICKET_TEL_CEDIS para el cliente " & ClieSel & ". Número de ticket: " & SigNumero & ", Folio de pedido: " & PE_FOLIO & ", Folio de pedido: " & PE_FOLIO & "<------------")
+				SigNumero = SigNumero + 1
+				cur.Position = cur.Position + 1
+			Loop
+		Else
+			Log("No se encontraron folios de pedido para el cliente " & ClieSel & ".")
+		End If
+		cur.Close
+	Else
+		Log("No se encontraron datos en kmt_info para los clientes seleccionados.")
+	End If
+	c.Close
 End Sub

 Sub GUADAVENTA2
@@ -1115,7 +1188,6 @@ Sub GUADAVENTA2
 '		B4XPages.ShowPage("login")
 		B4XPages.MainPage.recarga = "0"
 		imprimirsolo = 0
-		
 	End If
 End Sub

@@ -1196,16 +1268,18 @@ Sub B_IMP_Click
 	Log(imprimirsolo)
 	c = skmt.ExecQuery2("SELECT * FROM PEDIDO WHERE PE_FOLIO = ? AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)",Array As String("PREVENTA_48"))
 	If c.RowCount > 0 Then
+'		InsertarTicketTELCEDIS
 		imprime_venta
-		t1.Initialize("T1", 3000) ' 1000 = 1 second
+
+		t1.Initialize("T1", 4000) ' 1000 = 1 second
 		t1.Enabled = True
 	Else If c.RowCount = 0 Then
 		s = skmt.ExecQuery2("SELECT * FROM PEDIDO WHERE PE_FOLIO = ? AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)",Array As String("PREVENTA_24"))
 		If s.RowCount > 0 Then
+'			InsertarTicketTELCEDIS
 			imprime_preventa
 		End If
 	End If
-
 End Sub

 Sub t1_tick
@@ -1216,6 +1290,76 @@ Sub t1_tick
 	t1.Enabled = False
 End Sub

+Sub traeNumeroTicket(FOLIO As String) As Int 'ignore
+	Private cTicket As Cursor
+	Private TTC_NUM_TICKET As Int = 0
+	cTicket = skmt.ExecQuery2("SELECT IFNULL(MAX(TTC_NUM_TICKET),0) AS TTC_NUM_TICKET FROM TICKET_TEL_CEDIS WHERE TTC_ID_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND TTC_FOLIO = ?", Array As String (FOLIO))
+	
+	If cTicket.RowCount > 0 Then
+		cTicket.Position = 0
+		TTC_NUM_TICKET = cTicket.GetString("TTC_NUM_TICKET")
+	End If
+	cTicket.Close
+	Return TTC_NUM_TICKET
+End Sub
+
+Sub traeNumeroFolioUnico(FOLIO As String, Cliente As String) As Int
+	Private cTicket As Cursor
+	Private TTC_FOLIO_UNICO As Int = 0
+    
+	Log("Llamando a la consulta con FOLIO: " & FOLIO & " y Cliente: " & Cliente)
+    
+	cTicket = skmt.ExecQuery2("SELECT DISTINCT TTC_FOLIO_UNICO FROM TICKET_TEL_CEDIS WHERE TTC_ID_CLIENTE = ? AND TTC_FOLIO = ?", Array As String(Cliente, FOLIO))
+    
+	If cTicket.RowCount > 0 Then
+		cTicket.Position = 0
+		TTC_FOLIO_UNICO = cTicket.GetInt("TTC_FOLIO_UNICO")
+		Log("Se encontró el TTC_FOLIO_UNICO: " & TTC_FOLIO_UNICO)
+	Else
+		Log("No se encontró ningún TTC_FOLIO_UNICO para el FOLIO: " & FOLIO & " y Cliente: " & Cliente)
+	End If
+    
+	cTicket.Close
+    
+	Return TTC_FOLIO_UNICO
+End Sub
+
+Sub traeTelCedis As String 'ignore
+	Private t As Cursor
+	Private TEL_CEDIS As String = ""
+	t = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'TEL_CEDIS'")
+	If t.RowCount > 0 Then
+		t.Position = 0
+		TEL_CEDIS = t.GetString("CAT_VA_VALOR")
+	End If
+	t.Close
+	Return TEL_CEDIS
+End Sub
+
+Sub TraeNumVendedor As String
+	Private np As Cursor
+	Private Tel_Preventa As String = ""
+	np = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'TELEFONO'")
+	If np.RowCount > 0 Then
+		np.Position = 0
+		Tel_Preventa = np.GetString("CAT_VA_VALOR")
+	End If
+	np.Close
+	Return Tel_Preventa
+End Sub
+
+Sub TraeVendedor As String
+	Private pv As Cursor
+	Private Preventa As String = ""
+	pv = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'nom_usuario'")
+	If pv.RowCount > 0 Then
+		pv.Position = 0
+		Preventa = pv.GetString("CAT_VA_VALOR")
+	End If
+	pv.Close
+	Return Preventa
+End Sub
+
 Sub imprime_preventa
 	c=skmt.ExecQuery("select USUARIO from usuarioa")
 	c.Position=0
@@ -1235,7 +1379,7 @@ Sub imprime_preventa
 	
 	Dim IMEI_BASE As String = Starter.IMEI_BASE
 	Log("IMEI_BASE desde otra clase: " & IMEI_BASE)
-
+	Var = "PREVENTA_24"
 	ProgressDialogShow("Imprimiendo, un momento ...")
 	Printer1.DisConnect
 	If Not(Printer1.IsConnected) Then
@@ -1268,10 +1412,12 @@ Sub imprime_preventa
 	ESPACIO = 22
 	BLANCO = " "
 	Printer1.WriteString("Compania Logistica Mazapa." &  eLINEFEED)
+	Printer1.WriteString("Tel CEDIS:" & traeTelCedis &  eLINEFEED)
 	Printer1.WriteString(sDate &  eLINEFEED)
 	Printer1.WriteString(sTime &  eLINEFEED)
-	Printer1.WriteString("Vendedor:" & usuario &  eLINEFEED)
-	Printer1.WriteString("Tel vendedor:" & tel &  eLINEFEED)
+	Printer1.WriteString("Vendedor: " & TraeVendedor &  eLINEFEED)
+	Printer1.WriteString("Numero de Vendedor: " & TraeNumVendedor &  eLINEFEED)
+	Printer1.WriteString("Numero de Ticket: " & traeNumeroFolioUnico("PREVENTA_24", la_cuenta.Text) &  eLINEFEED)
 	Printer1.WriteString("Ruta:" & Subs.traeRuta(la_cuenta.Text) &  eLINEFEED)
 	Printer1.WriteString("Tienda: " & La_nombre.Text &  eLINEFEED)
 	Printer1.WriteString("ID.Cliente: " &  la_cuenta.Text &  eLINEFEED)
@@ -1342,11 +1488,11 @@ Sub imprime_preventa
 				s.Position=i
 				If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then
 					Printer1.WriteString("* "& s.GetString("PE_PRONOMBRE") &  eLINEFEED)
-				Log("promo")
+					Log("promo")
 				Else
 					Printer1.WriteString(s.GetString("PE_PRONOMBRE") &  eLINEFEED)
 					k1 = NumberFormat(s.GETSTRING("PE_COSTOU"),0,2)
-					k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2)						
+					k2 = NumberFormat(s.GETSTRING("PE_COSTO_TOT"),0,2)
 					TAMANO = s.GetLong("L_CANT") + k1.Length + k2.Length
 					ESPACIO = 23
 					BLANCO = " "
@@ -1398,7 +1544,7 @@ Sub imprime_preventa
 		Printer1.WriteString("Total art. preventa: " & NumberFormat(c.GetDouble("PC_NOART"), 0, 0) & eLINEFEED)
 		c.Close
 		
-	End If	
+	End If
 	Dim siesacredi As Cursor = skmt.ExecQuery("SELECT * FROM PAGARES WHERE PA_CLIENTE IN (SELECT CUENTA FROM CUENTAA)")
 	If siesacredi.RowCount > 0 Then
 		siesacredi.Position = 0
@@ -1409,7 +1555,7 @@ Sub imprime_preventa
 			Printer1.WriteString("Total a contado:   $" & NumberFormat( (s.GetString("TOTAL")-siesacredi.GetString("PA_MONTO")),0,2) &  eLINEFEED)
 		End If
 		s.Close
-	End If	
+	End If
 	Printer1.WriteString(" " &  eLINEFEED)
 	Printer1.WriteString("------------------------------" &  eLINEFEED)
 	Printer1.WriteString("----ESTE TICKET NO ES UN -----" &  eLINEFEED)
@@ -1463,7 +1609,7 @@ Sub imprime_venta
 '	c.Position = 0
 '	sucursal = c.GetString("CAT_VA_VALOR")
 '	c.Close
-	
+	Var = "PREVENTA_48"
 	ProgressDialogShow("Imprimiendo, un momento ...")
 	Printer1.DisConnect
 	If Not(Printer1.IsConnected) Then
@@ -1514,11 +1660,14 @@ Sub imprime_venta
 	'printer.Initialize(cmp20.OutputStream)
 '	Printer1.WriteString("DISTRIBUIDORA ROCHA TULA PACHUCA" &  CRLF)
 	Printer1.WriteString("Compania Logistica Mazapa." &  eLINEFEED)
+	Printer1.WriteString("Tel CEDIS:" & traeTelCedis &  eLINEFEED)
 '	Printer1.WriteString(sucursal &  eLINEFEED)
 	Printer1.WriteString(sDate &  eLINEFEED)
 	Printer1.WriteString(sTime &  eLINEFEED)
-	Printer1.WriteString("Vendedor:" & usuario &  eLINEFEED)
-	Printer1.WriteString("Tel vendedor:" & tel &  eLINEFEED)
+	Printer1.WriteString("Vendedor: " & TraeVendedor &  eLINEFEED)
+	Printer1.WriteString("Numero de Vendedor: " & TraeNumVendedor &  eLINEFEED)
+	Printer1.WriteString("Numero de Ticket: " & traeNumeroFolioUnico("PREVENTA_48", la_cuenta.Text) &  eLINEFEED)
+	Printer1.WriteString("Ruta:" & Subs.traeRuta(la_cuenta.Text) &  eLINEFEED)
 	Printer1.WriteString("Tienda: " & La_nombre.Text &  eLINEFEED)
 	Printer1.WriteString("ID.Cliente: " &  la_cuenta.Text &  eLINEFEED)
 	Printer1.WriteString("Calle: " & la_Calle.Text &  eLINEFEED)
@@ -1853,6 +2002,7 @@ Sub Printer1_Connected (Success As Boolean)
 		skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("MACIMP",Starter.mac_impresora))
 		LogColor("Impresora conectada", Colors.Green)
 '		B_IMP2.Enabled = True
+		InsertarTicketTELCEDIS(var)
 		impresoraConectada = True
 		siimprimio = 1
 	Else
@@ -2248,9 +2398,12 @@ Sub JobDone(Job As HttpJob)
 '					For Each k As String In resultado.Columns.Keys
 '						Log(resultado.Tag & ": " & k & ": " & records(resultado.Columns.Get(k)))
 '					Next
-				Next
-			End If
+			Next
 		End If
+	End If
+		
+	Dim resultado As DBResult = reqManager.HandleJob(Job)
+		Log("JobDone: '" & resultado.Tag & "' - Registros: " & resultado.Rows.Size)
 		
 		If Job.JobName = "DBRequest" Then
 			Dim resultado As DBResult = reqManager.HandleJob(Job)
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -618,7 +618,7 @@ Sub Subir_Click
 				Dim cmd As DBCommand
 				cmd.Initialize
 				cmd.Name = "UPDATE_mazapa_ACTUAL2_GPS"
-				cmd.Parameters = Array As Object(L_MONTOD.Text, L_CUANTOST.Text, l_cuantosc.Text,l_porvisitar.TEXT,c.GetString("hglat"),c.GetString("hglon"),batterystatus(0),LPT, STEYIN, STEYOUT,ALMACEN,l_ruta.Text )
+				cmd.Parameters = Array As String(L_MONTOD.Text, L_CUANTOST.Text, l_cuantosc.Text,l_porvisitar.TEXT,c.GetString("hglat"),c.GetString("hglon"),batterystatus(0),LPT, STEYIN, STEYOUT,ALMACEN,l_ruta.Text )
 				reqManager.ExecuteCommand(cmd , "update_gps")
 			Next
 		End If
@@ -663,7 +663,7 @@ Sub Subir_Click
 				Dim cmd As DBCommand
 				cmd.Initialize
 				cmd.Name = "insert_pagares_mazapa"
-				cmd.Parameters = Array As Object(C.GetString("PA_ALMACEN"),Subs.traeRuta2(c.GetString("PA_CLIENTE")),C.GetString("PA_FECHA"),C.GetString("PA_CAPTURA"),C.GetString("PA_MONTO"),C.GetString("PA_USUARIO"),C.GetString("PA_CLIENTE") )
+				cmd.Parameters = Array As String(C.GetString("PA_ALMACEN"),Subs.traeRuta2(c.GetString("PA_CLIENTE")),C.GetString("PA_FECHA"),C.GetString("PA_CAPTURA"),C.GetString("PA_MONTO"),C.GetString("PA_USUARIO"),C.GetString("PA_CLIENTE") )
 				reqManager.ExecuteCommand(cmd , "ins_pagares")
 			Next
 		End If
@@ -697,11 +697,36 @@ Sub Subir_Click
 				Dim cmd As DBCommand
 				cmd.Initialize
 				cmd.Name = "insert_clientesnuevos_mazapa3"
-				cmd.Parameters = Array As Object(c.GetString("CN_ID"), c.GetString("CN_FECHA"), c.GetString("CN_USER"), c.GetString("CN_LAT"), c.GetString("CN_LON"), c.GetString("CN_NOMBRE"), c.GetString("CN_DIRECCION"),ALMACEN, c.GetString("CN_RUTA"), "En espera",c.GetString("CN_GIRO"),dialetra, c.GetString("CN_SOLICITA"), c.GetString("CN_COLONIA"), c.GetString("CN_TELEFONO"), c.GetString("CN_REFERENCIA"), c.GetString("CN_HR_INICIO"), c.GetString("CN_HR_FIN"))
+				cmd.Parameters = Array As String(c.GetString("CN_ID"), c.GetString("CN_FECHA"), c.GetString("CN_USER"), c.GetString("CN_LAT"), c.GetString("CN_LON"), c.GetString("CN_NOMBRE"), c.GetString("CN_DIRECCION"),ALMACEN, c.GetString("CN_RUTA"), "En espera",c.GetString("CN_GIRO"),dialetra, c.GetString("CN_SOLICITA"), c.GetString("CN_COLONIA"), c.GetString("CN_TELEFONO"), c.GetString("CN_REFERENCIA"), c.GetString("CN_HR_INICIO"), c.GetString("CN_HR_FIN"))
 				reqManager.ExecuteCommand(cmd , "inst_clientesn")
 			Next
 		End If
 		c.Close
+		
+		c = Starter.skmt.ExecQuery("SELECT * FROM TICKET_TEL_CEDIS")
+		If c.RowCount > 0 Then
+			For i = 0 To c.RowCount - 1
+				c.Position = i
+				Dim cmd As DBCommand
+				cmd.Initialize
+				cmd.Name = "insert_TICKET_TEL_CEDIS_MAZAPA"
+				Log(c.GetString("TTC_FOLIO"))
+				cmd.Parameters = Array As String( _
+            c.GetString("TTC_TELEFONO"), _
+            c.GetString("TTC_ID_ALMACEN"), _
+            c.GetString("TTC_NUM_TICKET"), _
+            c.GetString("TTC_ID_CLIENTE"), _
+            c.GetString("TTC_RUTA"), _
+            c.GetString("TTC_FECHA"), _
+            c.GetString("TTC_MONTO"), _
+            c.GetString("TTC_FOLIO"), _
+            c.GetString("TTC_USUARIO"), _
+            c.GetString("TTC_FOLIO_UNICO") _
+        )
+				reqManager.ExecuteCommand(cmd , "insert_TICKET_TEL_CEDIS")
+			Next
+		End If
+		c.Close

 '		c=B4XPages.MainPage.skmt.ExecQuery("SELECT  HE_CLIE, HE_RES, HE_FECHA, HE_TIPO FROM HIST_ENCUESTA")
 '		If c.RowCount>0 Then
@@ -729,7 +754,7 @@ Sub Subir_Click
 				cmd.Name = "insert_pedido_CLIENTE_mazapa"
 				PCNoArts = c.GetString("PC_NOART")
 				PCMonto = c.GetString("PC_MONTO")
-				cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), ALMACEN, Subs.traeRuta2(c.GetString("PC_CLIENTE")), c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA"), c.GetString("PC_IMPRESO"))
+				cmd.Parameters = Array As String(c.GetString("PC_CLIENTE"), c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), ALMACEN, Subs.traeRuta2(c.GetString("PC_CLIENTE")), c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA"), c.GetString("PC_IMPRESO"))
 				reqManager.ExecuteCommand(cmd , "ins_pedidos")
 				Log(">>>>>>  INSERT PEDIDO_CLIENTE")
 			Next
@@ -749,7 +774,7 @@ Sub Subir_Click
 				cmd.Initialize
 				cmd.Name = "insert_pedido_PE_mazapa" 'CON TOTALES INCLUIDOS
 				Log(c.GetString("PE_CEDIS")&", "&ALMACEN&", "&c.GetString("PE_COSTO_TOT")&", "&c.GetString("PE_COSTOU")&", "&c.GetString("PE_CANT")&", "&c.GetString("PE_PRONOMBRE")&", "&c.GetString("PE_PROID")&", "&c.GetString("PE_CLIENTE")&", "&c.GetString("PE_FECHA")&", "&c.GetString("PE_USUARIO")&", "&Subs.traeRuta2(c.GetString("PE_CLIENTE"))&", "& c.GetString("PE_COSTO_SIN")&", "&c.GetString("PE_DESC")&", "&c.GetString("PE_FOLIO")&", "& ALMACEN)
-				cmd.Parameters = Array As Object(c.GetString("PE_CEDIS"),ALMACEN,c.GetString("PE_COSTO_TOT"),c.GetString("PE_COSTOU"),c.GetString("PE_CANT"),c.GetString("PE_PRONOMBRE"),c.GetString("PE_PROID"),c.GetString("PE_CLIENTE"),c.GetString("PE_FECHA"),c.GetString("PE_USUARIO"),Subs.traeRuta2(c.GetString("PE_CLIENTE")), c.GetString("PE_COSTO_SIN"),c.GetString("PE_DESC"),c.GetString("PE_FOLIO"),c.GetString("PE_CANTC"),c.GetString("PE_BCAJAS"), c.GetString("PE_IMPRESO"))
+				cmd.Parameters = Array As String(c.GetString("PE_CEDIS"),ALMACEN,c.GetString("PE_COSTO_TOT"),c.GetString("PE_COSTOU"),c.GetString("PE_CANT"),c.GetString("PE_PRONOMBRE"),c.GetString("PE_PROID"),c.GetString("PE_CLIENTE"),c.GetString("PE_FECHA"),c.GetString("PE_USUARIO"),Subs.traeRuta2(c.GetString("PE_CLIENTE")), c.GetString("PE_COSTO_SIN"),c.GetString("PE_DESC"),c.GetString("PE_FOLIO"),c.GetString("PE_CANTC"),c.GetString("PE_BCAJAS"), c.GetString("PE_IMPRESO"))
 				reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}_${c.GetString("PE_PROID")}"$)
 '				Log($">>>>  INS_PEDIDO= ${C.GetString("PE_CEDIS")},${ALMACEN},${C.GetString("PE_COSTO_TOT")},${C.GetString("PE_COSTOU")},${C.GetString("PE_CANT")}, ${C.GetString("PE_PRONOMBRE")}, ${C.GetString("PE_PROID")}, ${C.GetString("PE_CLIENTE")}, ${C.GetString("PE_FECHA")}, ${C.GetString("PE_USUARIO")}, ${C.GetString("PE_RUTA")}, ${C.GetString("PE_COSTO_SIN")}, ${C.GetString("PE_DESC")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}"$)
 '				cmd.Name = "insert_pedido_INTMEX"  ' SIN TOTALES INCLUIDOS
@@ -771,7 +796,7 @@ Sub Subir_Click
 				Dim cmd As DBCommand
 				cmd.Initialize
 				cmd.Name = "insert_noventa_mazapa"
-				cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), ALMACEN, Subs.traeRuta2(c.GetString("NV_CLIENTE")))
+				cmd.Parameters = Array As String(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), ALMACEN, Subs.traeRuta2(c.GetString("NV_CLIENTE")))
 				reqManager.ExecuteCommand(cmd , "inst_noventa")
 			Next
 		End If
@@ -788,7 +813,7 @@ Sub Subir_Click
 				Dim cmd As DBCommand
 				cmd.Initialize
 				cmd.Name = "insert_geocerca_mazapa"
-				cmd.Parameters = Array As Object(C.GetString("HGCLIENTE"),C.GetString("HGDATE"),C.GetString("HGLAT"),C.GetString("HGLON"))
+				cmd.Parameters = Array As String(C.GetString("HGCLIENTE"),C.GetString("HGDATE"),C.GetString("HGLAT"),C.GetString("HGLON"))
 				reqManager.ExecuteCommand(cmd , "inst_noventa")
 			Next
 		End If
@@ -802,7 +827,7 @@ Sub Subir_Click
 				Dim cmd As DBCommand
 				cmd.Initialize
 				cmd.Name = "insert_face_like_mazapa"
-				cmd.Parameters = Array As Object(C.GetString("HFCLIENTE"),C.GetString("HFALIAS"),C.GetString("HFRUTA"),C.GetString("HFALMACEN"))
+				cmd.Parameters = Array As String(C.GetString("HFCLIENTE"),C.GetString("HFALIAS"),C.GetString("HFRUTA"),C.GetString("HFALMACEN"))
 				reqManager.ExecuteCommand(cmd , "inst_noventa")
 			Next
 		End If
@@ -818,7 +843,7 @@ Sub Subir_Click
 		Dim cmd As DBCommand
 		cmd.Initialize
 		cmd.Name ="insert_drop_mazapa"
-		cmd.Parameters = Array As Object(usuario,l_ruta.Text,sDate & sTime, l_porvisitar.Text,l_drop.Text,l_efectiva.Text,l_cuantosc.Text,l_cuantosn.Text, L_MONTOD.Text,"ENVIO",ALMACEN,Application.VersionName)
+		cmd.Parameters = Array As String(usuario,l_ruta.Text,sDate & sTime, l_porvisitar.Text,l_drop.Text,l_efectiva.Text,l_cuantosc.Text,l_cuantosn.Text, L_MONTOD.Text,"ENVIO",ALMACEN,Application.VersionName)
 		reqManager.ExecuteCommand(cmd , "inst_noventa")
 		img2.Visible =True
 		PORCENTAJE = Round(100/ (cuantos_noventa + cuantos_pedido + cuantos_pedidosc + 1))
@@ -847,7 +872,7 @@ Sub Subir_Click
 				Dim cmd As DBCommand
 				cmd.Initialize
 				cmd.Name = "select_piezas_mazapa"
-				cmd.Parameters = Array As Object(c.GetString("PC_CLIENTE"), ALMACEN,l_ruta.Text)
+				cmd.Parameters = Array As String(c.GetString("PC_CLIENTE"), ALMACEN,l_ruta.Text)
 				userpiezas = c.GetString("PC_CLIENTE")
 				reqManager.ExecuteQuery(cmd , 0, "piezas")
 			Next
@@ -873,7 +898,9 @@ Sub cargar_Click
 			pedidodiaanterior = True
 		End If
 	End If
+	
 	If Not (pedidodiaanterior) Then
+'		Dim rut As Cursor = Starter.skmt.ExecQuery("SELECT RUTA FRO")
 		CARGA = "CARGAR"
 		p_mandaInfo.Width = Root.Width
 		p_mandaInfo.Height = Root.Height
@@ -959,6 +986,17 @@ Sub cargar_Click
 		Dim P As PhoneId
 '	imei = P.GetDeviceId

+		Dim cmd As DBCommand
+		cmd.Initialize
+		cmd.Name = "select_telefono_cedis_MAZAPA"
+		cmd.Parameters = Array As Object(ALMACEN)
+		reqManager.ExecuteQuery(cmd, 0, "tel_cedis")
+		
+		cmd.Initialize
+		cmd.Name = "select_num_nom_user_MAZAPA"
+		cmd.Parameters = Array As Object(usuario)
+		reqManager.ExecuteQuery(cmd , 0, "nom_user")
+
 		cmd.Initialize
 		cmd.Name = "select_marcas_MAZ"
 		cmd.Parameters = Array As Object(usuario)
@@ -2064,6 +2102,22 @@ Sub JobDone(Job As HttpJob)
 				Dim idCliente As String = records(RESULT.Columns.Get("HC_CLIENTE"))
 				Starter.skmt.ExecNonQuery2("INSERT INTO HIST_CUESTIONARIO(HC_CLIENTE) VALUES (?)", Array As Object (idCliente))
 			Next
+		End If		
+
+		If resultado.Tag = "tel_cedis" Then
+			For Each records() As Object In resultado.Rows
+				Dim TTC_TELEFONO As String = records(resultado.Columns.Get("CAT_AL_TELEFONO"))
+				B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As Object ("TEL_CEDIS"))
+				B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("TEL_CEDIS", TTC_TELEFONO))
+			Next
+		End If
+
+		If resultado.Tag = "nom_user" Then
+			For Each records() As Object In resultado.Rows
+				Dim nombre_user As String = records(resultado.Columns.Get("CAT_LO_NOMBRE"))
+				B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As Object ("nom_usuario"))
+				B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("nom_usuario", nombre_user))
+			Next
 		End If
 	End If
 	Job.Release
@@ -2088,6 +2142,8 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 	Else
 		B4XPages.ShowPage("login")
 	End If
+	
+	
 	Return False
 End Sub

@@ -2200,6 +2256,7 @@ Sub t2_tick
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM RUTAA")
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM CLIENTES_NUEVOS")
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENV_MONTO_LIQ")
+	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM TICKET_TEL_CEDIS")
 	bitacora.borraDatosBitacora
 	B4XPage_Appear
 	l_rutasuplencia.Visible = False
--- a/B4A/C_Productos.bas
+++ b/B4A/C_Productos.bas
@@ -1147,13 +1147,7 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In
 				Pnl.SetLayoutAnimated(0,0,0,Pnl.Width,145dip)
 				Private cs As CSBuilder
 				cs.Initialize
-				l_prodX.SetTextSizeAnimated(0, 16)
-				
-				et_pCant.TextColor=Colors.black
-				et_pCant.TextSize = 9dip
-				et_pCantc.TextColor=Colors.black
-				et_pCantc.TextSize = 9dip
-				
+				l_prodX.SetTextSizeAnimated(0, 13)
 				If clv_prods_ll.GetValue(i).As(Map).Get("cant") <> Null And clv_prods_ll.GetValue(i).As(Map).Get("cant") > 0 Then
 					p_prods.Color=0xFFE2EEFF
 					et_pCant.TextColor=Colors.Red
@@ -1322,7 +1316,7 @@ Sub LlenaProdsLL(p As ResultSet)
 '		Log("YA HAY RESULSET")
 	Else
 '		Log("NO HAY RESULSET")
-LogColor(Starter.tabla,Colors.blue)
+		LogColor(Starter.tabla,Colors.blue)
 '		Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD from ${Starter.tabla} where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE"$)

 		Dim marcas As String = ""
@@ -1331,13 +1325,13 @@ LogColor(Starter.tabla,Colors.blue)
 			m.Position = 0
 			marcas = m.GetString("CAT_VA_VALOR")
 		End If
-		Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select distinct CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_DP_CONVERSION1, CAT_DP_PRECIO4, PE_BCAJAS, CAT_DP_CANT_MIN_VENTA from ${Starter.tabla} LEFT JOIN PEDIDO ON CAT_GP_ID = PE_PROID where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_CLASIF <> 'PROMOS' AND CAT_GP_CLASIF IN(${marcas}) AND CAT_GP_CLASIF <> 'ALEN PROMOCIONES' union all Select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_DP_CONVERSION1, CAT_DP_PRECIO4 , PE_BCAJAS, CAT_DP_CANT_MIN_VENTA from ${Starter.tabla} LEFT JOIN PEDIDO ON CAT_GP_ID = PE_PROID where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN = 0 And CAT_GP_CLASIF <> 'PROMOS' AND CAT_GP_CLASIF IN(${marcas}) AND CAT_GP_CLASIF <> 'ALEN PROMOCIONES' and cat_gp_id in (select pe_proid from pedido where pe_cliente in (select cuenta from cuentaa)) order by 2"$) 
+		Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select distinct CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_DP_CONVERSION1, CAT_DP_PRECIO4, PE_BCAJAS, CAT_DP_CANT_MIN_VENTA from ${Starter.tabla} LEFT JOIN PEDIDO ON CAT_GP_ID = PE_PROID where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_CLASIF <> 'PROMOS' AND CAT_GP_CLASIF IN(${marcas}) AND CAT_GP_CLASIF <> 'ALEN PROMOCIONES' union all Select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_DP_CONVERSION1, CAT_DP_PRECIO4 , PE_BCAJAS, CAT_DP_CANT_MIN_VENTA from ${Starter.tabla} LEFT JOIN PEDIDO ON CAT_GP_ID = PE_PROID where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN = 0 And CAT_GP_CLASIF <> 'PROMOS' AND CAT_GP_CLASIF IN(${marcas}) AND CAT_GP_CLASIF <> 'ALEN PROMOCIONES' and cat_gp_id in (select pe_proid from pedido where pe_cliente in (select cuenta from cuentaa)) order by 2"$)
 		
 	End If
 	
 	Do While p.NextRow
 		Private cant As Int = 0
-		If hayPedido And cantsMap.ContainsKey(p.GetString("CAT_GP_ID")) Then 
+		If hayPedido And cantsMap.ContainsKey(p.GetString("CAT_GP_ID")) Then
 			Log(p.GetString("CAT_GP_ID"))
 			cant = cantsMap.Get(p.GetString("CAT_GP_ID"))
 		End If
--- a/B4A/C_Subs.bas
+++ b/B4A/C_Subs.bas
@@ -605,4 +605,7 @@ Sub CheckNotificationAccess As Boolean 'ignore
 	pstr = r.GetStaticField("anywheresoftware.b4a.BA", "packageName")
 	nstr = ph.GetSettings("enabled_notification_listeners")
 	Return nstr.Contains(pstr)
-End Sub
+End Sub
+
+
+
--- a/B4A/Files/cliente.bal
+++ b/B4A/Files/cliente.bal
--- a/B4A/Files/iniciofinventa.bal
+++ b/B4A/Files/iniciofinventa.bal
--- a/B4A/Files/proditem.bal
+++ b/B4A/Files/proditem.bal
--- a/B4A/MAZAPA.b4a
+++ b/B4A/MAZAPA.b4a
--- a/B4A/MAZAPA.b4a.meta
+++ b/B4A/MAZAPA.b4a.meta
@@ -94,6 +94,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=Diseñador Visual,cliente.bal,-100,2,C_Bitacora,cargamosPanel,182,6,C_Cliente,b_cxc_Click,2477,0,C_Cliente,CreateListItem,2496,0,Diseñador Visual,proditem.bal,-100,6,C_Productos,clv_prods_ll_VisibleRangeChanged,1144,3,C_Principal,Subir_Click,812,0,Starter,Service_Destroy,88,0,Main,Globals,24,0,B4XMainPage,et_buspc_TextChanged,966,0
+NavigationStack=C_Cliente,Class_Globals,88,0,C_Cliente,mandaPendientesrecarga,2291,0,C_Cliente,mandaPendientes,2181,0,C_NoVenta,mandaPendientesnoventa,148,0,C_NoVenta,GUARDA_Click,139,0,C_Principal,cargar_Click,897,0,Starter,Process_Globals,16,0,Diseñador Visual,cliente.bal,-100,1,Diseñador Visual,proditem.bal,-100,1,B4XMainPage,i_engrane_Click,889,0,B4XMainPage,Class_Globals,23,0
 SelectedBuild=0
-VisibleModules=29,1,2,14,5,12,6,7,8,15,4
+VisibleModules=29,1,2,14,5,6,18,4,21,15,11
--- a/B4A/Starter.bas
+++ b/B4A/Starter.bas
@@ -20,7 +20,7 @@ Sub Process_Globals
 	Public FLP As FusedLocationProvider
 '	Private flpStarted As Boolean
 	Dim reqManager As DBRequestManager
-	Dim DBReqServer As String = "http://187.189.244.154:1781"
+	Dim DBReqServer As String = "Http://192.99.93.204:1781"
 '	Dim DBReqServer As String = "http://11.0.0.107:1781"
 '	Dim DBReqServer As String = "http://10.0.0.205:1783"
 '	Dim DBReqServer As String = "http://192.168.100.10:1781"