Version: 5.03.31

Se le agrego una vista al enviar informacion.

B4A/B4XMainPage.bas

@@ -196,6 +196,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.agregaColumna("HIST_VENTAS","CANTC","TEXT")
 	Subs.agregaColumna("HIST_VENTAS","BCAJAS_OR","TEXT")
 	Subs.agregaColumna("HIST_VENTAS","CANTC_OR","TEXT")
+	Subs.agregaColumna("HIST_VENTAS","HVD_RUTA","TEXT")
 	Subs.agregaColumna("CAT_GUNAPROD","CONVERSION","TEXT")
 	Subs.agregaColumna("CAT_GUNAPROD","PRECIOCONVER","TEXT")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTAA (RUTAA TEXT)")
@@ -251,6 +252,63 @@ Sub B4XPage_Appear
 '	If Result Then
 '		Log("Con permisos de escritura externa")
 '	End If
+
+'	Dim Dirp As String = File.DirInternal
+'	Dim Dir As String
+'	Dim Dir2 As String
+'	Try
+'		File.MakeDir(Dirp,"/md")
+'		Dir = "/md"
+'		Log("creado en promotoria " & Dirp & Dir)
+'	Catch
+'		Dir = ""
+'		Log("creado en raiz")
+'	End Try
+'	
+'	Try
+'		File.MakeDir(Dirp & Dir,"/reduccion")
+'		Dir2 = "/reduccion"
+'		Log("creado en promotoria " & Dirp & Dir & Dir2)
+'	Catch
+'		Dir = ""
+'		Log("creado en raiz")
+'	End Try
+'	
+'	For i = 0 To 150
+'		Log(Dirp)
+'		Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirAssets, i&"marker-azul5", 72, 115, True)
+'		Dim out As OutputStream = File.OpenOutput(File.DirInternal & Dir & Dir2, i&"marker-azul5", True)
+'		img.WriteToStream(out, 100, "PNG")
+'		
+''		Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirAssets, i&"marker-azul7.png", 72, 115, True)
+''		Dim out As OutputStream = File.OpenOutput(File.DirInternal & Dir & Dir2, i&"marker-azul7.png", True)
+''		img.WriteToStream(out, 100, "PNG")
+'		
+''		Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirAssets, i&"marker-azul8.png", 72, 115, True)
+''		Dim out As OutputStream = File.OpenOutput(File.DirInternal & Dir & Dir2, i&"marker-azul8.png", True)
+''		img.WriteToStream(out, 100, "PNG")
+''		
+''		Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirAssets, i&"marker-azul3.png", 72, 115, True)
+''		Dim out As OutputStream = File.OpenOutput(File.DirInternal & Dir & Dir2, i&"marker-azul3.png", True)
+''		img.WriteToStream(out, 100, "PNG")
+''		
+''		Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirAssets, i&"marker-azul4.png", 72, 115, True)
+''		Dim out As OutputStream = File.OpenOutput(File.DirInternal & Dir & Dir2, i&"marker-azul4.png", True)
+''		img.WriteToStream(out, 100, "PNG")
+'
+''		Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirAssets, i&"marker-rojo.png", 72, 115, True)
+''		Dim out As OutputStream = File.OpenOutput(File.DirInternal & Dir & Dir2, i&"marker-rojo.png", True)
+''		img.WriteToStream(out, 100, "PNG")
+''
+''		Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirAssets, i&"marker-verde.png", 72, 115, True)
+''		Dim out As OutputStream = File.OpenOutput(File.DirInternal & Dir & Dir2, i&"marker-verde.png", True)
+''		img.WriteToStream(out, 100, "PNG")
+'
+''		foto1 = File.ReadBytes(File.DirInternal & Dir & Dir2, nombrefoto)
+'		
+'		out.Close
+'		
+'	Next
 End Sub
 
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.

B4A/C_Cliente.bas

@@ -76,6 +76,7 @@ Sub Class_Globals
 	Private l_montopag As Label
 	Private l_efectivo As Label
 	Private l_montoefec As Label
+	Dim distance As Long
 End Sub
 
 'You can add more parameters here.
@@ -128,6 +129,10 @@ Sub B4XPage_Appear
 	Subs.centraPanel(p_principal, Root.Width)
 	Starter.skmt.Initialize(Starter.ruta,"kmt.db", True)
 	reqManager.Initialize(Me, B4XPages.MainPage.SERVER)
+	Tar.Visible = False
+	gest.Visible = False
+	b_noEntrega.Visible = False
+	HIST.Visible = False
 	c=Starter.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_BCREDITO  from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)")
 	s=Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
 	s.Position=0
@@ -297,6 +302,18 @@ Sub B4XPage_Appear
 		l_montopag.Visible = False
 	End If
 
+	If distance < 50 Then
+		Tar.Visible = True
+		gest.Visible = True
+		b_noEntrega.Visible = True
+		HIST.Visible = True
+	Else
+		Tar.Visible = False
+		gest.Visible = False
+		b_noEntrega.Visible = False
+		HIST.Visible = False
+	End If
+
 End Sub
 
 Sub Activity_Pause (UserClosed As Boolean)
@@ -304,14 +321,50 @@ Sub Activity_Pause (UserClosed As Boolean)
 End Sub
 
 Sub GPS_LocationChanged (Location1 As Location)
-'	lat_gps=Location1.ConvertToSeconds(Location1.Latitude)
+'	LogColor($"Entrando a Cliente.GPS_LocationChanged"$, Colors.red)
-'	lon_gps=Location1.ConvertToSeconds(Location1.Longitude)
+	If Tracker.FLP.GetLastKnownLocation.IsInitialized And Tracker.FLP.GetLastKnownLocation.Latitude <> 0 Then
+		B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude
+		B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude
+		Log("Coords set to: " & B4XPages.MainPage.lat_gps & " and " & B4XPages.MainPage.lon_gps)
+	End If
+	
+	If LATITUD.Length < 5 Then
+		
+	Else
+			
+	
+		Dim l1, l2 As Location
+		l1.Initialize2(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)
+		Log($"Coordenadas de la tienda - lat:${LATITUD}, lon:${LONGITUD}"$)
+		l2.Initialize2(LATITUD, LONGITUD)
+		
+	
+
+		'now we need the distance between our location and the target location
+		distance =    l1.DistanceTo(l2)  'the result is in meter
+		
+		If distance < 50 Then
+			Tar.Visible = True
+			gest.Visible = True
+			b_noEntrega.Visible = True
+			HIST.Visible = True
+		Else
+			Tar.Visible = False
+			gest.Visible = False
+			b_noEntrega.Visible = False
+			HIST.Visible = False
+		End If
+	
+		Log("DISTANCIA "&distance)
+	End If
+	
 	Dim sDate,sTime As String
 	DateTime.DateFormat = "MM/dd/yyyy"
 	sDate=DateTime.Date(DateTime.Now)
 	sTime=DateTime.Time(DateTime.Now)
 	Starter.skmt.ExecNonQuery("DELETE FROM HIST_GPS")
 	Starter.skmt.ExecNonQuery2("INSERT INTO  HIST_GPS (HGDATE, HGLAT, HGLON) VALUES(?,?,?) ", Array As Object (sDate & sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps))
+	CallSubDelayed(Tracker, "CreateLocationRequest")
 End Sub
 
 Sub ListView1_ItemLongClick (Position As Int, Value As Object)
@@ -363,13 +416,17 @@ Sub Guardado
 	Starter.skmt.ExecNonQuery("update HIST_VENTAS SET HVD_ESTATUS = 1 WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)")
 	mandaPendientesreparto
 	
-
+	Msgbox2Async("Pedido entregado","Atención","Ok","", "",LoadBitmap(File.DirAssets,"alert2.png"), False)
-	Dim mandamapa As Cursor = Starter.skmt.ExecQuery("SELECT * FROM kmt_info WHERE gestion = 0 and CAT_CL_CODIGO <> 63403")
+	Wait For Msgbox_Result (resultado As Int)
-	If mandamapa.RowCount > 0 Then
+	If resultado = DialogResponse.POSITIVE Then
-		StartActivity(MAPA_RUTAS)
+		Dim mandamapa As Cursor = Starter.skmt.ExecQuery("SELECT * FROM kmt_info WHERE gestion = 0 and CAT_CL_CODIGO <> 63403")
-	Else If mandamapa.RowCount = 0 Then
+		If mandamapa.RowCount > 0 Then
-		B4XPages.ShowPage("Principal")
+			StartActivity(MAPA_RUTAS)
+		Else If mandamapa.RowCount = 0 Then
+			B4XPages.ShowPage("Principal")
+		End If
 	End If
+	
 End Sub
 
 Sub b_noEntrega_Click

B4A/C_NoVenta.bas

@@ -140,11 +140,15 @@ Sub GUARDA_Click
 			d.Position = 0
 			Starter.skmt.ExecNonQuery2("INSERT INTO REPARTO_GEO (CLIENTE, USUARIO, FECHA_PUNTEO, LATITUD, LONGITUD, ALMACEN, RUTA_REPARTO, RUTA_PREV, FECHA_PREVENTA, MOTIVO, COMENTARIO,TIPO,ENVIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,0)",Array As String (cuenta, usuario, sDate &" "&sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps,B4XPages.MainPage.almacen,ruta,rutapre,fechaprev, motivo, e_comm.Text,"NO ENTREGADO"))
 		
-			Dim mandamapa As Cursor = Starter.skmt.ExecQuery("SELECT * FROM kmt_info WHERE gestion = 0")
+			Msgbox2Async("Pedido rechazado","Atención","Ok","", "",LoadBitmap(File.DirAssets,"alert2.png"), False)
-			If mandamapa.RowCount > 0 Then
+			Wait For Msgbox_Result (resultado As Int)
-				StartActivity(MAPA_RUTAS)
+			If resultado = DialogResponse.POSITIVE Then
-			Else If mandamapa.RowCount = 0 Then
+				Dim mandamapa As Cursor = Starter.skmt.ExecQuery("SELECT * FROM kmt_info WHERE gestion = 0 and CAT_CL_CODIGO <> 63403")
-				B4XPages.ShowPage("Principal")
+				If mandamapa.RowCount > 0 Then
+					StartActivity(MAPA_RUTAS)
+				Else If mandamapa.RowCount = 0 Then
+					B4XPages.ShowPage("Principal")
+				End If
 			End If
 		Else
 			COMENTARIO = e_comm.Text

B4A/C_Principal.bas

@@ -95,6 +95,15 @@ Sub Class_Globals
 	Private b_regreso As Button
 	Private lv_prod_Prin As ListView
 	Private b_venta_emp As Button
+	Dim successfulRequests As Int = 0
+	Dim totalRegistros As Int = 0
+	Dim totalRegistrosTotales As Int = 0
+	Dim todosRequest As Int = 0
+	Private pEnvioInfo As Panel
+	Private bEnvioInfo As Button
+	Private pbEnvioInfo As ProgressBar
+	Private lEnviaInfo As Label
+	Private lVersionName As Label
 End Sub
 
 'You can add more parameters here.
@@ -118,10 +127,10 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	b=Starter.skmt.ExecQuery("Select count(*) as CUANTOS from pedido_cliente")
 	b.Position=0
 	Cuantos = b.GetString("CUANTOS")
-	d=Starter.skmt.ExecQuery("select count(*) as TOTAL_VISITAR from kmt_info where gestion = 0 AND  CAT_CL_RUTA <> 1000")
+	d=Starter.skmt.ExecQuery("select DISTINCT count(*) as TOTAL_VISITAR from kmt_info where gestion = 0 AND  CAT_CL_RUTA <> 1000")
 	D.Position=0
 	b.Close
-	e=Starter.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info WHERE CAT_CL_RUTA <> 1000")
+	e=Starter.skmt.ExecQuery("select DISTINCT count(*) as POR_VISITAR from kmt_info WHERE CAT_CL_RUTA <> 1000")
 	e.Position=0
 	If Cuantos = 0 Then
 		l_aLiquidar.Text = 0
@@ -167,6 +176,7 @@ End Sub
 
 Sub B4XPage_Appear
 	
+	lVersionName.Text = "Version: " & Application.VersionName
 	Private c As Cursor = Starter.skmt.ExecQuery("SELECT * FROM NOVENTA")
 	If c.RowCount > 0 Then
 		Starter.skmt.ExecNonQuery("Update kmt_info set gestion = 2  WHERE CAT_CL_CODIGO IN (SELECT NV_CLIENTE FROM NOVENTA WHERE NV_MOTIVO = 'ENTREGA')")
@@ -228,10 +238,10 @@ Sub B4XPage_Appear
 	b=Starter.skmt.ExecQuery("Select count(*) as CUANTOS from kmt_info")
 	b.Position=0
 	If b.RowCount > 0 Then Cuantos = b.GetString("CUANTOS")
-	d=Starter.skmt.ExecQuery("select count(*) as TOTAL_VISITAR from kmt_info where gestion = 0 AND CAT_CL_RUTA <> 1000")
+	d=Starter.skmt.ExecQuery("selecT count(DISTINCT CAT_CL_CODIGO) as TOTAL_VISITAR from kmt_info where gestion = 0 AND CAT_CL_RUTA <> 1000")
 	D.Position=0
 	b.Close
-	e=Starter.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info WHERE CAT_CL_RUTA <> 1000")
+	e=Starter.skmt.ExecQuery("select count(DISTINCT CAT_CL_CODIGO) as POR_VISITAR from kmt_info WHERE CAT_CL_RUTA <> 1000")
 	e.Position=0
 '	f=Starter.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info")
 '	f.Position=0
@@ -667,6 +677,15 @@ Sub trabajar_Click
 End Sub
 
 Sub Subir_Click
+	pEnvioInfo.Width = Root.Width
+	pEnvioInfo.Height = Root.Height
+	pEnvioInfo.Left = 0
+	pEnvioInfo.Visible = True
+	pbEnvioInfo.Width = Root.Width * 0.7
+	pbEnvioInfo.Left = Round(Root.Width/2)-(pbEnvioInfo.Width/2)
+	Subs.centraBoton(bEnvioInfo, pEnvioInfo.Width)
+	Subs.centraEtiqueta(lEnviaInfo, pEnvioInfo.Width)
+	
 	If Not(IsConnectedToInternet) Then MsgboxAsync("No hay conexión a conexión a Internet", "Revisa tu conexión")
 	c=Starter.skmt.ExecQuery("select usuario from usuarioa")
 	c.Position = 0
@@ -681,13 +700,20 @@ Sub Subir_Click
 End Sub
 
 Sub envioinfo
-
+	successfulRequests = 0
-	
+	totalRegistros = 0
-
+	totalRegistrosTotales = 0
+	todosRequest = -1
+	bEnvioInfo.Enabled = False
 	' NOVENTA
 	c = Starter.skmt.ExecQuery("SELECT NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON, NV_FOTO FROM NOVENTA")
 	D=Starter.skmt.ExecQuery("SELECT COUNT(*) AS CUANTOS_NOVENTA FROM NOVENTA")
 	If c.RowCount>0 Then
+		Log($"Procesando NOVENTA: ${c.RowCount} registros"$)
+		totalRegistros = totalRegistros + c.RowCount
+		totalRegistrosTotales = totalRegistrosTotales + c.RowCount
+		Log($"Total acumulado: ${totalRegistros}"$)
+        
 		For i=0 To c.RowCount -1
 			c.Position=i
 			foto1 = c.GetBlob("NV_FOTO")
@@ -702,9 +728,15 @@ Sub envioinfo
 	d.Position=0
 	cuantos_noventa = D.GetString("CUANTOS_NOVENTA")
 	d.Close
+    
+	' HIST_VENTAS con rechazo o parcial
 	c=Starter.skmt.ExecQuery("SELECT HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID, HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_PARCIAL FROM hist_ventas WHERE HVD_RECHAZO = 1 OR HVD_PARCIAL = 1")
-	'
 	If c.RowCount>0 Then
+		Log($"Procesando HIST_VENTAS (rechazos/parciales): ${c.RowCount} registros"$)
+		totalRegistros = totalRegistros + c.RowCount
+		totalRegistrosTotales = totalRegistrosTotales + c.RowCount
+		Log($"Total acumulado: ${totalRegistros}"$)
+        
 		For i=0 To c.RowCount -1
 			c.Position=i
 			Dim cmd As DBCommand
@@ -715,9 +747,15 @@ Sub envioinfo
 		Next
 		c.Close
 	End If
-'	pedido
+    
+	' PEDIDO
 	c=Starter.skmt.ExecQuery("SELECT PE_TIPO, PE_RUTA, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_CLIENTEOR, PE_CAJAS, PE_BCAJAS, CONSECUTIVO, FECHA_PREV, RUTA_REP, PE_REGALO FROM PEDIDO")
 	If c.RowCount>0 Then
+		Log($"Procesando PEDIDO: ${c.RowCount} registros"$)
+		totalRegistros = totalRegistros + c.RowCount
+		totalRegistrosTotales = totalRegistrosTotales + c.RowCount
+		Log($"Total acumulado: ${totalRegistros}"$)
+        
 		For i=0 To c.RowCount -1
 			c.Position=i
 			Dim cmd As DBCommand
@@ -728,11 +766,15 @@ Sub envioinfo
 		Next
 		c.Close
 	End If
-	
+    
-	
+	' REPARTO
-'	reqManager.Initialize(Me, "http://187.189.244.154:1787") 'Para el servidor de pruebas.
 	c = Starter.skmt.ExecQuery("SELECT * from reparto")
 	If c.RowCount > 0 Then
+		Log($"Procesando REPARTO: ${c.RowCount} registros"$)
+		totalRegistros = totalRegistros + c.RowCount
+		totalRegistrosTotales = totalRegistrosTotales + c.RowCount
+		Log($"Total acumulado: ${totalRegistros}"$)
+        
 		Private folio As String = Subs.hmsKMT
 		For i=0 To c.RowCount -1
 			c.Position=i
@@ -744,8 +786,15 @@ Sub envioinfo
 		Next
 		c.Close
 	End If
+    
+	' RECHAZOS
 	c = Starter.skmt.ExecQuery("SELECT * from rechazos")
 	If c.RowCount > 0 Then
+		Log($"Procesando RECHAZOS: ${c.RowCount} registros"$)
+		totalRegistros = totalRegistros + c.RowCount
+		totalRegistrosTotales = totalRegistrosTotales + c.RowCount
+		Log($"Total acumulado: ${totalRegistros}"$)
+        
 		Private folio As String = Subs.hmsKMT
 		For i=0 To c.RowCount -1
 			c.Position=i
@@ -757,8 +806,15 @@ Sub envioinfo
 		Next
 		c.Close
 	End If
+    
+	' VENTAS
 	c = Starter.skmt.ExecQuery("SELECT * from ventas")
 	If c.RowCount > 0 Then
+		Log($"Procesando VENTAS: ${c.RowCount} registros"$)
+		totalRegistros = totalRegistros + c.RowCount
+		totalRegistrosTotales = totalRegistrosTotales + c.RowCount
+		Log($"Total acumulado: ${totalRegistros}"$)
+        
 		Private folio As String = Subs.hmsKMT
 		For i=0 To c.RowCount -1
 			c.Position=i
@@ -770,25 +826,27 @@ Sub envioinfo
 		Next
 		c.Close
 	End If
-	
+    
-	
+	' REPARTO_GEO
-	c=Starter.skmt.ExecQuery("SELECT  CLIENTE, USUARIO, FECHA_PUNTEO, LATITUD, LONGITUD, ALMACEN, RUTA_REPARTO, RUTA_PREV, FECHA_PREVENTA, MOTIVO, COMENTARIO,TIPO FROM REPARTO_GEO")
+	c=Starter.skmt.ExecQuery("SELECT CLIENTE, USUARIO, FECHA_PUNTEO, LATITUD, LONGITUD, ALMACEN, RUTA_REPARTO, RUTA_PREV, FECHA_PREVENTA, MOTIVO, COMENTARIO,TIPO FROM REPARTO_GEO")
-	Log($"REPARTO_Cliente PENDIENTE: ${c.RowCount}"$)
 	If c.RowCount>0 Then
+		Log($"Procesando REPARTO_GEO: ${c.RowCount} registros"$)
+		totalRegistros = totalRegistros + c.RowCount
+		totalRegistrosTotales = totalRegistrosTotales + c.RowCount
+		Log($"Total acumulado: ${totalRegistros}"$)
+        
 		For i=0 To c.RowCount -1
 			c.Position=i
-			
 			Dim cmd As DBCommand
 			cmd.Initialize
 			cmd.Name = "insert_REPARTO_MAZAPA"
 			cmd.Parameters = Array As Object(c.GetString("CLIENTE"), c.GetString("USUARIO"), c.GetString("FECHA_PUNTEO"), c.GetString("LATITUD"), c.GetString("LONGITUD"), c.GetString("ALMACEN"), c.GetString("RUTA_REPARTO"), c.GetString("RUTA_PREV"), c.GetString("FECHA_PREVENTA"), c.GetString("MOTIVO"), c.GetString("COMENTARIO"),c.GetString("TIPO"))
 			reqManager.ExecuteCommand(cmd , $"ins_REPARTOPendientes_head_${c.GetString("CLIENTE")}"$)
-			
 		Next
 	End If
 	c.Close
-	
+    
-	'TABULADOR
+	' TABULADOR_MONEDAS
 	c = Starter.skmt.ExecQuery("SELECT VEINTE, DIEZ, CINCO, DOS, PESO, CENTAVO, TOTAL FROM TABULADOR_MONEDAS")
 	d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA")
 	b = Starter.skmt.ExecQuery("SELECT ID_ALMACEN FROM CAT_ALMACEN")
@@ -797,6 +855,11 @@ Sub envioinfo
 	b.Position = 0
 	f.Position = 0
 	If c.RowCount > 0 Then
+		Log($"Procesando TABULADOR_MONEDAS: ${c.RowCount} registros"$)
+		totalRegistros = totalRegistros + c.RowCount
+		totalRegistrosTotales = totalRegistrosTotales + c.RowCount
+		Log($"Total acumulado: ${totalRegistros}"$)
+        
 		For i = 0 To c.RowCount - 1
 			c.Position=i
 			Dim cmd As DBCommand
@@ -813,9 +876,15 @@ Sub envioinfo
 		b.Close
 		f.Close
 	End If
-	
+    
-	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")
+	' HIST_VENTAS para actualización
+	c = Starter.skmt.ExecQuery("SELECT IFNULL(HVD_RECHAZOCANT,0) AS HVD_RECHAZOCANT, HVD_RUTA, HVD_CLIENTE, HVD_PROID, HVD_FECHA, HVD_CODPROMO, HVD_NUM_TICKET, HVD_CANT, CONSECUTIVO, BCAJAS, CANTC FROM HIST_VENTAS")
 	If c.RowCount > 0 Then
+		Log($"Procesando HIST_VENTAS (actualización): ${c.RowCount} registros"$)
+		totalRegistros = totalRegistros + c.RowCount
+		totalRegistrosTotales = totalRegistrosTotales + c.RowCount
+		Log($"Total acumulado: ${totalRegistros}"$)
+        
 		For i=0 To c.RowCount -1
 			c.Position = i
 			Log(c.GetString("HVD_CLIENTE"))
@@ -826,14 +895,14 @@ Sub envioinfo
 			d5.Position = 0
 			Private restacant As String = d5.GetString("PE_CANT")
 			d5.Close
-			
+            
 			Dim fecha1() As String = Regex.Split(" ", c.GetString("HVD_FECHA"))
 			Dim fecha2() As String = Regex.Split("-", fecha1(0))
 			Dim fecha3 As String = fecha2(2)&"/"&fecha2(1)&"/"&fecha2(0)
 			Log(fecha3)
 			Dim hora() As String = Regex.Split("\.", fecha1(1))
 			Log(hora(0))
-			
+            
 			Dim sDate, sTime As String
 			DateTime.DateFormat = "dd/MM/yyyy"
 			DateTime.TimeFormat = "HH:mm:ss"
@@ -843,13 +912,13 @@ Sub envioinfo
 				Log((c.GetString("HVD_RECHAZOCANT")-restacant))
 				cmd.Initialize
 				cmd.Name = "update_HVD_MAZAPArep2"
-				cmd.Parameters = Array As String(c.GetString("HVD_RECHAZOCANT"),c.GetString("BCAJAS"), c.GetString("CANTC"),sDate& " "& sTime,1, c.GetString("HVD_CLIENTE"), c.GetString("HVD_PROID"),fecha3&" "&hora(0), d4.GetString("CAT_CL_RUTA"),ALMACEN,l_ruta.Text,c.GetString("HVD_CODPROMO"),c.GetString("HVD_NUM_TICKET"), c.GetString("HVD_CANT"))
+				cmd.Parameters = Array As String(c.GetString("HVD_RECHAZOCANT"),c.GetString("BCAJAS"), c.GetString("CANTC"),sDate& " "& sTime,1, c.GetString("HVD_CLIENTE"), c.GetString("HVD_PROID"),fecha3&" "&hora(0), c.GetString("HVD_RUTA"),ALMACEN,l_ruta.Text,c.GetString("HVD_CODPROMO"),c.GetString("HVD_NUM_TICKET"), c.GetString("HVD_CANT"))
 				reqManager.ExecuteCommand(cmd, "update_hvd")
 			Else
 				cmd.Initialize
 				cmd.Name = "update_HVD_MAZAPArep2"
 				Log( c.GetString("CANTC")& c.GetString("HVD_CLIENTE")& c.GetString("HVD_PROID")&fecha3&" "&hora(0)& d4.GetString("CAT_CL_RUTA")&ALMACEN&l_ruta.Text&c.GetString("HVD_CODPROMO")&c.GetString("HVD_NUM_TICKET")& c.GetString("HVD_CANT"))
-				cmd.Parameters = Array As String("",c.GetString("BCAJAS"), c.GetString("CANTC"),"","", c.GetString("HVD_CLIENTE"), c.GetString("HVD_PROID"),fecha3&" "&hora(0), d4.GetString("CAT_CL_RUTA"),ALMACEN,l_ruta.Text,c.GetString("HVD_CODPROMO"),c.GetString("HVD_NUM_TICKET"), c.GetString("HVD_CANT"))
+				cmd.Parameters = Array As String("",c.GetString("BCAJAS"), c.GetString("CANTC"),"","", c.GetString("HVD_CLIENTE"), c.GetString("HVD_PROID"),fecha3&" "&hora(0), c.GetString("HVD_RUTA"),ALMACEN,l_ruta.Text,c.GetString("HVD_CODPROMO"),c.GetString("HVD_NUM_TICKET"), c.GetString("HVD_CANT"))
 				reqManager.ExecuteCommand(cmd, "update_hvd")
 			End If
 			d4.Close
@@ -857,7 +926,7 @@ Sub envioinfo
 	End If
 	c.Close
 
-
+	' TABULADOR_BILLETES
 	c = Starter.skmt.ExecQuery("SELECT MIL, QUINIENTOS, DOCIENTOS, CIEN, CINCUENTA, VEINTE FROM TABULADOR_BILLETES")
 	d = Starter.skmt.ExecQuery("SELECT RUTAA FROM RUTAA")
 	b = Starter.skmt.ExecQuery("SELECT ID_ALMACEN FROM CAT_ALMACEN")
@@ -866,6 +935,11 @@ Sub envioinfo
 	b.Position = 0
 	f.Position = 0
 	If c.RowCount > 0 Then
+		Log($"Procesando TABULADOR_BILLETES: ${c.RowCount} registros"$)
+		totalRegistros = totalRegistros + c.RowCount
+		totalRegistrosTotales = totalRegistrosTotales + c.RowCount
+		Log($"Total acumulado: ${totalRegistros}"$)
+        
 		For i = 0 To c.RowCount - 1
 			c.Position=i
 			Dim cmd As DBCommand
@@ -882,14 +956,24 @@ Sub envioinfo
 		b.Close
 		f.Close
 	End If
-	'FIN TABULADOR
+    
-	
+	' Insertar drop
 	Dim cmd As DBCommand
 	cmd.Initialize
-	cmd.Name = "insert_drop_rep_MAZAPA"
+	cmd.Name = "insert_drop_rep_MAZAPA2"
-	cmd.Parameters = Array As Object(Subs.dameUsuarioDeDB, l_ruta.Text, ALMACEN, l_ctast.text, Subs.traeEntregados, Subs.traeRechazados, "ENVIO")
+	cmd.Parameters = Array As Object(Subs.dameUsuarioDeDB, l_ruta.Text, ALMACEN, l_ctast.text, Subs.traeEntregados, Subs.traeRechazados, "ENVIO", Application.VersionName)
 	reqManager.ExecuteCommand(cmd , "inst_drop")
-	ToastMessageShow("Se Actualizaran los datos, Este proceso podria tardar hasta un minuto, gracias "& l_ruta.text , True)
+    
+	Log($"PROCESO COMPLETADO - TOTAL DE REGISTROS PROCESADOS: ${totalRegistros}"$)
+	ToastMessageShow("Se Actualizaron los datos, Este proceso podria tardar hasta un minuto, gracias "& l_ruta.text , True)
+	
+	Wait For AllRequestsComplete ' Espera a que todos los requests terminen
+    
+	Log($"Total registros procesados: ${totalRegistros}"$)
+	Log($"Requests exitosos: ${successfulRequests}"$)
+	LogColor("Esto es totalRegistrosTotales: ---->" & totalRegistrosTotales, Colors.Red)
+
+
 End Sub
 
 Sub cargar_Click
@@ -922,8 +1006,8 @@ Sub cargar_Click
 	
 		Dim cmd As DBCommand
 		cmd.Initialize
-		cmd.Name = "insert_drop_rep_MAZAPA"
+		cmd.Name = "insert_drop_rep_MAZAPA2"
-		cmd.Parameters = Array As Object(Subs.dameUsuarioDeDB, l_ruta.Text, ALMACEN, l_ctast.text, Subs.traeEntregados, Subs.traeRechazados, "CARGA")
+		cmd.Parameters = Array As Object(Subs.dameUsuarioDeDB, l_ruta.Text, ALMACEN, l_ctast.text, Subs.traeEntregados, Subs.traeRechazados, "CARGA", Application.VersionName)
 		reqManager.ExecuteCommand(cmd , "inst_drop")
 '	reqs.Add("inst_noventa")
 
@@ -958,14 +1042,14 @@ Sub cargar_Click
 		Log($"Pedimos Punteo"$)
 		reqs.Add("punteo")
 
-		If l_ruta.Text = "0" Then
+'		If l_ruta.Text = "0" Then
 			cmd.Initialize
 			cmd.Name = "select_almacen_MAZAPA_re_REPG2"
 			cmd.Parameters = Array As Object(ALMACEN)
 			reqManager.ExecuteQuery(cmd , 0, "gunaprod")
 			Log($"Pedimos gunaprod - ${ALMACEN}, ${e_ruta.text}"$)
 			reqs.Add("gunaprod")
-		End If
+'		End If
 
 
 		cmd.Initialize
@@ -1049,10 +1133,17 @@ End Sub
 
 Sub JobDone(Job As HttpJob)
 '	Private r As DBResult = reqManager.HandleJob(Job)
+	Log(todosRequest)
+	todosRequest = todosRequest +1
+	Log(todosRequest)
 	If Job.Success = False Then
 		LogColor("** " & Job.Tag & " Error: " & Job.ErrorMessage, Colors.Red) ' Mod by CHV - 211023
 		'ToastMessageShow("Error: " & Job.ErrorMessage, True)
 	Else
+		LogColor("Esto es totalRegistros: " & totalRegistros, Colors.Red)
+		successfulRequests = successfulRequests + 1
+		totalRegistros = totalRegistros - 1
+		Log("Esto es successfulRequests: " & successfulRequests)
 		LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green)  'Mod por CHV - 211023
 		If Job.JobName = "DBRequest" Then
 			Dim result As DBResult = reqManager.HandleJob(Job)
@@ -1320,19 +1411,20 @@ Sub JobDone(Job As HttpJob)
 					Dim HVD_PLACA As String = records(result.Columns.Get("HVD_PLACA"))
 					Dim bcajas As String = records(result.Columns.Get("HVD_BCAJAS"))
 					Dim cantc As String = records(result.Columns.Get("HVD_CANTC"))
+					Dim HVD_RUTA As String = records(result.Columns.Get("HVD_RUTA"))
 '					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")
-						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, PLACA,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, HVD_PLACA,bcajas,cantc,consecutivo,bcajas,cantc))
+						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, PLACA,BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR, HVD_RUTA) 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, HVD_PLACA,bcajas,cantc,consecutivo,bcajas,cantc, HVD_RUTA))
 						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}'"$)
 						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, PLACA,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, HVD_PLACA,bcajas,cantc,consecutivo,bcajas,cantc))
+							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, PLACA,BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR, HVD_RUTA) 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, HVD_PLACA,bcajas,cantc,consecutivo,bcajas,cantc, HVD_RUTA))
-							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))							
+							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))
 						End If
 					End If
 				Next
@@ -1543,6 +1635,7 @@ Sub JobDone(Job As HttpJob)
 		End If
 		Job.Release
 	End If
+	Job.Release
 	If reqs.Size = 0 Then
 		
 		
@@ -1561,6 +1654,35 @@ Sub JobDone(Job As HttpJob)
 '		Log(reqs.size)
 '		Log("Terminamos lo descarga de ruta!")
 	End If
+	Log("---------------------------------------------------")
+	Log(totalRegistrosTotales)
+	Log(successfulRequests)
+	Log(todosRequest)
+	Log(NumberFormat2(((todosRequest/ totalRegistrosTotales ) * 100),1,0,0,False))
+	'Aqui voy a cambiar el porcentaje de mi barra de avance.
+	If totalRegistrosTotales > 0 Then
+		pbEnvioInfo.Progress = NumberFormat2(((todosRequest/ totalRegistrosTotales ) * 100),1,0,0,False)
+		
+		If pbEnvioInfo.Progress >= 100 Then
+			lEnviaInfo.Text = "Informacion Enviada "& CRLF &"%100"
+		Else 
+			lEnviaInfo.Text = "Enviando Informacion:   %" & pbEnvioInfo.Progress
+		End If
+	End If
+	Log("---------------------------------------------------")
+	Log(todosRequest >= totalRegistrosTotales)
+	
+	If todosRequest < totalRegistrosTotales Then
+		
+	Else
+		bEnvioInfo.Enabled = True
+	End If
+	
+End Sub
+
+Private Sub bEnvioInfo_Click
+	bEnvioInfo.Enabled = False
+	pEnvioInfo.Visible = False
 End Sub
 
 Private Sub B4XPage_CloseRequest As ResumableSub
@@ -1570,6 +1692,8 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 		B_REGRESA_Click
 	Else If p_prod.Visible Then
 		p_prod.Visible = False
+	Else If pEnvioInfo.Visible Then
+		Return False
 	Else
 		B4XPages.ShowPage("Login")
 	End If
@@ -1999,4 +2123,8 @@ Private Sub b_venta_emp_Click
 	Starter.skmt.ExecNonQuery("delete from CUENTAA")
 	Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("63403"))
 	B4XPages.ShowPage("Cliente")
+End Sub
+
+Private Sub pEnvioInfo_Click
+	
 End Sub

B4A/C_Productos.bas

@@ -96,7 +96,7 @@ Sub B4XPage_Appear
 '	c=Starter.skmt.ExecQuery("select distinct hist_ventas.hvd_num_registro, HIST_VENTAS.HVD_CLIENTE, HIST_VENTAS.HVD_PRONOMBRE, HIST_VENTAS.HVD_PROID, HIST_VENTAS.HVD_CANT, HIST_VENTAS2.HVD_CANT as HVD_CANT2, HIST_VENTAS.HVD_COSTO_TOT, HIST_VENTAS.HVD_CODPROMO from HIST_VENTAS inner join HIST_VENTAS2 on HIST_VENTAS.HVD_PROID = HIST_VENTAS2.HVD_PROID and HIST_VENTAS.HVD_CLIENTE = HIST_VENTAS2.HVD_CLIENTE WHERE HIST_VENTAS.HVD_CLIENTE IN (Select CUENTA from cuentaa) and HIST_VENTAS.HVD_RECHAZO = 0 order by HIST_VENTAS.HVD_CODPROMO desc, HIST_VENTAS.HVD_PRONOMBRE asc")
 	
 	
-	c=Starter.skmt.ExecQuery("select * from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0 order by HVD_CODPROMO desc, HVD_PRONOMBRE asc")
+	c=Starter.skmt.ExecQuery("select * from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0 and HVD_CLIENTE NOT IN (SELECT CUENTA FROM CUENTAA) order by HVD_CODPROMO desc, HVD_PRONOMBRE asc")
 '	Private c2 As Cursor=Starter.skmt.ExecQuery("select  from PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)")
 	
 	ListView1.Clear
@@ -705,7 +705,7 @@ Sub b_prodMas_Click
 	If esteTag.Get(4) = "0" Then
 		
 	Else
-		If laCant.Text + 1 <= maxProds Then
+		If laCant.Text + 1 * minimoadesc <= maxProds Then
 			Log($"NuevaCant = ${laCant.Text + 1}"$)
 			laCant.Text = $"$1.0{laCant.Text + 1}"$
 			Starter.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - 1 where cat_gp_id = ?", Array As String(esteTag.Get(2)))
@@ -759,9 +759,9 @@ Sub b_prodMas_Click
 						Private pup As String = c2.GetString("HVD_COSTO_TOT")/c2.GetString("HVD_CANT")
 						
 '						Starter.skmt.ExecNonQuery($"update HIST_VENTAS set HVD_RECHAZO = 1,  HVD_RECHAZOCANT = HVD_RECHAZOCANT - 1  WHERE HVD_PROID = '${esteTag.Get(2)}' and HVD_cliente =  '${esteTag.Get(5)}'"$)
-						Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO(PE_PROID,PE_PRONOMBRE,PE_CANT,PE_CLIENTEOR,PE_CLIENTE,PE_COSTOU,PE_COSTO_TOT,PE_CAJAS,PE_BCAJAS,CONSECUTIVO,PE_RUTA, PE_TIPO,PE_CEDIS,PE_FECHA,PE_USUARIO,FECHA_PREV,RUTA_REP,PE_REGALO) VALUES (?,?,?,?,?,?,?,0,0,?,?,?,?,?,?,?,?,?)", Array As String(esteTag.Get(2),c2.GetString("HVD_PRONOMBRE"),1*minimoadesc,esteTag.Get(5),Subs.traeCliente,(pup*minimoadesc),(pup*minimoadesc),esteTag.Get(6),Subs.traerUTAPREV,"PREVENTA",Subs.traeAlmacen, sDate & " " & sTime, Subs.traeUsuario,Subs.traefECHAPREV, Subs.traeRutaReparto,esregalo))
+						Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO(PE_PROID,PE_PRONOMBRE,PE_CANT,PE_CLIENTEOR,PE_CLIENTE,PE_COSTOU,PE_COSTO_TOT,PE_CAJAS,PE_BCAJAS,CONSECUTIVO,PE_RUTA, PE_TIPO,PE_CEDIS,PE_FECHA,PE_USUARIO,FECHA_PREV,RUTA_REP,PE_REGALO) VALUES (?,?,?,?,?,?,?,0,0,?,?,?,?,?,?,?,?,?)", Array As String(esteTag.Get(2),c2.GetString("HVD_PRONOMBRE"),1*minimoadesc,esteTag.Get(5),Subs.traeCliente,(pup),(pup*minimoadesc),esteTag.Get(6),Subs.traerUTAPREV,"PREVENTA",Subs.traeAlmacen, sDate & " " & sTime, Subs.traeUsuario,Subs.traefECHAPREV, Subs.traeRutaReparto,esregalo))
 					Else
-						Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO(PE_PROID,PE_PRONOMBRE,PE_CANT,PE_CLIENTEOR,PE_CLIENTE,PE_COSTOU,PE_COSTO_TOT,PE_CAJAS,PE_BCAJAS,CONSECUTIVO,PE_RUTA, PE_TIPO,PE_CEDIS,PE_FECHA,PE_USUARIO,FECHA_PREV,RUTA_REP,PE_REGALO) VALUES (?,?,?,?,?,?,?,0,0,?,?,?,?,?,?,?,?,?)", Array As String(esteTag.Get(2),c2.GetString("HVD_PRONOMBRE"),1*minimoadesc,esteTag.Get(5),Subs.traeCliente,(preciofull*minimoadesc),(preciofull*minimoadesc),esteTag.Get(6),Subs.traerUTAPREV,"PREVENTA",Subs.traeAlmacen, sDate & " " & sTime, Subs.traeUsuario,Subs.traefECHAPREV, Subs.traeRutaReparto,esregalo))
+						Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO(PE_PROID,PE_PRONOMBRE,PE_CANT,PE_CLIENTEOR,PE_CLIENTE,PE_COSTOU,PE_COSTO_TOT,PE_CAJAS,PE_BCAJAS,CONSECUTIVO,PE_RUTA, PE_TIPO,PE_CEDIS,PE_FECHA,PE_USUARIO,FECHA_PREV,RUTA_REP,PE_REGALO) VALUES (?,?,?,?,?,?,?,0,0,?,?,?,?,?,?,?,?,?)", Array As String(esteTag.Get(2),c2.GetString("HVD_PRONOMBRE"),1*minimoadesc,esteTag.Get(5),Subs.traeCliente,(preciofull),(preciofull*minimoadesc),esteTag.Get(6),Subs.traerUTAPREV,"PREVENTA",Subs.traeAlmacen, sDate & " " & sTime, Subs.traeUsuario,Subs.traefECHAPREV, Subs.traeRutaReparto,esregalo))
 					End If
 					
 				End If

B4A/MAPA_RUTAS.bas

@@ -58,6 +58,8 @@ Sub Globals
 	Dim CODIGO As String
 	Private SEMANA As String
 '	Dim ruta As String
+
+
 End Sub
 
 Sub Activity_Create(FirstTime As Boolean)
@@ -152,9 +154,17 @@ Sub MapFragment1_Ready
 			If esteAzul = 3 Then esteAzul2= NumSerie&"maker-azul2.png"
 			If esteAzul = 4 Then esteAzul2= NumSerie&"maker-azul3.png"
 			If esteAzul = 5 Then esteAzul2= NumSerie&"maker-azul4.png"
-			If esteAzul = 6 Then esteAzul2= NumSerie&"maker-azul5.png"
+			If esteAzul = 6 Then esteAzul2= NumSerie&"maker-azul.png"
-			If esteAzul = 7 Then esteAzul2= NumSerie&"maker-azul7.png"
+			If esteAzul = 7 Then esteAzul2= NumSerie&"maker-azul1.png"
-			If esteAzul = 8 Then esteAzul2= NumSerie&"maker-azul8.png"
+			If esteAzul = 8 Then esteAzul2= NumSerie&"maker-azul2.png"
+			If esteAzul = 9 Then esteAzul2= NumSerie&"maker-azul3.png"
+			If esteAzul = 10 Then esteAzul2= NumSerie&"maker-azul4.png"
+			If esteAzul = 11 Then esteAzul2= NumSerie&"maker-azul.png"
+			If esteAzul = 12 Then esteAzul2= NumSerie&"maker-azul1.png"
+			If esteAzul = 13 Then esteAzul2= NumSerie&"maker-azul2.png"
+			If esteAzul = 14 Then esteAzul2= NumSerie&"maker-azul3.png"
+			If esteAzul = 15 Then esteAzul2= NumSerie&"maker-azul4.png"
+'			
 '			Log(ruta & "|" & esteAzul & "|" & esteAzul2)
 '			Log(NumSerie&" "& Tienda&" --------"& esteAzul2&" --------"&esteAzul)
 			MARK_AZUL = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO,LoadBitmap(File.DirAssets, esteAzul2))

B4A/Mazapa_Reparto.b4a

@@ -3001,12 +3001,12 @@ Module9=C_DetalleVenta
 NumberOfFiles=1470
 NumberOfLibraries=27
 NumberOfModules=30
-Version=12.8
+Version=13.1
 @EndOfDesignText@
 #Region Project Attributes 
 	#ApplicationLabel: MAZAPA Reparto
 	#VersionCode: 1
-	#VersionName: 5.01.12
+	#VersionName: 5.03.31
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/Mazapa_Reparto.b4a.meta

@@ -91,6 +91,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Principal,B4XPage_Created,117,0,C_Principal,B4XPage_Appear,227,6,C_Clientes,B4XPage_Appear,68,0,C_Clientes,ListView1_ItemClick,148,0,C_Clientes,generaListViewRutas,207,0,C_Clientes,BUSCA_TextChanged,236,0,C_Clientes,traeRutaDia,452,0,C_Clientes,traeTodosAVisitar,538,0,C_Clientes,caculaRutaGPS,634,0,MAPA_RUTAS,Globals,40,0,MAPA_RUTAS,MapFragment1_Ready,150,0
+NavigationStack=C_Principal,B4XPage_Created,136,0,C_Productos,B4XPage_Created,66,0,C_Productos,B4XPage_Appear,92,6,C_Productos,Class_Globals,52,0,C_Principal,Class_Globals,100,0,C_Principal,B4XPage_Appear,172,6,Diseñador Visual,principal.bal,-100,6,C_Principal,envioinfo,956,2,C_NoVenta,GUARDA_Click,132,1,C_Cliente,B4XPage_Appear,298,0,C_Cliente,GPS_LocationChanged,339,0
 SelectedBuild=0
-VisibleModules=1,2,3,4,5,6,7,8,9,10,27
+VisibleModules=1,2,6,7,16,30,28,29,17,13

B4A/Objects/AndroidManifest.xml

@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="reparto_mazapa.keymon.lat"
 	android:versionCode="1"
-	android:versionName="5.01.12"
+	android:versionName="5.03.31"
 	android:installLocation="internalOnly">
 	
 	<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="33"/>
@@ -45,12 +45,12 @@
 	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 	<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+	<uses-permission android:name="android.permission.WAKE_LOCK"/>
 	<uses-permission android:name="android.permission.CAMERA"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
 	<uses-permission android:name="reparto_mazapa.keymon.lat.permission.MAPS_RECEIVE"/>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-	<uses-permission android:name="android.permission.WAKE_LOCK"/>
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 	<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
@@ -63,6 +63,7 @@
 	<uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
 	<uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
 	<application
+		android:name="androidx.multidex.MultiDexApplication"
 		android:icon="@drawable/icon"
 		android:label="MAZAPA Reparto"
 		android:theme="@style/LightTheme"
@@ -138,6 +139,26 @@
 			android:name=".appupdater$appupdater_BR"
 			android:exported="true">
 		</receiver>
+		<service
+			android:name=".tracker"
+			android:exported="true"
+			android:foregroundServiceType="location">
+		</service>
+		<receiver
+			android:name=".tracker$tracker_BR"
+			android:exported="true">
+			<intent-filter>
+			<action android:name="android.intent.action.BOOT_COMPLETED"/>
+			</intent-filter>
+		</receiver>
+		<service
+			android:name=".starter"
+			android:exported="true">
+		</service>
+		<receiver
+			android:name=".starter$starter_BR"
+			android:exported="true">
+		</receiver>
 		<activity
 			android:windowSoftInputMode="stateHidden"
 			android:launchMode="singleTop"
@@ -162,26 +183,6 @@
 			android:screenOrientation="portrait"
 			android:exported="true">
 		</activity>
-		<service
-			android:name=".starter"
-			android:exported="true">
-		</service>
-		<receiver
-			android:name=".starter$starter_BR"
-			android:exported="true">
-		</receiver>
-		<service
-			android:name=".tracker"
-			android:exported="true"
-			android:foregroundServiceType="location">
-		</service>
-		<receiver
-			android:name=".tracker$tracker_BR"
-			android:exported="true">
-			<intent-filter>
-			<action android:name="android.intent.action.BOOT_COMPLETED"/>
-			</intent-filter>
-		</receiver>
 		<service
 			android:name=".newinst2"
 			android:exported="true">