5.08.29 no se subieron los cambios

B4A/C_Cheklist.bas

@@ -790,7 +790,7 @@ Sub JobDone(Job As HttpJob)
 					Next
 				Next
 				Starter.skmt.ExecNonQuery("UPDATE CHECADO_CHECK set CHECADO = 1 ")
-				B4XPages.MainPage.principal.checachek
+'				B4XPages.MainPage.principal.checachek
 			End If
 		End If
 	

B4A/C_DetalleVenta.bas

@@ -142,7 +142,8 @@ Sub B4XPage_Appear
 					End If
 '			Log($"Agregamos prod a lista1 | ${c.GetString("HVD_CANT")} - ${c.GetString("HVD_CANT2")}"$) 'HVD_CANT2 es la original de la orden.
 '			ListView1.AddTwoLines(c.GetString("HVD_PRONOMBRE"),"Cantidad #"& c.GetString("HVD_CANT")& " SubTotal $"& c.GetString("HVD_COSTO_TOT"))
-					clv_pedido.Add(CreateListItem(c.GetString("HVD_PRONOMBRE"), Subs.traePrecio2(c.GetString("HVD_PROID"), c.GetString("HVD_CODPROMO"),c.GetString("CONSECUTIVO")), (c.GetString("HVD_CANT") - c.GetString("HVD_RECHAZOCANT")), c.GetString("HVD_RECHAZOCANT")-cantres , clv_pedido.AsView.Width, 118dip, bmp, c.GetString("HVD_PROID"), bgColor, textColor, c.GetString("HVD_CODPROMO"),Subs.traeCliente,Subs.traeCliente,0,c.GetString("CONSECUTIVO")),i)
+'					clv_pedido.Add(CreateListItem(c.GetString("HVD_PRONOMBRE"), Subs.traePrecio2(c.GetString("HVD_PROID"), c.GetString("HVD_CODPROMO"),c.GetString("CONSECUTIVO")), (c.GetString("HVD_CANT") - c.GetString("HVD_RECHAZOCANT")), c.GetString("HVD_RECHAZOCANT")-cantres , clv_pedido.AsView.Width, 118dip, bmp, c.GetString("HVD_PROID"), bgColor, textColor, c.GetString("HVD_CODPROMO"),Subs.traeCliente,Subs.traeCliente,0,c.GetString("CONSECUTIVO")),i)
+					clv_pedido.Add(CreateListItem(c.GetString("HVD_PRONOMBRE"), (c.GetString("HVD_COSTO_TOT")/c.GetString("HVD_CANT")), (c.GetString("HVD_CANT") - c.GetString("HVD_RECHAZOCANT")), c.GetString("HVD_RECHAZOCANT")-cantres , clv_pedido.AsView.Width, 118dip, bmp, c.GetString("HVD_PROID"), bgColor, textColor, c.GetString("HVD_CODPROMO"),Subs.traeCliente,Subs.traeCliente,0,c.GetString("CONSECUTIVO")),i)
 '				Log(c.GetString("HVD_CODPROMO"))
 				End If
 			Else If c.GetString("BCAJAS") = "1" Then
@@ -1032,7 +1033,7 @@ Sub Printer1_Connected (Success As Boolean)
 		ToastMessageShow("Impresora conectada", False)
 		Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("MACIMP"))
 		Starter.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)
+'		If logger Then LogColor("Impresora conectada", Colors.Green)
 '		B_IMP2.Enabled = True
 		impresoraConectada = True
 	Else
@@ -1047,12 +1048,16 @@ Sub Printer1_Connected (Success As Boolean)
 	End If
 End Sub
 
+Sub Printer1_Error
+	Log("error printer")
+End Sub
+
 Sub Printer_Connected (Success As Boolean)
 	If Success Then
-		B_IMP.Enabled = True
+'		B_IMP.Enabled = True
 		PASA_IMP = "1"
 	Else
-		B_IMP.Enabled = False
+'		B_IMP.Enabled = False
 		If Msgbox2("", "Printer Error","Reprint","Cancel","",Null) = DialogResponse.POSITIVE Then 'ignore
 			StartPrinter
 		End If
@@ -1061,7 +1066,7 @@ End Sub
 
 Sub StartPrinter
 	Dim PairedDevices As Map
-	Dim L As List
+	Dim L1 As List
 	Dim resimp As Int
 	ToastMessageShow("Printing.....",True)
 	PairedDevices.Initialize
@@ -1072,28 +1077,28 @@ Sub StartPrinter
 		printer.Close
 		cmp20.Disconnect
 	End Try
+
 	If PairedDevices.Size = 0 Then
 		Msgbox("Error Connecting to Printer - Printer Not Found","") 'ignore
 		Return
 	End If
+
 	If PairedDevices.Size = 1 Then
 		Try
-			'FLEOS
+			cmp20.Connect(PairedDevices.Get(PairedDevices.GetKeyAt(0)))
-			cmp20.ConnectInsecure(btAdmin,PairedDevices.Get(PairedDevices.GetKeyAt(0)),1)
-			'cmp20.Connect(PairedDevices.Get(PairedDevices.GetKeyAt(0)))
 		Catch
 			Msgbox("Connecting","Printer Error") 'ignore
 			printer.Close
 			cmp20.Disconnect
 		End Try
 	Else
-		L.Initialize
+		L1.Initialize
 		For i = 0 To PairedDevices.Size - 1
-			L.Add(PairedDevices.GetKeyAt(i))
+			L1.Add(PairedDevices.GetKeyAt(i))
 		Next
-		resimp = InputList(L, "Choose device", -1) 'ignore
+		resimp = InputList(L1, "Choose device", -1) 'ignore
 		If resimp <> DialogResponse.CANCEL Then
-			cmp20.Connect(PairedDevices.Get(L.Get(resimp)))
+			cmp20.Connect(PairedDevices.Get(L1.Get(resimp)))
 		End If
 	End If
 End Sub
@@ -1106,31 +1111,59 @@ Private Sub B_IMP_Click
 	sDate=DateTime.Date(DateTime.Now)
 	sTime=DateTime.Time(DateTime.Now)
 	c.Close
+'	ProgressDialogShow("Imprimiendo, un momento ...")
+'	Printer1.DisConnect
+'	If Not(Printer1.IsConnected) Then
+''		Log("Conectando a impresora ...")
+'		Printer1.Connect
+'		Private cont As Int = 0
+'		Do While Not(impresoraConectada)
+'			Sleep(1000)
+''			Log("++++++  " & cont)
+'			cont = cont + 1
+'			If cont = 2 Then Printer1.Connect 'Tratamos de reconectar
+'			If cont > 3 Then impresoraConectada = True
+'		Loop
+'		Sleep(500)
+'		impresoraConectada = False
+'	Else
+''		Log("conectando 2")
+'		Printer1.Connect
+'		Private cont As Int = 0
+'		Do While Not(impresoraConectada) Or Not(Printer1.IsConnected)
+'			Sleep(1000)
+''			Log("******  " & cont)
+'			cont = cont + 1
+'			If cont = 2 Then Printer1.Connect
+'			If cont > 3 Then impresoraConectada = True
+'		Loop
+'		Sleep(500)
+'		impresoraConectada = False
+'	End If
+
 	ProgressDialogShow("Imprimiendo, un momento ...")
 	Printer1.DisConnect
 	If Not(Printer1.IsConnected) Then
-'		Log("Conectando a impresora ...")
+'		If logger Then Log("conectando 1")
 		Printer1.Connect
 		Private cont As Int = 0
 		Do While Not(impresoraConectada)
 			Sleep(1000)
-'			Log("++++++  " & cont)
 			cont = cont + 1
-			If cont = 2 Then Printer1.Connect 'Tratamos de reconectar
+			If cont = 7 Then Printer1.Connect 'Tratamos de reconectar
-			If cont > 3 Then impresoraConectada = True
+			If cont > 15 Then impresoraConectada = True
 		Loop
 		Sleep(500)
 		impresoraConectada = False
 	Else
-'		Log("conectando 2")
+'		If logger Then Log("conectando 2")
 		Printer1.Connect
 		Private cont As Int = 0
 		Do While Not(impresoraConectada) Or Not(Printer1.IsConnected)
 			Sleep(1000)
-'			Log("******  " & cont)
 			cont = cont + 1
 			If cont = 2 Then Printer1.Connect
-			If cont > 3 Then impresoraConectada = True
+			If cont > 4 Then impresoraConectada = True
 		Loop
 		Sleep(500)
 		impresoraConectada = False

B4A/C_Principal.bas

@@ -110,6 +110,32 @@ Sub Class_Globals
 	Private b_multiAlmacen As Button
 	Private multiAlmacen As Boolean = False
 	Private idAlmacenExtra As String = ""
+	
+	
+	Dim btAdmin As BluetoothAdmin
+	Dim cmp20 As Serial
+'	Dim printer As TextWriter
+	Dim TAMANO As Int
+	Dim ESPACIO As Int
+	Dim BLANCO As String
+	Dim Printer1 As EscPosPrinter
+	Dim impresoraConectada As Boolean = False
+	Dim errorImpresora As Int = 0
+	Private inventario As ImageView
+	Dim PASA_IMP As String
+'	Private printer As EscPosPrinter
+	Private impresoraConectada As Boolean = False
+	Dim printer As TextWriter
+	
+	''para la carga --- mover a los demas clientes
+	Dim t8 As Timer
+	Private B_carga As Button
+	Private P_carga As Panel
+	Private L_carga As Label
+	Private PB_carga As ProgressBar
+	Private PB_carga2 As ProgressBar
+	Private l_carga2 As Label
+	'fin carga
 End Sub
 
 'You can add more parameters here.
@@ -178,6 +204,8 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 		reqManager.ExecuteQuery(cmd , 0, "coords_almacen")
 	End If
 	B4XPages.MainPage.usuario=Subs.dameUsuarioDeDB
+	btAdmin.Initialize("BlueTeeth")
+	cmp20.Initialize("Printer")
 End Sub
 
 Sub B4XPage_Appear
@@ -659,7 +687,7 @@ Sub B4XPage_Appear
 	l_rechazo.text = NumberFormat2((rescant + rescant2),0,2,2,False)
 	B4XPages.MainPage.piezas_entregdas = NumberFormat2((pztotal  + pztotal2 + pztotal3 ),0,2,2,False)
 	B4XPages.MainPage.monto_entregadoactual= NumberFormat2((rescant10  + rescant11 + rescant12 ),0,2,2,False)
-'
+	'
 '	B4XPages.MainPage.piezas_entregdas = "0"
 '	B4XPages.MainPage.monto_entregadoactual= "0"
 	
@@ -672,7 +700,7 @@ Sub B4XPage_Appear
 	l_pagarescobrados.Text = NumberFormat2(pagarescobrados.GetDouble("a_abono"),0,2,2,False)
 	pagarescobrados.Close
 	
-	Dim pagaresnuevos As Cursor = Starter.skmt.ExecQuery("SELECT IfNULL(SUM(distinct(PA_MONTO)),0) as PA_MONTO FROM PAGARES")
+	Dim pagaresnuevos As Cursor = Starter.skmt.ExecQuery("SELECT IfNULL(SUM(PA_MONTO),0) as PA_MONTO FROM PAGARES")
 	pagaresnuevos.Position = 0
 	l_pagaresnuevos.Text = NumberFormat2(pagaresnuevos.GetDouble("PA_MONTO"),0,2,2,False)
 	pagaresnuevos.Close
@@ -721,7 +749,24 @@ Sub B4XPage_Appear
 '		StartActivity(MAPA_RUTAS)
 '	End If
 '	checachek
-'cuanto
+	'cuanto
+
+	c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MACIMP"))
+	If c.RowCount > 0 Then
+		c.Position = 0
+		Starter.MAC_IMPRESORA = c.GetString("CAT_VA_VALOR")
+	End If
+	If Starter.MAC_IMPRESORA = "" Then Starter.MAC_IMPRESORA = "0"
+'	Log("|" & Starter.MAC_IMPRESORA & "|")
+	Printer1.Initialize(Me, "Printer1")
+	If Printer1.IsConnected = False Then
+'		Printer1.Connect
+'		Log("1")
+	Else
+		Printer1.DisConnect
+		Printer1.Connect
+		Log("2")
+	End If
 End Sub
 
 Sub checachek
@@ -791,23 +836,23 @@ Sub Subir_Click
 End Sub
 
 Sub envia_reparto
-	c = Starter.skmt.ExecQuery("SELECT NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON, NV_FOTO, NV_REPROGRAMAR FROM NOVENTA")
+'	c = Starter.skmt.ExecQuery("SELECT NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON, NV_FOTO, NV_REPROGRAMAR FROM NOVENTA")
-	D=Starter.skmt.ExecQuery("SELECT COUNT(*) AS CUANTOS_NOVENTA FROM NOVENTA")
+'	D=Starter.skmt.ExecQuery("SELECT COUNT(*) AS CUANTOS_NOVENTA FROM NOVENTA")
-	If c.RowCount>0 Then
+'	If c.RowCount>0 Then
-		For i=0 To c.RowCount -1
+'		For i=0 To c.RowCount -1
-			c.Position=i
+'			c.Position=i
-			foto1 = c.GetBlob("NV_FOTO")
+'			foto1 = c.GetBlob("NV_FOTO")
-			Dim cmd As DBCommand
+'			Dim cmd As DBCommand
-			cmd.Initialize
+'			cmd.Initialize
-			cmd.Name = "insert_reparto_REPG_GUNA_VN"
+'			cmd.Name = "insert_reparto_REPG_GUNA_VN"
-			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, l_ruta.Text, C.GetString("NV_REPROGRAMAR"))
+'			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, l_ruta.Text, C.GetString("NV_REPROGRAMAR"))
-			reqManager.ExecuteCommand(cmd ,  "inst_noventa_")
+'			reqManager.ExecuteCommand(cmd ,  "inst_noventa_")
-		Next
+'		Next
-		c.Close
+'		c.Close
-	End If
+'	End If
-	d.Position=0
+'	d.Position=0
-	cuantos_noventa = D.GetString("CUANTOS_NOVENTA")
+'	cuantos_noventa = D.GetString("CUANTOS_NOVENTA")
-	d.Close
+'	d.Close
 End Sub
 
 Sub envioinfo
@@ -863,18 +908,19 @@ Sub envioinfo
 	'ABONOS
 	d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA")
 	d.Position = 0
-	Dim ab As Cursor = Starter.skmt.ExecQuery($"SELECT * from ABONOS where a_enviado is null"$)
+	Dim ab As Cursor = Starter.skmt.ExecQuery($"SELECT * from ABONOS where a_enviado is null and a_tipoabono IS NULL"$)
 	Log(ab.RowCount)
 	If ab.RowCount > 0 Then
 		For i=0 To ab.RowCount -1
 			ab.Position = i
-			Dim ab1 As Cursor = Starter.skmt.ExecQuery($"SELECT SUM(a_abono) AS a_abono from ABONOS where a_cliente = '${ab.GetString("a_cliente")}' and a_tipoabono IS NULL"$)
+'			Dim ab1 As Cursor = Starter.skmt.ExecQuery($"SELECT SUM(a_abono) AS a_abono from ABONOS where a_cliente = '${ab.GetString("a_cliente")}' and a_tipoabono IS NULL"$)
+			Dim ab1 As Cursor = Starter.skmt.ExecQuery($"SELECT a_abono from ABONOS where a_cliente = '${ab.GetString("a_cliente")}' and a_tipoabono IS NULL"$)
 			ab1.Position = 0
 
 			Dim cmd As DBCommand
 			cmd.Initialize
-			cmd.Name = "insert_abono_REP_GUNA_VN"
+			cmd.Name = "insert_abono_REP_GUNA_VN2"
-			cmd.Parameters = Array As Object( ab.GetString("a_usuario"), ab.GetString("a_ruta"), ab.GetString("a_cliente"), ab1.GetString("a_abono"), ab.GetString("a_fecha"),ALMACEN,"REPARTO",d.GetString("RUTAA") )
+			cmd.Parameters = Array As Object( ab.GetString("a_usuario"), ab.GetString("a_ruta"), ab.GetString("a_cliente"), ab.GetString("a_abono"), ab.GetString("a_fecha"),ALMACEN,"REPARTO",d.GetString("RUTAA"), "", ab.GetString("TIPO_PAGO"),ab.GetString("a_ticket"),ab.GetString("a_numpago"))
 			reqManager.ExecuteCommand(cmd , $"ins_abonosPendientes_${ab.GetString("a_cliente")}"$)
 			ab1.Close
 			Log($"ins_abonosPendientes_${ab.GetString("a_cliente")}"$)
@@ -887,18 +933,19 @@ Sub envioinfo
 	'ABONOS NUEVOS
 	d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA")
 	d.Position = 0
-	Dim ab As Cursor = Starter.skmt.ExecQuery($"SELECT * from ABONOS where a_enviado is null"$)
+	Dim ab As Cursor = Starter.skmt.ExecQuery($"SELECT * from ABONOS where a_enviado is null and a_tipoabono IS NOT NULL"$)
 	Log(ab.RowCount)
 	If ab.RowCount > 0 Then
 		For i=0 To ab.RowCount -1
 			ab.Position = i
-			Dim ab1 As Cursor = Starter.skmt.ExecQuery($"SELECT SUM(a_abono) AS a_abono from ABONOS where a_cliente = '${ab.GetString("a_cliente")}' and a_tipoabono IS NOT NULL"$)
+'			Dim ab1 As Cursor = Starter.skmt.ExecQuery($"SELECT SUM(a_abono) AS a_abono from ABONOS where a_cliente = '${ab.GetString("a_cliente")}' and a_tipoabono IS NOT NULL"$)
+			Dim ab1 As Cursor = Starter.skmt.ExecQuery($"SELECT a_abono from ABONOS where a_cliente = '${ab.GetString("a_cliente")}' and a_tipoabono IS NOT NULL"$)
 			ab1.Position = 0
 
 			Dim cmd As DBCommand
 			cmd.Initialize
-			cmd.Name = "insert_abono_REP_GUNA_VN"
+			cmd.Name = "insert_abono_REP_GUNA_VN2"
-			cmd.Parameters = Array As Object( ab.GetString("a_usuario"), ab.GetString("a_ruta"), ab.GetString("a_cliente"), ab1.GetString("a_abono"), ab.GetString("a_fecha"),ALMACEN,"REPARTO",d.GetString("RUTAA") )
+			cmd.Parameters = Array As Object( ab.GetString("a_usuario"), ab.GetString("a_ruta"), ab.GetString("a_cliente"), ab.GetString("a_abono"), ab.GetString("a_fecha"),ALMACEN,"REPARTO",d.GetString("RUTAA"), "1", ab.GetString("TIPO_PAGO"),ab.GetString("a_ticket"),ab.GetString("a_numpago") )
 			reqManager.ExecuteCommand(cmd , $"ins_abonosPendientes_${ab.GetString("a_cliente")}"$)
 			ab1.Close
 			Log($"ins_abonosPendientes_${ab.GetString("a_cliente")}"$)
@@ -971,6 +1018,8 @@ Sub envioinfo
 	End If
 	'FIN TABULADOR
 	
+	
+	
 	c = Starter.skmt.ExecQuery("SELECT IFNULL(HVD_RECHAZOCANT,0) AS HVD_RECHAZOCANT, HVD_CLIENTE, HVD_PROID, HVD_FECHA, HVD_CODPROMO, HVD_NUM_TICKET, HVD_CANT, CONSECUTIVO, BCAJAS, CANTC FROM HIST_VENTAS where HVD_PRONOMBRE  <> 'Cobranza Pendiente'")
 	If c.RowCount > 0 Then
 		For i=0 To c.RowCount -1
@@ -1045,6 +1094,13 @@ Sub cargar_Click
 		End If
 	End If
 	If Not (pedidodiaanterior) Then
+'		P_carga.Visible = True
+		P_carga.Width = Root.Width
+		P_carga.Height = Root.Height
+		l_carga2.Text = "CARGANDO"
+		L_carga.Text = "CARGANDO"
+		PB_carga2.Progress = 0
+		PB_carga.Progress = 0
 		Log("CUMPLE")
 		EJECUTANDO = 1
 		reqs.Initialize
@@ -1168,10 +1224,18 @@ Sub cargaGeneral
 	Log($"Pedimos gunaprod - ${ALMACEN}, ${e_ruta.text}"$)
 	reqs.Add("gunaprod")
 
-	cmd.Initialize
+	If ALMACEN = "81" Then
-	cmd.Name = "select_abonosp_REP_GUNA_VN"
+		
-	cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, ALMACEN)
+		cmd.Initialize
-	reqManager.ExecuteQuery(cmd , 0, "select_abonosp")
+		cmd.Name = "select_abonosp_REP_GUNA_VN2"
+		cmd.Parameters = Array As Object(ALMACEN, e_ruta.text)
+		reqManager.ExecuteQuery(cmd , 0, "select_abonosp")
+	Else
+		cmd.Initialize
+		cmd.Name = "select_abonosp_REP_GUNA_VN"
+		cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, ALMACEN)
+		reqManager.ExecuteQuery(cmd , 0, "select_abonosp")
+	End If
 
 	cmd.Initialize
 	cmd.Name = "select_cliente_re_REPG_GUNA_VN"
@@ -1180,6 +1244,14 @@ Sub cargaGeneral
 	Log($"Pedimos kmt_datos - ruta: ${e_ruta.text}, almacen: ${ALMACEN}"$)
 	reqs.Add("kmt_datos")
 	
+	
+'	cmd.Initialize
+'	cmd.Name = "select_cliente_fotos_re_REPG_GUNA_VN"
+'	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN,e_ruta.text, ALMACEN,e_ruta.Text,ALMACEN,ALMACEN)',e_ruta.Text,ALMACEN
+'	reqManager.ExecuteQuery(cmd , 0, "kmt_datos_fotos")
+	''	Log($"Pedimos kmt_datos_fotos - ruta: ${e_ruta.text}, almacen: ${ALMACEN}"$)
+	''	reqs.Add("kmt_datos_fotos")
+
 	cmd.Initialize
 	cmd.Name = "select_ventad2_re_REPG_GUNA_VN"
 	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.Text,ALMACEN)',e_ruta.Text,ALMACEN
@@ -1230,9 +1302,11 @@ Sub JobDone(Job As HttpJob)
 					Dim CAT_CL_LAT As String = records(result.Columns.Get("CAT_CL_LAT"))
 					Dim CAT_CL_BCREDITO As String = records(result.Columns.Get("CAT_CL_BCREDITO"))
 					Dim CAT_CL_LIMITECREDITO As String = records(result.Columns.Get("CAT_CL_LIMITECREDITO"))
+					Dim CAT_CL_SALDODISPONIBLE As String = records(result.Columns.Get("CAT_CL_SALDODISPONIBLE"))
+					Dim CAT_CL_DIASCREDITO As String = records(result.Columns.Get("CAT_CL_DIASCREDITO"))
 '					Dim CAT_CL_SECUENCIA As String = records(result.Columns.Get("CAT_CL_SECUENCIA"))
-					Log("  ++  insert into kmt_info: "&ALMACEN&","&CAT_CL_CODIGO&","&CAT_CL_RUTA&","&CAT_CL_NOMBRE)
+'					Log("  ++  insert into kmt_info: "&ALMACEN&","&CAT_CL_CODIGO&","&CAT_CL_RUTA&","&CAT_CL_NOMBRE)
-					Starter.skmt.ExecNonQuery2("INSERT INTO kmt_info(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_BCREDITO, gestion,CAT_CL_LIMITECREDITO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?)", Array As Object (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_BCREDITO,CAT_CL_LIMITECREDITO))
+					Starter.skmt.ExecNonQuery2("INSERT INTO kmt_info(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_BCREDITO, gestion,CAT_CL_LIMITECREDITO,CAT_CL_SALDODISPONIBLE,CAT_CL_DIASCREDITO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?)", Array As Object (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_BCREDITO,CAT_CL_LIMITECREDITO,CAT_CL_SALDODISPONIBLE,CAT_CL_DIASCREDITO))
 				Next
 '				Starter.skmt.ExecNonQuery2("INSERT INTO kmt_info(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_BCREDITO, gestion,SECUENCIA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?)", Array As Object (63403,1000, "VENTA RECHAZO","","","","","","","","","","","","","","-98.8357694","19.6906052","0","1"))
 '				End If
@@ -1257,8 +1331,22 @@ Sub JobDone(Job As HttpJob)
 					Dim CLIENTE As String = records(result.Columns.Get("CLIENTE"))
 					Dim SALDO_PENDIENTE As String = records(result.Columns.Get("SALDO_PENDIENTE"))
 					Dim NOMBRE As String = records(result.Columns.Get("NOMBRE"))
+					Dim FECHAPREVENTA As String = records(result.Columns.Get("FECHA_PREVENTA"))
 '					Dim DIA_VENCIMIENTO As String = records(result.Columns.Get("DIA_VENCIMIENTO"))
-					Starter.skmt.ExecNonQuery2("INSERT INTO ABONOSP(NOTA,CLIENTE,SALDO_PENDIENTE,NOMBRE) VALUES (?,?,?,?)", Array As Object (NOTA, CLIENTE,SALDO_PENDIENTE,NOMBRE))
+					Starter.skmt.ExecNonQuery2("INSERT INTO ABONOSP(NOTA,CLIENTE,SALDO_PENDIENTE,NOMBRE,FECHA_PREVENTA) VALUES (?,?,?,?,?)", Array As Object (NOTA, CLIENTE,SALDO_PENDIENTE,NOMBRE,FECHAPREVENTA))
+				Next
+			End If
+		End If
+		
+		
+		If Job.JobName = "DBRequest" Then
+			Dim result As DBResult = reqManager.HandleJob(Job)
+			If result.Tag = "kmt_datos_fotos" Then 'query tag
+				Starter.skmt.ExecNonQuery("DELETE FROM FOTOS")
+				For Each records() As Object In result.Rows
+					Dim CAT_CL_FOTO() As Byte = records(result.Columns.Get("CAT_CL_FOTO"))
+					Dim CLIENTE1 As String = records(result.Columns.Get("CAT_CL_CODIGO"))
+					Starter.skmt.ExecNonQuery2("INSERT INTO FOTOS(foto,CLIENTE) VALUES (?,?)", Array As Object (CAT_CL_FOTO, CLIENTE1))
 				Next
 			End If
 		End If
@@ -1487,12 +1575,12 @@ Sub JobDone(Job As HttpJob)
 '					Log("  ++  insert into HIST_VENTAS: "&HVD_CLIENTE&","&HVD_PRONOMBRE&","&HVD_CANT)
 					consecutivo = consecutivo +1
 					If l_ruta.Text = "0" Then 'Si no hay ruta cargada, guardamos todos los clientes
-						Log("No hay ruta, guardamos todos")
+'						Log("No hay ruta, guardamos todos")
 						Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE, HVD_PRONOMBRE, HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, bcajas,cantc,consecutivo,bcajas,cantc))
 						Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS2(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL) VALUES (?,?,?,?,?,?,?,?,?,?,0,0)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO))
 					Else 'Si ya hay ruta cargada, solo guardamos los clientes nuevos.
 '						Log("Hay ruta, guardamos los nuevos")
-						Private tc As Cursor = Starter.skmt.ExecQuery($"select HVD_CLIENTE from HIST_VENTAS where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PROID = '${HVD_PROID}'"$)
+						Private tc As Cursor = Starter.skmt.ExecQuery($"select HVD_CLIENTE from HIST_VENTAS where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PROID = '${HVD_PROID}' AND HVD_CANT = '${HVD_CANT}' AND HVD_CODPROMO = '${HVD_CODPROMO}'"$)
 						If tc.RowCount = 0 Then
 '							Log($"Guardamos ${HVD_CLIENTE}"$)
 							Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, bcajas,cantc,consecutivo,bcajas,cantc))
@@ -1523,6 +1611,46 @@ Sub JobDone(Job As HttpJob)
 					img2.Visible = False
 					EJECUTANDO = 0
 				End If
+				''para la carga --- mover a los demas clientes
+				t8.Initialize("t8", 15000) ' 1000 = 1 second
+				t8.Enabled = True
+				'fin carga
+			End If
+		End If
+		
+		If Job.JobName = "DBRequest" Then
+			Dim result As DBResult = reqManager.HandleJob(Job)
+			If result.Tag = "CONTEO_DATOS" Then 'query tag
+				For Each records() As Object In result.Rows
+					Dim DETALLE As String = records(result.Columns.Get("REGISTROS"))
+					Dim CLIENTES1 As String = records(result.Columns.Get("CLIENTES"))
+					
+					
+				Next
+				
+				Dim CLIENTES As Cursor = Starter.skmt.ExecQuery("select count(*) as clientes from kmt_info")
+				CLIENTES.Position = 0
+	
+				Dim detalleventa As Cursor = Starter.skmt.ExecQuery("select count(*) as detalle from hist_ventas")
+				detalleventa.Position = 0
+				
+				If CLIENTES.GetString("clientes") = CLIENTES1 Then
+					PB_carga2.Progress = 100
+					l_carga2.Text = "LISTO"
+				Else
+'					cargar_Click
+				End If
+	
+				If detalleventa.GetString("detalle") = DETALLE Then
+					PB_carga.Progress = 100
+					L_carga.Text = "LISTO"
+				Else
+'					cargar_Click
+				End If
+				
+				CLIENTES.Close
+				detalleventa.Close
+				
 			End If
 		End If
 
@@ -1743,6 +1871,61 @@ Sub JobDone(Job As HttpJob)
 	End If
 End Sub
 
+''para la carga --- mover a los demas clientes
+Sub t8_tick
+	cmd.Initialize
+	cmd.Name = "select_conteo_GUNA"
+	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+	reqManager.ExecuteQuery(cmd , 0, "CONTEO_DATOS")
+	l_carga2.Text = "VALIDANDO"
+	L_carga.Text = "VALIDANDO"
+	PB_carga2.Progress = 50
+	PB_carga.Progress = 50
+	t8.Enabled = False
+End Sub
+
+Private Sub P_carga_Click
+	
+End Sub
+
+Private Sub B_carga_Click
+	If L_carga.Text = "LISTO" And l_carga2.Text = "LISTO" Then
+		P_carga.Visible = False
+	Else
+		Dim checagestion As Cursor = Starter.skmt.ExecQuery("SELECT * FROM kmt_info WHERE gestion <> 0")
+		If checagestion.RowCount = 0 Then
+			P_carga.Visible = False
+			e_ruta.Text = ""
+			Starter.skmt.ExecNonQuery("delete from PICK_CIEGO")
+			Starter.skmt.ExecNonQuery("delete from pedido_cliente")
+			Starter.skmt.ExecNonQuery("delete from PAGARES")
+			Starter.skmt.ExecNonQuery("delete from CHECADO_CHECK")
+			Starter.skmt.ExecNonQuery("delete from CHECKLIST2")
+			Starter.skmt.ExecNonQuery("delete from pedido")
+			Starter.skmt.ExecNonQuery("delete from noventa")
+			Starter.skmt.ExecNonQuery("delete from clie_act")
+			Starter.skmt.ExecNonQuery("delete from kmt_info")
+			Starter.skmt.ExecNonQuery("delete from cat_gunaprod")
+			Starter.skmt.ExecNonQuery("delete from cat_gunaprod3")
+			Starter.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ")
+			Starter.skmt.ExecNonQuery("delete from HIST_VENTAS")
+			Starter.skmt.ExecNonQuery("delete from REPARTO")
+			Starter.skmt.ExecNonQuery("DELETE FROM TABULADOR_MONEDAS")
+			Starter.skmt.ExecNonQuery("DELETE FROM TABULADOR_BILLETES")
+			Starter.skmt.ExecNonQuery("DELETE FROM RUTAA")
+			Starter.skmt.ExecNonQuery("DELETE FROM ABONOSP")
+			Starter.skmt.ExecNonQuery("DELETE FROM ABONOS")
+			Starter.skmt.ExecNonQuery("DELETE FROM BLOCKENVIO")
+			B4XPage_Appear
+			MsgboxAsync("No se cargo bien la informacion, favor de cargar día nuevamente","Atención")
+		Else
+			MsgboxAsync("No se cargo bien la informacion, favor de cargar día nuevamente","Atención")
+			P_carga.Visible = False
+		End If
+	End If
+End Sub
+'fin carga
+
 Private Sub B4XPage_CloseRequest As ResumableSub
 	' BACK key pressed
 	If Panel1.visible Then
@@ -2110,6 +2293,7 @@ End Sub
 
 Private Sub ListView1_ItemClick (Position As Int, Value As Object)
 '	Log(Value)
+	B_REGRESA_Click
 	Dim clieasing() As String = Regex.Split(" ", Value)
 	Log(clieasing(0))
 	Starter.skmt.ExecNonQuery("delete from CUENTAA")
@@ -2243,7 +2427,7 @@ Private Sub B_PAGARES_Click
 	label1 = ListView2.TwoLinesLayout.Label
 	label1.TextSize = 16
 	label1.Height = 45dip
- '	label1.
+	'	label1.
 	label1.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD)
 	label1.TextColor = Colors.White
 	Dim label2 As Label
@@ -2262,7 +2446,7 @@ Private Sub B_PAGARES_Click
 '			ListView2.AddSingleLine(itemText)
 		Next
 '	Else
-''		ListView2.AddSingleLine("No hay datos disponibles.")
+		''		ListView2.AddSingleLine("No hay datos disponibles.")
 '		ListView2.AddTwoLines("No hay datos disponibles.","")
 	End If
 	g6.Close
@@ -2455,3 +2639,226 @@ Sub cargaAlmacen2
 	et_ruta2.Text = ""
 	cargar.Enabled = True
 End Sub
+
+Private Sub inventario_Click
+	
+'	ProgressDialogShow("Imprimiendo, un momento ...")
+'	Printer1.DisConnect
+'	If Not(Printer1.IsConnected) Then
+	''		Log("Conectando a impresora ...")
+'		Printer1.Connect
+'		Private cont As Int = 0
+'		Do While Not(impresoraConectada)
+'			Sleep(1000)
+	''			Log("++++++  " & cont)
+'			cont = cont + 1
+'			If cont = 2 Then Printer1.Connect 'Tratamos de reconectar
+'			If cont > 3 Then impresoraConectada = True
+'		Loop
+'		Sleep(500)
+'		impresoraConectada = False
+'	Else
+	''		Log("conectando 2")
+'		Printer1.Connect
+'		Private cont As Int = 0
+'		Do While Not(impresoraConectada) Or Not(Printer1.IsConnected)
+'			Sleep(1000)
+	''			Log("******  " & cont)
+'			cont = cont + 1
+'			If cont = 2 Then Printer1.Connect
+'			If cont > 3 Then impresoraConectada = True
+'		Loop
+'		Sleep(500)
+'		impresoraConectada = False
+'	End If
+
+	ProgressDialogShow("Imprimiendo, un momento ...")
+	Printer1.DisConnect
+	If Not(Printer1.IsConnected) Then
+'		If logger Then Log("conectando 1")
+		Printer1.Connect
+		Private cont As Int = 0
+		Do While Not(impresoraConectada)
+			Sleep(1000)
+			cont = cont + 1
+			If cont = 7 Then Printer1.Connect 'Tratamos de reconectar
+			If cont > 15 Then impresoraConectada = True
+		Loop
+		Sleep(500)
+		impresoraConectada = False
+	Else
+'		If logger Then Log("conectando 2")
+		Printer1.Connect
+		Private cont As Int = 0
+		Do While Not(impresoraConectada) Or Not(Printer1.IsConnected)
+			Sleep(1000)
+			cont = cont + 1
+			If cont = 2 Then Printer1.Connect
+			If cont > 4 Then impresoraConectada = True
+		Loop
+		Sleep(500)
+		impresoraConectada = False
+	End If
+	
+	TAMANO = 0
+	ESPACIO = 28
+	BLANCO = " "
+	Dim bmp As Bitmap
+	Printer1.Justify= 1
+	bmp.InitializeResize(File.DirAssets, "inventarios.jpg", 92, 92, True) 'ignore
+	Dim myimage As AnImage = Printer1.ImageToBWIMage(bmp)
+	myimage = Printer1.DitherImage2D(myimage, 128)
+	myimage= Printer1.PackImage(myimage)
+	Printer1.WriteString(CRLF) ' nudge the printer to show the user something is happening
+	Printer1.WriteString(CRLF) ' nudge the printer to show the user something is happening
+	Printer1.WriteString(Printer1.REVERSE)
+	Printer1.PrintImage(myimage)
+	Printer1.WriteString(Printer1.UNREVERSE)
+	Printer1.WriteString(" " & CRLF)
+	Private c As Cursor = Starter.skmt.ExecQuery("select HVD_PRONOMBRE, IFNULL(SUM(HVD_CANT), 0) AS HVD_CANT, HVD_PROID from HIST_VENTAS WHERE HVD_PRONOMBRE <> 'Cobranza Pendiente' and HVD_PROID <> HVD_CODPROMO GROUP BY HVD_PROID order by HVD_PRONOMBRE asc")
+	lv_prod_Prin.SingleLineLayout.Label.TextColor = Colors.White
+	lv_prod_Prin.Clear
+	Printer1.Justify = 0
+	Dim sDate, sTime As String
+	DateTime.DateFormat = "dd/MM/yyyy"
+	DateTime.TimeFormat = "HH:mm:ss"
+	sDate = DateTime.Date(DateTime.Now)
+	sTime = DateTime.Time(DateTime.Now)
+	Printer1.WriteString("Fecha: " &sDate & CRLF)
+	Printer1.WriteString("Hora: " &sTime & CRLF)
+	Printer1.WriteString("Ruta: " & l_ruta.Text & CRLF)
+	Printer1.WriteString("Usuario: " & Subs.dameUsuarioDeDB & CRLF)
+'	Printer1.WriteString("----------INVENTARIO----------" &  CRLF)
+	Printer1.WriteString("--------------------------------" &  CRLF)
+	If c.RowCount > 0 Then
+		For i = 0 To c.RowCount - 1
+			c.Position = i
+			
+			Printer1.WriteString("-----------INVENTARIO-----------" &  CRLF)
+			Printer1.WriteString("--------------------------------" &  CRLF)
+			Printer1.WriteString("Cant.      Producto" &  CRLF)
+			Printer1.WriteString("------------------------------" &  CRLF)
+			For i=0 To c.RowCount -1
+				c.Position=i
+				
+				
+				Printer1.Justify = 0
+				Printer1.WriteString( (c.GetString("HVD_CANT"))&"- ")
+				Printer1.Justify = 0
+				Dim firstChar As String = c.GetString("HVD_PRONOMBRE").SubString2(0, 1) ' Obtiene el primer carácter
+				Dim productoinven As String
+
+				' Verificar si el primer carácter es un número
+				If Asc(firstChar) >= Asc("0") And Asc(firstChar) <= Asc("9") Then
+					' Es un número - tomar a partir del 4to carácter
+					productoinven = c.GetString("HVD_PRONOMBRE").SubString(4)
+				Else
+'					Es una letra u otro carácter - tomar completo
+					productoinven = c.GetString("HVD_PRONOMBRE")
+				End If
+
+				Log(productoinven)
+				Printer1.WriteString(productoinven)
+				Printer1.WriteString(" " &  CRLF)
+				Printer1.WriteString(" " & CRLF)
+				
+				
+			Next
+			
+		Next
+	End If
+	c.Close
+	
+	Dim sumainv As Cursor = Starter.skmt.ExecQuery("SELECT SUM(HVD_CANT) AS CANTIDAD FROM HIST_VENTAS WHERE HVD_CODPROMO <> HVD_PROID")
+	sumainv.Position = 0
+	
+	Printer1.WriteString("------------------------------" &  CRLF)
+	Printer1.WriteString("Total piezas: " & sumainv.GetString("CANTIDAD")&  CRLF)
+	Printer1.WriteString("------------------------------" &  CRLF)
+	Printer1.Justify = 0
+	Printer1.WriteString(" " &  CRLF)
+	Printer1.WriteString(" " &  CRLF)
+	Printer1.WriteString(" " &  CRLF)
+	Printer1.WriteString(" " &  CRLF)
+	Sleep(1000)
+	Printer1.DisConnect
+	ProgressDialogHide
+	
+	
+End Sub
+
+Sub Printer1_Connected (Success As Boolean)
+'	If Logger Then Log("Printer1_Connected")
+	If Success Then
+		ToastMessageShow("Impresora conectada", False)
+		Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("MACIMP"))
+		Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("MACIMP",Starter.mac_impresora))
+'		If logger Then LogColor("Impresora conectada", Colors.Green)
+'		B_IMP2.Enabled = True
+		impresoraConectada = True
+	Else
+'		Msgbox(Printer1.ConnectedErrorMsg, "Error connecting.") 'ignore
+'		ToastMessageShow("Error conectando la impresora", False)
+		LogColor("Error conectando la impresora", Colors.Red)
+		errorImpresora = errorImpresora + 1
+		If errorImpresora > 1 Then
+			Starter.MAC_IMPRESORA = "0"
+			errorImpresora = 0
+		End If
+	End If
+End Sub
+
+Sub Printer1_Error
+	Log("error printer")
+End Sub
+
+Sub Printer_Connected (Success As Boolean)
+	If Success Then
+'		B_IMP.Enabled = True
+		PASA_IMP = "1"
+	Else
+'		B_IMP.Enabled = False
+		If Msgbox2("", "Printer Error","Reprint","Cancel","",Null) = DialogResponse.POSITIVE Then 'ignore
+			StartPrinter
+		End If
+	End If
+End Sub
+
+Sub StartPrinter
+	Dim PairedDevices As Map
+	Dim L1 As List
+	Dim resimp As Int
+	ToastMessageShow("Printing.....",True)
+	PairedDevices.Initialize
+	Try
+		PairedDevices = cmp20.GetPairedDevices
+	Catch
+		Msgbox("Getting Paired Devices","Printer Error") 'ignore
+		printer.Close
+		cmp20.Disconnect
+	End Try
+
+	If PairedDevices.Size = 0 Then
+		Msgbox("Error Connecting to Printer - Printer Not Found","") 'ignore
+		Return
+	End If
+
+	If PairedDevices.Size = 1 Then
+		Try
+			cmp20.Connect(PairedDevices.Get(PairedDevices.GetKeyAt(0)))
+		Catch
+			Msgbox("Connecting","Printer Error") 'ignore
+			printer.Close
+			cmp20.Disconnect
+		End Try
+	Else
+		L1.Initialize
+		For i = 0 To PairedDevices.Size - 1
+			L1.Add(PairedDevices.GetKeyAt(i))
+		Next
+		resimp = InputList(L1, "Choose device", -1) 'ignore
+		If resimp <> DialogResponse.CANCEL Then
+			cmp20.Connect(PairedDevices.Get(L1.Get(resimp)))
+		End If
+	End If
+End Sub

B4A/MAPA_RUTAS.bas

@@ -161,11 +161,37 @@ Sub MapFragment1_Ready
 '			If esteAzul = 4 Then esteAzul2= NumSerie&"marker-azul3.png"
 '			If esteAzul = 5 Then esteAzul2= NumSerie&"marker-azul4.png"
 			
-			If esteAzul = 1 Then esteAzul2= "marker-azul.png"
+			Dim pedidos As Cursor = Starter.skmt.ExecQuery2("select * from HIST_VENTAS WHERE HVD_CLIENTE = ?", Array As String(c.GetString("CAT_CL_CODIGO")))
-			If esteAzul = 2 Then esteAzul2= "marker-azul1.png"
+			Log(c.GetString("CAT_CL_CODIGO")&"   "& pedidos.RowCount)
-			If esteAzul = 3 Then esteAzul2= "marker-azul2.png"
+			If pedidos.RowCount > 1 Then
-			If esteAzul = 4 Then esteAzul2= "marker-azul3.png"
+				
-			If esteAzul = 5 Then esteAzul2= "marker-azul4.png"
+				If esteAzul = 1 Then esteAzul2= "marker-azul.png"
+				If esteAzul = 2 Then esteAzul2= "marker-azul1.png"
+				If esteAzul = 3 Then esteAzul2= "marker-azul2.png"
+				If esteAzul = 4 Then esteAzul2= "marker-azul3.png"
+				If esteAzul = 5 Then esteAzul2= "marker-azul4.png"
+				If esteAzul = 6 Then esteAzul2= "marker-azul1.png"
+			
+			Else If pedidos.RowCount = 1 Then
+				
+				pedidos.Position = 0 
+				If pedidos.GetString("HVD_PRONOMBRE") = "Cobranza Pendiente" Then
+					If esteAzul = 1 Then esteAzul2= "marker-amarillo.png"
+					If esteAzul = 2 Then esteAzul2= "marker-amarillo.png"
+					If esteAzul = 3 Then esteAzul2= "marker-amarillo.png"
+					If esteAzul = 4 Then esteAzul2= "marker-amarillo.png"
+					If esteAzul = 5 Then esteAzul2= "marker-amarillo.png"
+					If esteAzul = 6 Then esteAzul2= "marker-amarillo.png"
+				Else 
+					If esteAzul = 1 Then esteAzul2= "marker-azul.png"
+					If esteAzul = 2 Then esteAzul2= "marker-azul1.png"
+					If esteAzul = 3 Then esteAzul2= "marker-azul2.png"
+					If esteAzul = 4 Then esteAzul2= "marker-azul3.png"
+					If esteAzul = 5 Then esteAzul2= "marker-azul4.png"
+					If esteAzul = 6 Then esteAzul2= "marker-azul1.png"
+				End If
+				
+			End If
 '			MARK_VERDE = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO, Subs.CreateBitmapWithNumber(LoadBitmap(File.DirAssets, "marker-verde.png"), i+350))
 
 '			Log(ruta & "|" & esteAzul & "|" & esteAzul2)

B4A/Starter.bas

@@ -33,8 +33,8 @@ Sub Process_Globals
 	Public SharedFolder As String 'Para actualizar apk
 	Dim cedisLocation As Location
 	Dim reqManager As DBRequestManager
-	Dim server As String = "http://187.189.244.154:1782"
+'	Dim server As String = "http://187.189.244.154:1782"
-'	Dim server As String = "http://192.168.100.10:1781"
+	Dim server As String = "http://keymon.net:1782"
 '	Dim server As String = "http://keymon.lat:9000"
 '	Dim server = "http://192.168.100.10:1781"
 	Dim muestraProgreso = 0
@@ -113,7 +113,7 @@ Sub ENVIA_ULTIMA_GPS
 		skmt.Initialize(ruta,"kmt.db", True)
 '		Log("server: "&Main.server)
 		skmt.Initialize(ruta,"kmt.db", True)
-		If B4XPages.MainPage.logger Then LogColor("Iniciamos ENVIA_ULTIMA_GPS", Colors.red)
+'		If B4XPages.MainPage.logger Then LogColor("Iniciamos ENVIA_ULTIMA_GPS", Colors.red)
 		DateTime.TimeFormat = "HHmmss"
 		B4XPages.MainPage.ultimaActualizacionGPS = DateTime.Time(DateTime.Now)
 		cmd.Initialize
@@ -125,7 +125,8 @@ Sub ENVIA_ULTIMA_GPS
 		cmd.Name = "UPDATE_ACTUAL_GPS_GUNA_VN"
 '		cmd.Parameters = Array As Object(B4XPages.MainPage.clientesvisitados, B4XPages.MainPage.clientestotal, B4XPages.MainPage.clientesventa, B4XPages.MainPage.montoRechazado, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, B4XPages.MainPage.batt, B4XPages.MainPage.montoEntregado, B4XPages.MainPage.montoRechazado,B4XPages.MainPage.clientestotal, B4XPages.MainPage.porVisitar, B4XPages.MainPage.entregas, B4XPages.MainPage.rechazos, B4XPages.MainPage.ALMACEN, B4XPages.MainPage.rutapreventa )
 		cmd.Parameters = Array As String(B4XPages.MainPage.montoActual,B4XPages.MainPage.montoRechazado,B4XPages.MainPage.monto_entregadoactual,B4XPages.MainPage.piezas_entregdas, B4XPages.MainPage.clientestotal,B4XPages.MainPage.entregas, B4XPages.MainPage.rechazos, (B4XPages.MainPage.rechazos + B4XPages.MainPage.entregas), B4XPages.MainPage.porVisitar,  B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, B4XPages.MainPage.batt,Application.VersionName,B4XPages.MainPage.ALMACEN, B4XPages.MainPage.rutapreventa)
-		Log(B4XPages.MainPage.montoActual&",  "&B4XPages.MainPage.montoRechazado&",  "&B4XPages.MainPage.monto_entregadoactual&",  "&B4XPages.MainPage.piezas_entregdas&",  "& B4XPages.MainPage.clientestotal&",  "&B4XPages.MainPage.entregas&",  "& B4XPages.MainPage.rechazos&",  "& (B4XPages.MainPage.rechazos + B4XPages.MainPage.entregas)&",  "& B4XPages.MainPage.porVisitar&",  "&  B4XPages.MainPage.lat_gps&",  "& B4XPages.MainPage.lon_gps&",  "& B4XPages.MainPage.batt&",  "&Application.VersionName&",  "&B4XPages.MainPage.ALMACEN&",  "& B4XPages.MainPage.rutapreventa)
+'		Log(B4XPages.MainPage.montoActual&"  , "&B4XPages.MainPage.montoRechazado&"  , "&B4XPages.MainPage.monto_entregadoactual&"  , "&B4XPages.MainPage.piezas_entregdas&"  , "&B4XPages.MainPage.clientestotal&"  , "&B4XPages.MainPage.entregas&"  , "&B4XPages.MainPage.rechazos&"  , "&(B4XPages.MainPage.rechazos + B4XPages.MainPage.entregas)&"  , "&B4XPages.MainPage.porVisitar)
+'		Log(B4XPages.MainPage.montoActual&",  "&B4XPages.MainPage.montoRechazado&",  "&B4XPages.MainPage.monto_entregadoactual&",  "&B4XPages.MainPage.piezas_entregdas&",  "& B4XPages.MainPage.clientestotal&",  "&B4XPages.MainPage.entregas&",  "& B4XPages.MainPage.rechazos&",  "& (B4XPages.MainPage.rechazos + B4XPages.MainPage.entregas)&",  "& B4XPages.MainPage.porVisitar&",  "&  B4XPages.MainPage.lat_gps&",  "& B4XPages.MainPage.lon_gps&",  "& B4XPages.MainPage.batt&",  "&Application.VersionName&",  "&B4XPages.MainPage.ALMACEN&",  "& B4XPages.MainPage.rutapreventa)
 '		If B4XPages.MainPage.logger Then Log($"montoActual: ${B4XPages.MainPage.montoActual}, cTotal: ${B4XPages.MainPage.clientestotal}, cVenta: ${B4XPages.MainPage.clientesventa}, cVisitados: ${B4XPages.MainPage.clientesvisitados}, ${B4XPages.MainPage.lat_gps}, ${B4XPages.MainPage.lon_gps}, Batt: ${B4XPages.MainPage.batt}, montoRechazado: ${B4XPages.MainPage.montoRechazado}, montoEntregado: ${B4XPages.MainPage.montoEntregado}, porVisitar: ${B4XPages.MainPage.porVisitar}, entregas: ${B4XPages.MainPage.entregas}, rechazos: ${B4XPages.MainPage.rechazos}, Almacen: ${B4XPages.MainPage.ALMACEN}, Ruta: ${B4XPages.MainPage.rutapreventa}"$)
 		reqManager.ExecuteCommand(cmd, "up_geolocalizacion")
 		skmt.ExecNonQuery2("Update cat_variables set CAT_VA_VALOR = ?  WHERE CAT_VA_DESCRIPCION = ?" , Array As String(DateTime.Time(DateTime.Now),"HoraIngreso"))

B4A/guna_reparto.b4a

@@ -28,69 +28,73 @@ File32=guardagestion.bal
 File33=guna_viejo.png
 File34=guna_viejo2.png
 File35=historico.bal
-File36=infonavit1.jpg
+File36=images.png
-File37=intmex_logo_192x192.jpg
+File37=infonavit1.jpg
-File38=intmex_logo_192x192.png
+File38=intmex_logo_192x192.jpg
-File39=itembuttonblue.png
+File39=intmex_logo_192x192.png
 File4=atras.png
-File40=izquierda.png
+File40=inventarios.jpg
-File41=izquierda1.png
+File41=INVENTARIOS.png
-File42=kelloggs.png
+File42=itembuttonblue.png
-File43=keymon_logo.png
+File43=izquierda.png
-File44=kmt.db
+File44=izquierda1.png
-File45=kmt2.db
+File45=kelloggs.png
-File46=kmt3.db
+File46=keymon_logo.png
-File47=login.bal
+File47=kmt.db
-File48=logo sanfer.jpg
+File48=kmt2.db
-File49=logo_exitus1.jpg
+File49=kmt3.db
 File5=atras1.png
-File50=logo_mariana.jpg
+File50=login.bal
-File51=logo-guna-18.jpg
+File51=logo sanfer.jpg
-File52=logo-guna-18.png
+File52=logo_exitus1.jpg
-File53=logo-guna-blanco.png
+File53=logo_mariana.jpg
-File54=logo-guna-contorno.png
+File54=logo-guna-18.jpg
-File55=MainPage.bal
+File55=logo-guna-18.png
-File56=malo.jpg
+File56=logo-guna-blanco.png
-File57=mapa.bal
+File57=logo-guna-contorno.png
-File58=mapa_cliente.bal
+File58=MainPage.bal
-File59=mapa_rutas.bal
+File59=malo.jpg
 File6=buscar.bal
-File60=mariana.jpg
+File60=mapa.bal
-File61=mariana_logo_192x192.jpg
+File61=mapa_cliente.bal
-File62=MARQUEZ_logo_192x192.jpg
+File62=mapa_rutas.bal
-File63=no_venta.bal
+File63=mariana.jpg
-File64=nuevocliente.bal
+File64=mariana_logo_192x192.jpg
-File65=panel_pick_ciego.bal
+File65=marker-amarillo.png
-File66=pedido.bal
+File66=MARQUEZ_logo_192x192.jpg
-File67=planfia_logo.png
+File67=no_venta.bal
-File68=planfia_logo_old.png
+File68=nuevocliente.bal
-File69=planfia_logo_old2.png
+File69=panel_pick_ciego.bal
 File7=CALIFICARCLIENTE.png
-File70=principal.bal
+File70=pedido.bal
-File71=proditem.bal
+File71=planfia_logo.png
-File72=proditem2.bal
+File72=planfia_logo_old.png
-File73=productos.bal
+File73=planfia_logo_old2.png
-File74=profina.jpg
+File74=principal.bal
-File75=PROFINA.png
+File75=proditem.bal
-File76=rechazos.jpg
+File76=proditem2.bal
-File77=RECHAZOS.png
+File77=productos.bal
-File78=rechazosblanco.png
+File78=profina.jpg
-File79=sync.png
+File79=PROFINA.png
 File8=check.bal
-File80=tabulador.bal
+File80=rechazos.jpg
-File81=Tabulador.jpg
+File81=RECHAZOS.png
-File82=TABULADOR.png
+File82=rechazosblanco.png
-File83=tabuladorblanco.png
+File83=sync.png
-File84=telefonos.bal
+File84=tabulador.bal
-File85=ubicacionblanco.png
+File85=Tabulador.jpg
-File86=Ubicar_clientes.jpg
+File86=TABULADOR.png
-File87=UBICARCLIENTE.png
+File87=tabuladorblanco.png
-File88=usuario.png
+File88=telefonos.bal
-File89=vecteezy_abstract-color-polygon-background-design-abstract-geometric_22231666.jpg
+File89=ubicacionblanco.png
 File9=checklist.bal
-File90=visitaazul.png
+File90=Ubicar_clientes.jpg
-File91=visitaazul1.png
+File91=UBICARCLIENTE.png
-File92=visitadosblanco.png
+File92=usuario.png
+File93=vecteezy_abstract-color-polygon-background-design-abstract-geometric_22231666.jpg
+File94=visitaazul.png
+File95=visitaazul1.png
+File96=visitadosblanco.png
 FileGroup1=Default Group
 FileGroup10=Default Group
 FileGroup11=Default Group
@@ -183,6 +187,10 @@ FileGroup9=Default Group
 FileGroup90=Default Group
 FileGroup91=Default Group
 FileGroup92=Default Group
+FileGroup93=Default Group
+FileGroup94=Default Group
+FileGroup95=Default Group
+FileGroup96=Default Group
 Group=Default Group
 Library1=appupdating
 Library10=googlemaps
@@ -243,15 +251,15 @@ Module6=C_Cliente
 Module7=C_Clientes
 Module8=C_Detalle_Promo
 Module9=C_DetalleVenta
-NumberOfFiles=92
+NumberOfFiles=96
 NumberOfLibraries=27
 NumberOfModules=31
-Version=12.8
+Version=13.4
 @EndOfDesignText@
 #Region Project Attributes 
 	#ApplicationLabel: Guna Reparto
 	#VersionCode: 1
-	#VersionName: 5.05.20
+	#VersionName: 5.08.29
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/guna_reparto.b4a.meta

@@ -94,6 +94,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Principal,cargaAlmacen2,2447,6,C_Principal,JobDone,1669,2,C_Principal,envioinfo,1015,0,C_Principal,cargaGeneral,1177,6,C_Principal,e_ruta_EnterPressed,1823,0,C_Principal,ListView2_ItemClick,2386,0,C_Principal,et_ruta2_TextChanged,2393,5,Diseñador Visual,principal.bal,-100,6,C_Principal,B4XPage_Appear,176,6,C_Principal,cargar_Click,1074,6,B4XMainPage,B4XPage_Created,226,0
+NavigationStack=C_Cliente,b_cancel_pagare_Click,2995,2,C_Cliente,Class_Globals,1,0,C_Cliente,CheckBox1_CheckedChange,1976,0,C_Cliente,b_cxc_Click,1794,6,C_Cliente,cb_tipopago_SelectedIndexChanged,1788,0,C_Cheklist,Class_Globals,0,0,C_Cliente,b_acred_Click,1771,0,C_Cliente,b_abono_Click,2070,6,C_Principal,Class_Globals,0,0,B4XMainPage,B4XPage_Created,1304,0
 SelectedBuild=0
 VisibleModules=2,16,4,5,6,7,9,30,29,27