diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas
index 4738390..0714da1 100644
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -39,6 +39,7 @@ Sub Class_Globals
 	Public promos As C_Promos
 	Public historico As C_Historico
 
+	Public historicobattodos As C_historicobatyodos
 	Public historicobat As C_historicobat
 	Dim reqManager As DBRequestManager
 	Dim v As String = Application.VersionName
@@ -145,6 +146,9 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	historicobat.Initialize
 	B4XPages.AddPage("historicobat", historicobat)
 	
+	historicobattodos.Initialize
+	B4XPages.AddPage("historicobattodos", historicobattodos)
+	
 	
 	p_Main.Height = Root.Height
 	p_Main.Width = Root.Width
@@ -200,6 +204,13 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_PRO3055(H_IDCLIENTE TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTA_SUPLENCIA(RS_RUTA TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS TICKET_IMPRESO (idCliente TEXT)")
+	
+	
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA_BAT(CLIENTE)")
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS ENCUESTAS_BAT (CLIENTE TEXT,RUTA TEXT,ALMACEN TEXT,P1 TEXT,P2 TEXT,P3 TEXT,P4 TEXT,P5 TEXT,P6 TEXT,P7 TEXT,P8 TEXT,P9 TEXT,P10 TEXT, FECHA TEXT)")
+	
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS hist_ventastodos (HVD_CLIENTE TEX, HVD_PRONOMBRE TEXT, HVD_CANT TEXT, HVD_COSTO_TOT TEXT, HVD_FECHA TEXT)")
+
 '	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_VARIABLES (CAT_VA_DESCRIPCION TEXT, CAT_VA_VALOR TEXT)")
 	Subs.agregaColumna("HIST_ENCUESTA", "HE_LAT", "TEXT")
 	Subs.agregaColumna("HIST_ENCUESTA", "HE_FOTO", "BLOB")
@@ -210,8 +221,13 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.agregaColumna("HIST_ENCUESTA", "HE_LON", "TEXT")
 	Subs.agregaColumna("HIST_VENTAS", "HVD_FECHA", "TEXT")
 	Subs.agregaColumna("kmt_info3", "encuesta", "TEXT")
+	
+	Subs.agregaColumna("hist_ventastodos", "HVD_NUM_TICKET", "TEXT")
+	Subs.agregaColumna("hist_ventastodos", "HVD_CODPROMO", "TEXT")
+	
 	Subs.agregaColumna("kmt_info3", "CAT_CL_CLASIFICADOR3", "TEXT")
 	Subs.agregaColumna("kmt_info3", "CAT_CL_CLASIFICADOR2", "TEXT")
+	Subs.agregaColumna("kmt_info3", "CAT_CL_CLASIFICADOR5", "TEXT")
 	Subs.agregaColumna("kmt_info3", "CAT_CL_TIPOCLIENTE", "TEXT")
 	Subs.agregaColumna("kmt_info3", "CAT_CL_LIMITECREDITO", "TEXT")
 	Subs.agregaColumna("kmt_info3", "CAT_CL_DIASCREDITO", "TEXT")
diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas
index ab46ffe..a3cea1d 100644
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -470,6 +470,22 @@ Sub Class_Globals
 	Private Label22 As Label
 	Private l_animal As Label
 	Private contIguales As Int = 0
+	Private b_ventatb As Button
+	Private scv_bat As ScrollView
+	Private b_cancelencu As Button
+	Private b_guadarenc As Button
+	Private p_encu As Panel
+	Private cb_p1 As B4XComboBox
+	Private cb_p2 As B4XComboBox
+	Private cb_p3 As B4XComboBox
+	Private cb_p4 As B4XComboBox
+	Private cb_p5 As B4XComboBox
+	Dim e_1, e_2, e_3, e_4,e_5,e_6,e_7,e_8,e_9,e_10 As String
+	Private cb_p6 As B4XComboBox
+	Private cb_p7 As B4XComboBox
+	Private cb_p8 As B4XComboBox
+	Private cb_p9 As B4XComboBox
+	Private cb_p10 As B4XComboBox
 End Sub
 
 'You can add more parameters here.
@@ -541,6 +557,13 @@ End Sub
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
 
 Sub B4XPage_Appear
+	
+	Private tc As Cursor = skmt.ExecQuery($"select * from hist_ventastodos where HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)"$)
+	If tc.RowCount > 0 Then
+		b_ventatb.Visible = True
+	Else
+		b_ventatb.Visible = False
+	End If
 	Starter.enCliente = True
 	Tels.Visible = False
 	gest.Visible = False
@@ -549,7 +572,7 @@ Sub B4XPage_Appear
 '	MejorarPrecisionGPS
 '	' Al aparecer la página del cliente
 '	InicializarLocalizacionMejorada
-
+	B4XPages.MainPage.skmt.ExecNonQuery("delete from PEDIDO where PE_CANT <= 0")
 	recalculoXcant
 
 	ImageView4.Bitmap = LoadBitmap(File.DirAssets,"images.png")
@@ -557,6 +580,8 @@ Sub B4XPage_Appear
 	bitacora.inicioFin
 '	iniciofin
 	que_modulo = 1
+	scv_bat.Width = Root.Width
+	scv_bat.Height = Root.Height
 	dentroDeGeocerca = False
 	indicePregunta = 0
 	l_credito.Visible = False
@@ -1424,7 +1449,7 @@ Sub GPS_LocationChanged (Location1 As Location)
 		If contIguales >= 3 Then
 '			contIguales = 0
 '			Log("No hacemos nada")
-			CallSubDelayed(Tracker, "StopFLP")
+'			CallSubDelayed(Tracker, "StopFLP")
 			Return
 		End If
 	Else
@@ -1503,7 +1528,7 @@ Sub GPS_LocationChanged (Location1 As Location)
 		LA_GPS.Text = $"UBICACIÓN - Precisión: ${NumberFormat2(Location1.Accuracy, 0, 1, 1, False)}m"$
 	End If
 	' Solo usar ubicaciones con buena precisión
-	If Location1.Accuracy < 30 Then ' Menos de 30 metros de error
+	If Location1.Accuracy < 60 Then ' Menos de 30 metros de error
 		' Tu lógica actual aquí
 		B4XPages.MainPage.lat_gps = Location1.Latitude
 		B4XPages.MainPage.lon_gps = Location1.Longitude
@@ -1688,6 +1713,8 @@ Sub GPS_LocationChanged (Location1 As Location)
 			LA_GPS.TextColor = Colors.Red
 		End If
 	End If
+	
+	
 
 	If cuenta.StartsWith("N") Then
 		precision = "0"
@@ -1702,7 +1729,7 @@ Sub GPS_LocationChanged (Location1 As Location)
 '	19.4846431, -99.1458691 -> Keymon
 
 	If LA_GEO.IsInitialized Then LA_GEO.Text= $"$1.2{distance/1000} kms"$
-
+	
 '	If distance > 100 Then ToastMessageShow("Fuera de rango GPS", False)
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_GPS")
 	B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO  HIST_GPS (HGDATE, HGLAT, HGLON) VALUES(?,?,?) ", Array As Object (sDate & sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps))
@@ -1894,29 +1921,367 @@ Sub gest_Click
 '	MejorarPrecisionGPS
 '	Sleep(500) ' Esperar un poco para que el GPS se estabilice
 
+	Dim checkenc As Cursor = B4XPages.MainPage.skmt.ExecQuery("select * FROM HIST_ENCUESTA_BAT WHERE CLIENTE In (Select cuenta from cuentaa)")
+	If checkenc.RowCount = 0 Then
+		Dim checkenc1 As Cursor = B4XPages.MainPage.skmt.ExecQuery("select * FROM ENCUESTAS_BAT WHERE CLIENTE In (Select cuenta from cuentaa)")
+		If checkenc1.RowCount = 0 Then
+			
+			If ALMACEN = 88 Or ALMACEN = 92 Then
+		
+				Dim coloressaldo As Cursor=B4XPages.MainPage.skmt.ExecQuery("select IFNULL(CAT_CL_CLASIFICADOR5,0) AS CAT_CL_CLASIFICADOR5 from kmt_info3 where CAT_CL_CODIGO In (Select cuenta from cuentaa)")
+				If coloressaldo.RowCount > 0 Then
+					coloressaldo.Position = 0
+					If coloressaldo.GetString("CAT_CL_CLASIFICADOR5") = "3" Then
+						scv_bat.Visible = True
+						scv_bat.Panel.RemoveAllViews
+						scv_bat.Panel.LoadLayout("encuesta_1")
+						scv_bat.Panel.Height = p_encu.Height
+						p_encu.Width = scv_bat.Width
+		
+		
+						Dim itembat1 As List
+						itembat1.Initialize
+						itembat1.Add("Selecciona una opcion")
+						itembat1.Add("Ninguno")
+						itembat1.Add("Menos de medio paquete")
+						itembat1.Add("Medio paquete a 1 paquete")
+						itembat1.Add("1.1 a 2.9 paquetes")
+						itembat1.Add("3 a 5.9 paquetes")
+						itembat1.Add("6 a 8.9 paquetes")
+						itembat1.Add("9 a 12.9 paquetes")
+						itembat1.Add("13 a 16.9 paquetes")
+						itembat1.Add("17 a 20.9 paquetes")
+						itembat1.Add("21 a 25.9 paquetes")
+						itembat1.Add("26 a 30 paquetes")
+						itembat1.Add("Más de 30 paquetes")
+						cb_p1.SetItems(itembat1)
+						e_1 = "Selecciona una opcion"
+		
+						Dim itembat2 As List
+						itembat2.Initialize
+						itembat2.Add("Selecciona una opcion")
+						itembat2.Add("Ninguno")
+						itembat2.Add("Menos de medio paquete")
+						itembat2.Add("Medio paquete a 1 paquete")
+						itembat2.Add("1.1 a 2.9 paquetes")
+						itembat2.Add("3 a 5.9 paquetes")
+						itembat2.Add("6 a 8.9 paquetes")
+						itembat2.Add("9 a 12.9 paquetes")
+						itembat2.Add("13 a 16.9 paquetes")
+						itembat2.Add("17 a 20.9 paquetes")
+						itembat2.Add("21 a 25.9 paquetes")
+						itembat2.Add("26 a 30 paquetes")
+						itembat2.Add("Más de 30 paquetes")
+						cb_p2.SetItems(itembat2)
+						e_2 = "Selecciona una opcion"
+		
+						Dim itembat3 As List
+						itembat3.Initialize
+						itembat3.Add("Selecciona una opcion")
+						itembat3.Add("Ninguno")
+						itembat3.Add("Menos de medio paquete")
+						itembat3.Add("Medio paquete a 1 paquete")
+						itembat3.Add("1.1 a 2.9 paquetes")
+						itembat3.Add("3 a 5.9 paquetes")
+						itembat3.Add("6 a 8.9 paquetes")
+						itembat3.Add("9 a 12.9 paquetes")
+						itembat3.Add("13 a 16.9 paquetes")
+						itembat3.Add("17 a 20.9 paquetes")
+						itembat3.Add("21 a 25.9 paquetes")
+						itembat3.Add("26 a 30 paquetes")
+						itembat3.Add("Más de 30 paquetes")
+						cb_p3.SetItems(itembat3)
+						e_3 = "Selecciona una opcion"
+		
+						Dim itembat4 As List
+						itembat4.Initialize
+						itembat4.Add("Selecciona una opcion")
+						itembat4.Add("Ninguno")
+						itembat4.Add("Menos de medio paquete")
+						itembat4.Add("Medio paquete a 1 paquete")
+						itembat4.Add("1.1 a 2.9 paquetes")
+						itembat4.Add("3 a 5.9 paquetes")
+						itembat4.Add("6 a 8.9 paquetes")
+						itembat4.Add("9 a 12.9 paquetes")
+						itembat4.Add("13 a 16.9 paquetes")
+						itembat4.Add("17 a 20.9 paquetes")
+						itembat4.Add("21 a 25.9 paquetes")
+						itembat4.Add("26 a 30 paquetes")
+						itembat4.Add("Más de 30 paquetes")
+						cb_p4.SetItems(itembat4)
+						e_4 = "Selecciona una opcion"
+		
+						Dim itembat5 As List
+						itembat5.Initialize
+						itembat5.Add("Selecciona una opcion")
+						itembat5.Add("Ninguno")
+						itembat5.Add("Tiendatek")
+						itembat5.Add("Yomp")
+						itembat5.Add("Systienda")
+						itembat5.Add("MyBusiness POS")
+						itembat5.Add("Eleventa")
+						itembat5.Add("Otro")
+						cb_p5.SetItems(itembat5)
+						e_5 = "Selecciona una opcion"
+					Else If coloressaldo.GetString("CAT_CL_CLASIFICADOR5") = "6" Then
+				
+						scv_bat.Visible = True
+						scv_bat.Panel.RemoveAllViews
+						scv_bat.Panel.LoadLayout("encuesta_2")
+						scv_bat.Panel.Height = p_encu.Height
+						p_encu.Width = scv_bat.Width
+		
+		
+						Dim itembat1 As List
+						itembat1.Initialize
+						itembat1.Add("Selecciona una opcion")
+						itembat1.Add("Ninguno")
+						itembat1.Add("Menos de medio cartón")
+						itembat1.Add("Medio cartón a 1 cartón")
+						itembat1.Add("1.1 a 1.9 cartones")
+						itembat1.Add("2 a 2.9 cartones")
+						itembat1.Add("3 a 3.9 cartones")
+						itembat1.Add("4 a 4.9 cartones")
+						itembat1.Add("5 a 7.9 cartones")
+						itembat1.Add("8 a 10.9 cartones")
+						itembat1.Add("11 a 15.9 cartones")
+						itembat1.Add("16 a 20.9 cartones")
+						itembat1.Add("21 a 25.9 cartones")
+						itembat1.Add("26 a 30.9 cartones")
+						itembat1.Add("31 a 40 cartones")
+						itembat1.Add("Más de 40 cartones")
+						cb_p1.SetItems(itembat1)
+						e_1 = "Selecciona una opcion"
+		
+						Dim itembat2 As List
+						itembat2.Initialize
+						itembat2.Add("Selecciona una opcion")
+						itembat2.Add("Ninguno")
+						itembat2.Add("Menos de medio cartón")
+						itembat2.Add("Medio cartón a 1 cartón")
+						itembat2.Add("1.1 a 1.9 cartones")
+						itembat2.Add("2 a 2.9 cartones")
+						itembat2.Add("3 a 3.9 cartones")
+						itembat2.Add("4 a 4.9 cartones")
+						itembat2.Add("5 a 7.9 cartones")
+						itembat2.Add("8 a 10.9 cartones")
+						itembat2.Add("11 a 15.9 cartones")
+						itembat2.Add("16 a 20.9 cartones")
+						itembat2.Add("21 a 25.9 cartones")
+						itembat2.Add("26 a 30.9 cartones")
+						itembat2.Add("31 a 40 cartones")
+						itembat2.Add("Más de 40 cartones")
+						cb_p2.SetItems(itembat2)
+						e_2 = "Selecciona una opcion"
+		
+						Dim itembat3 As List
+						itembat3.Initialize
+						itembat3.Add("Selecciona una opcion")
+						itembat3.Add("Ninguno")
+						itembat3.Add("Menos de medio cartón")
+						itembat3.Add("Medio cartón a 1 cartón")
+						itembat3.Add("1.1 a 1.9 cartones")
+						itembat3.Add("2 a 2.9 cartones")
+						itembat3.Add("3 a 3.9 cartones")
+						itembat3.Add("4 a 4.9 cartones")
+						itembat3.Add("5 a 7.9 cartones")
+						itembat3.Add("8 a 10.9 cartones")
+						itembat3.Add("11 a 15.9 cartones")
+						itembat3.Add("16 a 20.9 cartones")
+						itembat3.Add("21 a 25.9 cartones")
+						itembat3.Add("26 a 30.9 cartones")
+						itembat3.Add("31 a 40 cartones")
+						itembat3.Add("Más de 40 cartones")
+						cb_p3.SetItems(itembat3)
+						e_3 = "Selecciona una opcion"
+		
+						Dim itembat4 As List
+						itembat4.Initialize
+						itembat4.Add("Selecciona una opcion")
+						itembat4.Add("Ninguno")
+						itembat4.Add("Menos de medio cartón")
+						itembat4.Add("Medio cartón a 1 cartón")
+						itembat4.Add("1.1 a 1.9 cartones")
+						itembat4.Add("2 a 2.9 cartones")
+						itembat4.Add("3 a 3.9 cartones")
+						itembat4.Add("4 a 4.9 cartones")
+						itembat4.Add("5 a 7.9 cartones")
+						itembat4.Add("8 a 10.9 cartones")
+						itembat4.Add("11 a 15.9 cartones")
+						itembat4.Add("16 a 20.9 cartones")
+						itembat4.Add("21 a 25.9 cartones")
+						itembat4.Add("26 a 30.9 cartones")
+						itembat4.Add("31 a 40 cartones")
+						itembat4.Add("Más de 40 cartones")
+						cb_p4.SetItems(itembat4)
+						e_4 = "Selecciona una opcion"
+		
+						Dim itembat5 As List
+						itembat5.Initialize
+						itembat5.Add("Selecciona una opcion")
+						itembat5.Add("Ninguno")
+						itembat5.Add("Menos de medio cartón")
+						itembat5.Add("Medio cartón a 1 cartón")
+						itembat5.Add("1.1 a 1.9 cartones")
+						itembat5.Add("2 a 2.9 cartones")
+						itembat5.Add("3 a 3.9 cartones")
+						itembat5.Add("4 a 4.9 cartones")
+						itembat5.Add("5 a 7.9 cartones")
+						itembat5.Add("8 a 10.9 cartones")
+						itembat5.Add("11 a 15.9 cartones")
+						itembat5.Add("16 a 20.9 cartones")
+						itembat5.Add("21 a 25.9 cartones")
+						itembat5.Add("26 a 30.9 cartones")
+						itembat5.Add("31 a 40 cartones")
+						itembat5.Add("Más de 40 cartones")
+						cb_p5.SetItems(itembat5)
+						e_5 = "Selecciona una opcion"
+				
+						Dim itembat6 As List
+						itembat6.Initialize
+						itembat6.Add("Selecciona una opcion")
+						itembat6.Add("Ninguno")
+						itembat6.Add("Menos de medio cartón")
+						itembat6.Add("Medio cartón a 1 cartón")
+						itembat6.Add("1.1 a 1.9 cartones")
+						itembat6.Add("2 a 2.9 cartones")
+						itembat6.Add("3 a 3.9 cartones")
+						itembat6.Add("4 a 4.9 cartones")
+						itembat6.Add("5 a 7.9 cartones")
+						itembat6.Add("8 a 10.9 cartones")
+						itembat6.Add("11 a 15.9 cartones")
+						itembat6.Add("16 a 20.9 cartones")
+						itembat6.Add("21 a 25.9 cartones")
+						itembat6.Add("26 a 30.9 cartones")
+						itembat6.Add("31 a 40 cartones")
+						itembat6.Add("Más de 40 cartones")
+						cb_p6.SetItems(itembat6)
+						e_6 = "Selecciona una opcion"
+				
+						Dim itembat7 As List
+						itembat7.Initialize
+						itembat7.Add("Selecciona una opcion")
+						itembat7.Add("Ninguno")
+						itembat7.Add("Menos de medio cartón")
+						itembat7.Add("Medio cartón a 1 cartón")
+						itembat7.Add("1.1 a 1.9 cartones")
+						itembat7.Add("2 a 2.9 cartones")
+						itembat7.Add("3 a 3.9 cartones")
+						itembat7.Add("4 a 4.9 cartones")
+						itembat7.Add("5 a 7.9 cartones")
+						itembat7.Add("8 a 10.9 cartones")
+						itembat7.Add("11 a 15.9 cartones")
+						itembat7.Add("16 a 20.9 cartones")
+						itembat7.Add("21 a 25.9 cartones")
+						itembat7.Add("26 a 30.9 cartones")
+						itembat7.Add("31 a 40 cartones")
+						itembat7.Add("Más de 40 cartones")
+						cb_p7.SetItems(itembat7)
+						e_7 = "Selecciona una opcion"
+				
+						Dim itembat8 As List
+						itembat8.Initialize
+						itembat8.Add("Selecciona una opcion")
+						itembat8.Add("Ninguno")
+						itembat8.Add("Menos de medio cartón")
+						itembat8.Add("Medio cartón a 1 cartón")
+						itembat8.Add("1.1 a 1.9 cartones")
+						itembat8.Add("2 a 2.9 cartones")
+						itembat8.Add("3 a 3.9 cartones")
+						itembat8.Add("4 a 4.9 cartones")
+						itembat8.Add("5 a 7.9 cartones")
+						itembat8.Add("8 a 10.9 cartones")
+						itembat8.Add("11 a 15.9 cartones")
+						itembat8.Add("16 a 20.9 cartones")
+						itembat8.Add("21 a 25.9 cartones")
+						itembat8.Add("26 a 30.9 cartones")
+						itembat8.Add("31 a 40 cartones")
+						itembat8.Add("Más de 40 cartones")
+						cb_p8.SetItems(itembat8)
+						e_8 = "Selecciona una opcion"
+				
+						Dim itembat9 As List
+						itembat9.Initialize
+						itembat9.Add("Selecciona una opcion")
+						itembat9.Add("Ninguno")
+						itembat9.Add("Menos de medio cartón")
+						itembat9.Add("Medio cartón a 1 cartón")
+						itembat9.Add("1.1 a 1.9 cartones")
+						itembat9.Add("2 a 2.9 cartones")
+						itembat9.Add("3 a 3.9 cartones")
+						itembat9.Add("4 a 4.9 cartones")
+						itembat9.Add("5 a 7.9 cartones")
+						itembat9.Add("8 a 10.9 cartones")
+						itembat9.Add("11 a 15.9 cartones")
+						itembat9.Add("16 a 20.9 cartones")
+						itembat9.Add("21 a 25.9 cartones")
+						itembat9.Add("26 a 30.9 cartones")
+						itembat9.Add("31 a 40 cartones")
+						itembat9.Add("Más de 40 cartones")
+						cb_p9.SetItems(itembat9)
+						e_9 = "Selecciona una opcion"
+				
+						Dim itembat10 As List
+						itembat10.Initialize
+						itembat10.Add("Selecciona una opcion")
+						itembat10.Add("Ninguno")
+						itembat10.Add("Menos de medio cartón")
+						itembat10.Add("Medio cartón a 1 cartón")
+						itembat10.Add("1.1 a 1.9 cartones")
+						itembat10.Add("2 a 2.9 cartones")
+						itembat10.Add("3 a 3.9 cartones")
+						itembat10.Add("4 a 4.9 cartones")
+						itembat10.Add("5 a 7.9 cartones")
+						itembat10.Add("8 a 10.9 cartones")
+						itembat10.Add("11 a 15.9 cartones")
+						itembat10.Add("16 a 20.9 cartones")
+						itembat10.Add("21 a 25.9 cartones")
+						itembat10.Add("26 a 30.9 cartones")
+						itembat10.Add("31 a 40 cartones")
+						itembat10.Add("Más de 40 cartones")
+						cb_p10.SetItems(itembat10)
+						e_10 = "Selecciona una opcion"
+					Else
+						vent
+					End If
+				End If
+			Else
+				vent
+			End If
+			
+		Else
+			vent
+		End If
+	Else
+		vent
+	End If
+	
+End Sub
+
+Sub vent
 	Dim pagarepen As Cursor = B4XPages.MainPage.skmt.ExecQuery("select FECHA, SALDO_PENDIENTE FROM ABONOSP WHERE CLIENTE IN (SELECT CUENTA FROM CUENTAA)")
 	If pagarepen.RowCount > 0 Then
 		pagarepen.Position = 0
 		DateTime.DateFormat="dd/MM/yyyy"
 		Dim FechaInicio As String = pagarepen.GetString("FECHA")  ' Formato: dd/MM/yyyy
-'		Dim FechaHoy As String = DateTime.Date(DateTime.Now)  ' Fecha actual en formato dd/MM/yyyy
+		'		Dim FechaHoy As String = DateTime.Date(DateTime.Now)  ' Fecha actual en formato dd/MM/yyyy
 		Log(pagarepen.GetString("FECHA"))
-
+	
 		' Convertir las fechas a milisegundos (desde 01/01/1970)
 		Dim TicksInicio As Long = DateTime.DateParse(FechaInicio)
 		Dim TicksHoy As Long = DateTime.DateParse(DateTime.Date(DateTime.Now))
-
+	
 		' Calcular diferencia en días
 		Dim DiferenciaDias As Int = (TicksHoy - TicksInicio) / DateTime.TicksPerDay
-
+	
 		' Mostrar resultado
 		Log($"Días transcurridos: ${DiferenciaDias}"$)
-
+	
 		c=B4XPages.MainPage.skmt.ExecQuery("select IFNULL(CAT_CL_DIASCREDITO,0) AS CAT_CL_DIASCREDITO from kmt_info3 where CAT_CL_CODIGO In (Select cuenta from cuentaa)")
 		c.Position = 0
-
+	
 		If DiferenciaDias <= c.GetInt("CAT_CL_DIASCREDITO") + 1 Then
-'			MsgboxAsync($"Favor de pagar su credito el día de mañana por un monto  de $${pagarepen.GetString("SALDO_PENDIENTE")}"$, "Recordatorio")
+			'			MsgboxAsync($"Favor de pagar su credito el día de mañana por un monto  de $${pagarepen.GetString("SALDO_PENDIENTE")}"$, "Recordatorio")
 			Msgbox2Async($"Favor de pagar su credito el día de mañana por un monto  de $${pagarepen.GetString("SALDO_PENDIENTE")}"$, "Recordatorio", "Ok", "", "", LoadBitmap(File.DirAssets,"alert2.png"), False)
 			Wait For Msgbox_Result (resultado As Int)
 			If resultado = DialogResponse.POSITIVE Then
@@ -1950,7 +2315,7 @@ Sub gestionar
 					Starter.encuesta = 0
 					Dim cmd As DBCommand
 					skmt.ExecNonQuery2("UPDATE kmt_info3 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(2))
-					ToastMessageShow("La aplicación Tienda 360 no está instalada o no puede manejar la URL.", True)
+'					ToastMessageShow("La aplicación Tienda 360 no está instalada o no puede manejar la URL.", True)
 					compra
 				End Try
 				cmd.Initialize
@@ -1981,7 +2346,7 @@ Sub gestionar
 				Starter.encuesta = 0
 				Dim cmd As DBCommand
 				skmt.ExecNonQuery2("UPDATE kmt_info3 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(2))
-				ToastMessageShow("La aplicación Tienda 360 no está instalada o no puede manejar la URL.", True)
+'				ToastMessageShow("La aplicación Tienda 360 no está instalada o no puede manejar la URL.", True)
 				compra
 			End Try
 			cmd.Initialize
@@ -1992,6 +2357,92 @@ Sub gestionar
 			compra
 		End If
 	End If
+End Sub
+
+Sub Mandapedido
+	
+'		PEDIDO
+	c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM PEDIDO WHERE (PE_RECALCULO = ? or PE_RECALCULO = ? or PE_RECALCULO IS NULL)",Array As String("","null"))
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "insert_pedido_GV2"
+			cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), Subs.traeAlmacen, 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"))
+			B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+		Next
+	End If
+	c.Close
+	
+	' NOVENTA
+	c=B4XPages.MainPage.skmt.ExecQuery("SELECT NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON FROM NOVENTA")
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "insert_noventa_GV2"
+			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"), Subs.traeAlmacen, Subs.traeRuta2(C.GetString("NV_CLIENTE")))
+			B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa")
+		Next
+	End If
+	c.Close
+	
+	
+	c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE ")
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "insert_pedidos_GV3"
+			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"),Subs.traeAlmacen,Subs.traeRuta2(C.GetString("PC_CLIENTE")),C.GetString("PC_COSTO_SIN"),C.GetString("PC_FACTURA") )
+			B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedidos")
+		Next
+	End If
+	c.Close
+
+'		If Subs.traeAlmacen = "88" Or Subs.traeAlmacen = "6" Then
+	c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_RECALCULO,PE_RECALCULOTOT,ifnull(PE_RECCEDIS,'') as PE_RECCEDIS,PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,ifnull(PE_CANT,0) as PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, IFNULL(PE_RECCANT,0) AS PE_RECCANT FROM PEDIDO WHERE PE_RECALCULO <> ? or PE_RECALCULO <> ? or PE_RECALCULO IS NOT NULL",Array As String("","null"))
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			If c.GetString("PE_RECCEDIS") = "" Then
+				Dim cmd As DBCommand
+				cmd.Initialize
+				cmd.Name = "insert_pedido_GV2"
+				cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), Subs.traeAlmacen, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), 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"))
+				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+			Else
+				If c.GetString("PE_RECCANT") = c.GetString("PE_CANT") Then
+					Dim cmd As DBCommand
+					cmd.Initialize
+					cmd.Name = "insert_pedido_GV2"
+					cmd.Parameters = Array As Object(C.GetString("PE_RECCEDIS"), Subs.traeAlmacen, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), 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"))
+					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+				Else
+					'Con descuento
+					Dim cmd As DBCommand
+					cmd.Initialize
+					cmd.Name = "insert_pedido_GV2"
+					cmd.Parameters = Array As Object(C.GetString("PE_RECCEDIS"), Subs.traeAlmacen, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), C.GetString("PE_RECCANT"), 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"))
+					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+					'Sin descuento
+					Dim cmd As DBCommand
+					cmd.Initialize
+					cmd.Name = "insert_pedido_GV2"
+					cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), Subs.traeAlmacen, NumberFormat2((C.GetString("PE_CANT")-C.GetString("PE_RECCANT"))*C.GetString("PE_COSTOU"),1,2,2,False), C.GetString("PE_COSTOU"), (C.GetString("PE_CANT")-C.GetString("PE_RECCANT")), 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"))
+					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+				End If
+			End If
+		Next
+	End If
+	c.Close
+	
+	
+
+
 End Sub
 
 Sub compra
@@ -2717,6 +3168,8 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 		Return False
 	else If p_encuesta.Visible Then
 		p_encuesta.Visible = False
+	else If scv_bat.Visible Then
+		scv_bat.Visible = False
 	Else iF p_camara.Visible Then
 		Return False
 '		p_camara.Visible = False
@@ -2828,6 +3281,9 @@ Sub Guardar_Click
 '	End If
 	'##########################  TERMINA CODIGO PARA CREDITOS ####################
 '	B4XPages.ShowPage("Principal")
+	If Subs.traeAlmacen <> "43" Then
+		Mandapedido
+	End If
 End Sub
 
 Sub Guardar_LongClick
@@ -3058,7 +3514,7 @@ Sub Impresion3
 
 					Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_RECALCULO") & "   $" & s.GETSTRING("PE_COSTO_TOTREC") &  eLINEFEED &  eLINEFEED )
 
-					Printer1.WriteString(BLANCO & "PL $" & s.GETSTRING("PE_COSTOU") & " Desc.: " & descpro.GetDouble("CAT_PD_DESCUENTO")&"%" &  eLINEFEED &  eLINEFEED)
+'					Printer1.WriteString(BLANCO & "PL $" & s.GETSTRING("PE_COSTOU") & " Desc.: " & descpro.GetDouble("CAT_PD_DESCUENTO")&"%" &  eLINEFEED &  eLINEFEED)
 					TAMANO = 0
 					ESPACIO = 21
 					BLANCO = " "
@@ -6958,4 +7414,104 @@ End Sub
 
 Private Sub p_deuda_Click
 	p_deuda.Visible = False
+End Sub
+
+Private Sub b_ventatb_Click
+	B4XPages.ShowPage("historicobattodos")
+End Sub
+
+Private Sub b_guadarenc_Click
+	DateTime.DateFormat = "dd/MM/yyyy"
+	sDate=DateTime.Date(DateTime.Now)
+	sTime=DateTime.Time(DateTime.Now)
+	Dim coloressaldo As Cursor=B4XPages.MainPage.skmt.ExecQuery("select IFNULL(CAT_CL_CLASIFICADOR5,0) AS CAT_CL_CLASIFICADOR5 from kmt_info3 where CAT_CL_CODIGO In (Select cuenta from cuentaa)")
+	If coloressaldo.RowCount > 0 Then
+		coloressaldo.Position = 0
+		If coloressaldo.GetString("CAT_CL_CLASIFICADOR5") = "3" Then
+			If e_1 <> "Selecciona una opcion" And e_2 <> "Selecciona una opcion" And e_3<> "Selecciona una opcion" And e_4 <> "Selecciona una opcion" And e_5 <> "Selecciona una opcion" Then
+				B4XPages.MainPage.skmt.ExecNonQuery($"insert into ENCUESTAS_BAT (CLIENTE, RUTA, ALMACEN, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10,FECHA) values ('${Subs.traeCliente}', '${Subs.traeRuta}', '${Subs.traeAlmacen}', '${e_1}', '${e_2}', '${e_3}', '${e_4}', '${e_5}', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A' , '${sDate}')"$)
+				scv_bat.Visible = False
+				' ENCUESTAS BAT
+				c=B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM ENCUESTAS_BAT WHERE CLIENTE IN (SELECT CUENTA FROM CUENTAA)")
+				If c.RowCount>0 Then
+					For i=0 To c.RowCount -1
+						c.Position=i
+						Dim cmd As DBCommand
+						cmd.Initialize
+						cmd.Name = "insert_encuestas_bat_guna"
+						cmd.Parameters = Array As Object(c.GetString("CLIENTE"),c.GetString("RUTA"),c.GetString("ALMACEN"),c.GetString("FECHA"),c.GetString("P1"),c.GetString("P2"),c.GetString("P3"),c.GetString("P4"),c.GetString("P5"),c.GetString("P6"),c.GetString("P7"),c.GetString("P8"),c.GetString("P9"),c.GetString("P10"))
+						B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "INSENCUESTAS")
+					Next
+				End If
+				vent
+			Else
+				MsgboxAsync("Favor de responder todas las preguntas","Atención")
+			End If
+		Else If coloressaldo.GetString("CAT_CL_CLASIFICADOR5") = "6" Then
+			If e_1 <> "Selecciona una opcion" And e_2 <> "Selecciona una opcion" And e_3<> "Selecciona una opcion" And e_4 <> "Selecciona una opcion" And e_5 <> "Selecciona una opcion" And e_6 <> "Selecciona una opcion" And e_7 <> "Selecciona una opcion" And e_8<> "Selecciona una opcion" And e_9 <> "Selecciona una opcion" And e_10 <> "Selecciona una opcion" Then
+				B4XPages.MainPage.skmt.ExecNonQuery($"insert into ENCUESTAS_BAT (CLIENTE, RUTA, ALMACEN, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10,FECHA) values ('${Subs.traeCliente}', '${Subs.traeRuta}', '${Subs.traeAlmacen}', '${e_1}', '${e_2}', '${e_3}', '${e_4}', '${e_5}', '${e_6}', '${e_7}', '${e_8}', '${e_9}', '${e_10}' , '${sDate}')"$)
+				scv_bat.Visible = False
+				' ENCUESTAS BAT
+				c=B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM ENCUESTAS_BAT WHERE CLIENTE IN (SELECT CUENTA FROM CUENTAA)")
+				If c.RowCount>0 Then
+					For i=0 To c.RowCount -1
+						c.Position=i
+						Dim cmd As DBCommand
+						cmd.Initialize
+						cmd.Name = "insert_encuestas_bat_guna"
+						cmd.Parameters = Array As Object(c.GetString("CLIENTE"),c.GetString("RUTA"),c.GetString("ALMACEN"),c.GetString("FECHA"),c.GetString("P1"),c.GetString("P2"),c.GetString("P3"),c.GetString("P4"),c.GetString("P5"),c.GetString("P6"),c.GetString("P7"),c.GetString("P8"),c.GetString("P9"),c.GetString("P10"))
+						B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "INSENCUESTAS")
+					Next
+				End If
+				vent
+			Else
+				MsgboxAsync("Favor de responder todas las preguntas","Atención")
+			End If
+		End If
+	End If
+	
+End Sub
+
+Private Sub b_cancelencu_Click
+	scv_bat.Visible = False
+End Sub
+
+Private Sub cb_p10_SelectedIndexChanged (Index As Int)
+	e_10 = Sender.As(B4XComboBox).SelectedItem
+End Sub
+
+Private Sub cb_p9_SelectedIndexChanged (Index As Int)
+	e_9 = Sender.As(B4XComboBox).SelectedItem
+End Sub
+
+Private Sub cb_p8_SelectedIndexChanged (Index As Int)
+	e_8 = Sender.As(B4XComboBox).SelectedItem
+End Sub
+
+Private Sub cb_p7_SelectedIndexChanged (Index As Int)
+	e_7 = Sender.As(B4XComboBox).SelectedItem
+End Sub
+
+Private Sub cb_p6_SelectedIndexChanged (Index As Int)
+	e_6 = Sender.As(B4XComboBox).SelectedItem
+End Sub
+
+Private Sub cb_p5_SelectedIndexChanged (Index As Int)
+	e_5 = Sender.As(B4XComboBox).SelectedItem
+End Sub
+
+Private Sub cb_p4_SelectedIndexChanged (Index As Int)
+	e_4 = Sender.As(B4XComboBox).SelectedItem
+End Sub
+
+Private Sub cb_p3_SelectedIndexChanged (Index As Int)
+	e_3 = Sender.As(B4XComboBox).SelectedItem
+End Sub
+
+Private Sub cb_p2_SelectedIndexChanged (Index As Int)
+	e_2 = Sender.As(B4XComboBox).SelectedItem
+End Sub
+
+Private Sub cb_p1_SelectedIndexChanged (Index As Int)
+	e_1 = Sender.As(B4XComboBox).SelectedItem
 End Sub
\ No newline at end of file
diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas
index a8eda6e..61c4d54 100644
--- a/B4A/C_NoVenta.bas
+++ b/B4A/C_NoVenta.bas
@@ -140,6 +140,95 @@ Sub GUARDA_Click
 	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_TOT = ?  where HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(stay_hh + stay_mi + stay_ss))
 	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_OUT set HSO_FIN = ?  ", Array As Object(sTime))
 	DateTime.TimeFormat = "HH:mm:ss"
+	If Subs.traeAlmacen <> "43" Then
+		Mandapedido
+	End If
 	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, motivo, r_1.Checked, B4XPages.MainPage.cliente.bitacora.banderaGeoCerca)
 	B4XPages.ShowPage("Principal")
+End Sub
+
+
+Sub Mandapedido
+	
+'		PEDIDO
+	c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM PEDIDO WHERE (PE_RECALCULO = ? or PE_RECALCULO = ? or PE_RECALCULO IS NULL)",Array As String("","null"))
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "insert_pedido_GV2"
+			cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), Subs.traeAlmacen, 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"))
+			B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+		Next
+	End If
+	c.Close
+	
+	' NOVENTA
+	c=B4XPages.MainPage.skmt.ExecQuery("SELECT NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON FROM NOVENTA")
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "insert_noventa_GV2"
+			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"), Subs.traeAlmacen, Subs.traeRuta2(C.GetString("NV_CLIENTE")))
+			B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa")
+		Next
+	End If
+	c.Close
+	
+	
+	c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE ")
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "insert_pedidos_GV3"
+			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"),Subs.traeAlmacen,Subs.traeRuta2(C.GetString("PC_CLIENTE")),C.GetString("PC_COSTO_SIN"),C.GetString("PC_FACTURA") )
+			B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedidos")
+		Next
+	End If
+	c.Close
+
+'		If Subs.traeAlmacen = "88" Or Subs.traeAlmacen = "6" Then
+	c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_RECALCULO,PE_RECALCULOTOT,ifnull(PE_RECCEDIS,'') as PE_RECCEDIS,PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,ifnull(PE_CANT,0) as PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, IFNULL(PE_RECCANT,0) AS PE_RECCANT FROM PEDIDO WHERE PE_RECALCULO <> ? or PE_RECALCULO <> ? or PE_RECALCULO IS NOT NULL",Array As String("","null"))
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			If c.GetString("PE_RECCEDIS") = "" Then
+				Dim cmd As DBCommand
+				cmd.Initialize
+				cmd.Name = "insert_pedido_GV2"
+				cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), Subs.traeAlmacen, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), 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"))
+				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+			Else
+				If c.GetString("PE_RECCANT") = c.GetString("PE_CANT") Then
+					Dim cmd As DBCommand
+					cmd.Initialize
+					cmd.Name = "insert_pedido_GV2"
+					cmd.Parameters = Array As Object(C.GetString("PE_RECCEDIS"), Subs.traeAlmacen, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), 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"))
+					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+				Else
+					'Con descuento
+					Dim cmd As DBCommand
+					cmd.Initialize
+					cmd.Name = "insert_pedido_GV2"
+					cmd.Parameters = Array As Object(C.GetString("PE_RECCEDIS"), Subs.traeAlmacen, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), C.GetString("PE_RECCANT"), 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"))
+					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+					'Sin descuento
+					Dim cmd As DBCommand
+					cmd.Initialize
+					cmd.Name = "insert_pedido_GV2"
+					cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), Subs.traeAlmacen, NumberFormat2((C.GetString("PE_CANT")-C.GetString("PE_RECCANT"))*C.GetString("PE_COSTOU"),1,2,2,False), C.GetString("PE_COSTOU"), (C.GetString("PE_CANT")-C.GetString("PE_RECCANT")), 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"))
+					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+				End If
+			End If
+		Next
+	End If
+	c.Close
+	
+
+
 End Sub
\ No newline at end of file
diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas
index 558193c..a0a1b0b 100644
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -177,7 +177,7 @@ Sub Class_Globals
 	
 	Dim sDate,sTime As String
 	Dim HORAINGRESO As String
-	
+	Dim distancealm As Long
 	Private L_QUALA As Label
 	Private L_FERRERO As Label
 	Private L_SANMARCOS As Label
@@ -385,6 +385,14 @@ Sub B4XPage_Appear
 		If Starter.marcaCel <> "Sony" Then ToastMessageShow("Es necesario tener el GPS encendido", True)
 		StartActivity(Starter.gps.LocationSettingsIntent)
 	End If
+	
+	If Tracker.FLP.GetLastKnownLocation.IsInitialized Then 'Si tenemos "UltimaUbicaccionConocida" la usamos.
+		B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude
+		B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude
+		Log($"Tenemos UUC: ${Tracker.FLP.GetLastKnownLocation.Latitude},${Tracker.FLP.GetLastKnownLocation.Longitude}"$)
+		GPS_LocationChanged(Tracker.FLP.GetLastKnownLocation)
+	End If
+	
 	c=B4XPages.MainPage.skmt.ExecQuery2("select count(*) as CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("FECHA"))
 	c.Position = 0
 	If c.GetString("CUANTOS") = 0 Then
@@ -541,6 +549,23 @@ Sub B4XPage_Appear
 End Sub
 
 Sub Subir_Click
+	Dim envia As Boolean = False
+	Dim env As Cursor = Starter.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'ENVIOALMACEN'")
+	If env.RowCount > 0 Then
+		env.Position = 0
+		If env.GetString("CAT_VA_VALOR") = 0 Then
+			envia = True
+		Else
+			If distancealm < 100 Then
+				envia = True
+			End If
+		End If
+	End If
+	
+	
+	If envia Then
+		
+	
 	checaPedido
 	CARGA = "SUBIR"
 	P1.Visible = True
@@ -628,7 +653,21 @@ Sub Subir_Click
 				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_QR2")
 			Next
 		End If
-		c.Close
+			c.Close
+		
+			' ENCUESTAS BAT
+			c=B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM ENCUESTAS_BAT")
+			If c.RowCount>0 Then
+				For i=0 To c.RowCount -1
+					c.Position=i
+					Dim cmd As DBCommand
+					cmd.Initialize
+					cmd.Name = "insert_encuestas_bat_guna"
+					cmd.Parameters = Array As Object(c.GetString("CLIENTE"),c.GetString("RUTA"),c.GetString("ALMACEN"),c.GetString("FECHA"),c.GetString("P1"),c.GetString("P2"),c.GetString("P3"),c.GetString("P4"),c.GetString("P5"),c.GetString("P6"),c.GetString("P7"),c.GetString("P8"),c.GetString("P9"),c.GetString("P10"))
+					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "INSENCUESTAS")
+				Next
+			End If
+			c.Close
 		
 		' Plan Lealtad
 		c=B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM PLAN_LEALTAD WHERE DESCARGADO IS NULL")
@@ -644,19 +683,19 @@ Sub Subir_Click
 		End If
 		c.Close
 		
-		' Plan Lealtad
-		c=B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM COMENTARIOS WHERE DESCARGADO IS NULL")
-		If c.RowCount>0 Then
-			For i=0 To c.RowCount -1
-				c.Position=i
-				Dim cmd As DBCommand
-				cmd.Initialize
-				cmd.Name = "insert_coments_GUNA"
-				cmd.Parameters = Array As Object(C.GetString("COMENTARTIO"),C.GetString("CLIENTE"),Subs.traeAlmacen,Subs.traeRuta)
-				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "INS_coment")
-			Next
-		End If
-		c.Close
+'		' Plan Lealtad
+'		c=B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM COMENTARIOS WHERE DESCARGADO IS NULL")
+'		If c.RowCount>0 Then
+'			For i=0 To c.RowCount -1
+'				c.Position=i
+'				Dim cmd As DBCommand
+'				cmd.Initialize
+'				cmd.Name = "insert_coments_GUNA"
+'				cmd.Parameters = Array As Object(C.GetString("COMENTARTIO"),C.GetString("CLIENTE"),Subs.traeAlmacen,Subs.traeRuta)
+'				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "INS_coment")
+'			Next
+'		End If
+'		c.Close
 		
 		
 		Dim fotomostrar1 As Cursor = Starter.skmt.ExecQuery("SELECT * FROM kmt_info3 where foto is not NULL")
@@ -966,6 +1005,9 @@ Sub Subir_Click
 		Next
 	End If
 	x.Close
+	Else
+		MsgboxAsync("Para poder enviar informacion debes de estar en el almacen.","Atención")
+	End If
 End Sub
 
 Sub cargar_Click
@@ -989,6 +1031,9 @@ Sub cargar_Click
 	Log(Rut_Rep)
 	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE GPS SET HABILITADO = (?)",Array As Object(0))
 	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("CARGA_DIA"))
+	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("ENVIOALMACEN"))
+	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("RULAT"))
+	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("RULONG"))
 	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("pasword"))
 	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LATITUD"))
 	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("GEOCERCA"))
@@ -1088,6 +1133,11 @@ Sub cargar_Click
 	cmd.Parameters = Array As Object(usuario,e_ruta.text,sDate,imei,sTime,"","","","","CARGA",ALMACEN,Application.VersionName)
 	B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_drop")
 	
+	cmd.Initialize
+	cmd.Name = "select_envio_almacen"
+	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "envioalmacen")
+	
 	cmd.Initialize
 	cmd.Name = "select_TipoVenta"
 	cmd.Parameters = Array As Object(ALMACEN, e_ruta.text)
@@ -1108,6 +1158,11 @@ Sub cargar_Click
 	cmd.Parameters = Array As Object(ALMACEN)
 	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "promodesp")
 	
+ '	cmd.Initialize
+'	cmd.Name = "select_venta_tb_guna"
+'	cmd.Parameters = Array As Object( e_ruta.text,ALMACEN)
+'	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_ventastodos")
+	
 	cmd.Initialize
 	cmd.Name = "select_cat_gunaprod2_GV2"
 	cmd.Parameters = Array As Object(ALMACEN, e_ruta.text)
@@ -1367,8 +1422,8 @@ Sub JobDone(Job As HttpJob)
 				If n = "OKActivo"  Then
 					Dim cmd As DBCommand
 					cmd.Initialize
-					cmd.Name = "select_ruta_GV2_70_10"
-					cmd.Parameters = Array As Object(ALMACEN,e_ruta.text)
+					cmd.Name = "select_ruta_GV2_70_19"
+					cmd.Parameters = Array As Object(ALMACEN,e_ruta.text,usuario)
 					B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta")
 					'Log("Usuario guardado en BD es 'Valido'")
 				Else
@@ -1395,6 +1450,21 @@ Sub JobDone(Job As HttpJob)
 			End If
 		End If
 		
+		If Job.JobName = "DBRequest" Then
+			Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
+			If RESULT.Tag = "envioalmacen" Then 'query tag
+				For Each records() As Object In RESULT.Rows
+					Dim CAT_RU_ENVIO_ALMACEN As String = records(RESULT.Columns.Get("CAT_RU_ENVIO_ALMACEN"))
+					Dim CAT_RU_LAT As String = records(RESULT.Columns.Get("CAT_RU_LAT"))
+					Dim CAT_RU_LONG As String = records(RESULT.Columns.Get("CAT_RU_LONG"))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("ENVIOALMACEN",CAT_RU_ENVIO_ALMACEN))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("RULAT",CAT_RU_LAT))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("RULONG",CAT_RU_LONG))
+				Next
+'				If Starter.marcaCel <> "Sony" Then ToastMessageShow(" Historico Marcas" , True)
+			End If
+		End If
+		
 		If Job.JobName = "DBRequest" Then
 			Dim result1 As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
 			If result1.Tag = "CHECAENCUESTA" Then 'query tag
@@ -1414,6 +1484,31 @@ Sub JobDone(Job As HttpJob)
 				End If
 			End If
 		End If
+		
+		If Job.JobName = "DBRequest" Then
+			Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
+			If RESULT.Tag = "hist_ventastodos" Then 'query tag
+				
+				For Each records() As Object In RESULT.Rows
+'					Log ("NO HACE NADA")
+					Dim HVD_CLIENTE As String = records(RESULT.Columns.Get("HVD_CLIENTE"))
+					Dim HVD_PRONOMBRE As String = records(RESULT.Columns.Get("HVD_PRONOMBRE"))
+					Dim HVD_CANT As String = records(RESULT.Columns.Get("HVD_CANT"))
+					Dim HVD_COSTO_TOT As String = records(RESULT.Columns.Get("HVD_COSTO_TOT"))
+					Dim HVD_FECHA As String = records(RESULT.Columns.Get("HVD_FECHA"))
+					Dim HVD_NUM_TICKET As String = records(RESULT.Columns.Get("HVD_NUM_TICKET"))
+					Dim HVD_CODPROMO As String = records(RESULT.Columns.Get("HVD_CODPROMO"))
+'					Log(HVD_CLIENTE&"--"&HVD_PRONOMBRE&"--"&HVD_CANT&"--"&HVD_COSTO_TOT)
+
+					Private tc As Cursor = Starter.skmt.ExecQuery($"select * from hist_ventastodos where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PRONOMBRE = '${HVD_PRONOMBRE}' AND HVD_CANT = '${HVD_CANT}' AND HVD_CODPROMO = '${HVD_CODPROMO}' AND HVD_COSTO_TOT = '${HVD_COSTO_TOT}' "$)
+					If tc.RowCount = 0 Then
+						B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO hist_ventastodos(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_NUM_TICKET,HVD_CODPROMO) VALUES (?,?,?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_NUM_TICKET,HVD_CODPROMO))
+					End If
+					
+				Next
+				
+			End If
+		End If
 
 		If Job.JobName = "DBRequest" Then
 			Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
@@ -1446,10 +1541,11 @@ Sub JobDone(Job As HttpJob)
 					Dim CAT_CL_DIASCREDITO As String = records(RESULT.Columns.Get("CAT_CL_DIASCREDITO"))
 					Dim CAT_CL_CLASIFICADOR3 As String = records(RESULT.Columns.Get("CAT_CL_CLASIFICADOR3"))
 					Dim CAT_CL_CLASIFICADOR2 As String = records(RESULT.Columns.Get("CAT_CL_CLASIFICADOR2"))
+					Dim CAT_CL_CLASIFICADOR5 As String = records(RESULT.Columns.Get("CAT_CL_CLASIFICADOR5"))
 					
 					'##########################  INICIA CODIGO PARA CREDITOS ####################
 					Dim CAT_CL_BCREDITO As String = records(RESULT.Columns.Get("CAT_CL_BCREDITO"))
-					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info3(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,CAT_CL_NUM_SERIEFISICO, gestion,CAT_CL_BCREDITO,CAT_CL_TIPOCLIENTE,FOTO,CAT_CL_LIMITECREDITO,CAT_CL_DIASCREDITO,CAT_CL_CLASIFICADOR3,CAT_CL_CLASIFICADOR2) 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_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO,CAT_CL_BCREDITO,CAT_CL_TIPOCLIENTE,CAT_CL_FOTO,CAT_CL_LIMITECREDITO,CAT_CL_DIASCREDITO,CAT_CL_CLASIFICADOR3,CAT_CL_CLASIFICADOR2))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info3(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,CAT_CL_NUM_SERIEFISICO, gestion,CAT_CL_BCREDITO,CAT_CL_TIPOCLIENTE,FOTO,CAT_CL_LIMITECREDITO,CAT_CL_DIASCREDITO,CAT_CL_CLASIFICADOR3,CAT_CL_CLASIFICADOR2,CAT_CL_CLASIFICADOR5) 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_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO,CAT_CL_BCREDITO,CAT_CL_TIPOCLIENTE,CAT_CL_FOTO,CAT_CL_LIMITECREDITO,CAT_CL_DIASCREDITO,CAT_CL_CLASIFICADOR3,CAT_CL_CLASIFICADOR2,CAT_CL_CLASIFICADOR5))
 					'##########################  TERMINA CODIGO PARA CREDITOS ####################
 					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_STAY_STORE(HSS_CODIGO,  HSS_IN , HSS_OUT , HSS_TOT) VALUES (?,0,0,0)", Array As Object (CAT_CL_CODIGO))
 				Next
@@ -2464,6 +2560,10 @@ Log("-------->  BORRAMOS")
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO3")
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO4")
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO5")
+	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM hist_ventastodos")	
+	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("ENVIOALMACEN"))
+	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("RULAT"))
+	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("RULONG"))
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM BITACORAGPS")
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM RUTA_SUPLENCIA")
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM TICKET_IMPRESO")
@@ -3013,7 +3113,26 @@ Sub tickets_dia_Click
 End Sub
 
 Sub GPS_LocationChanged (Location1 As Location)
-
+	Dim al_longitud As String = 0
+	Dim al_latitud As String = 0
+	Dim envlat As Cursor = Starter.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'RULAT'")
+'	c = Starter.skmt.ExecQuery2("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LATITUD"))
+	If envlat.RowCount > 0 Then
+		envlat.Position = 0
+		Dim al_latitud As String = envlat.GetString("CAT_VA_VALOR")
+	End If
+	envlat.Close
+	Dim envlat As Cursor = Starter.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'RULONG'")
+'	envlat = Starter.skmt.ExecQuery2("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LONGITUD"))
+	If envlat.RowCount > 0 Then
+		envlat.Position = 0
+		Dim al_longitud As String = envlat.GetString("CAT_VA_VALOR")
+	End If
+	envlat.Close
+	Dim ubi1, ubi2 As Location
+	ubi1.Initialize2(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)
+	ubi2.Initialize2(al_latitud, al_longitud)
+	distancealm = ubi1.DistanceTo(ubi2)
 End Sub
 
 Sub Btn_Ubicar_Click
diff --git a/B4A/C_historicobatyodos.bas b/B4A/C_historicobatyodos.bas
new file mode 100644
index 0000000..040795d
--- /dev/null
+++ b/B4A/C_historicobatyodos.bas
@@ -0,0 +1,168 @@
+B4A=true
+Group=Default Group
+ModulesStructureVersion=1
+Type=Class
+Version=12.8
+@EndOfDesignText@
+Sub Class_Globals
+	Private Root As B4XView 'ignore
+	Private xui As XUI 'ignore
+
+	Dim g As GPS
+	Dim clie_id As String
+	Dim sDate,sTime As String
+	Dim usuario As String
+	
+	Dim c As Cursor
+	Dim ruta As String
+	Dim Regresar As Button
+	
+
+	Dim ListView1 As ListView
+	Dim L_CANT As Label
+	Dim L_TOTAL As Label
+	Dim borra As Button
+	Dim Existe As String
+	Dim result As String
+	'    Dim lat_gps, lon_gps As String
+
+	Private Titulo As Label
+	Private b_desc As Button
+	Private ListView2 As ListView
+	Dim tgl As Toggle
+	Private p_nota As Panel
+	Private Panel1 As Panel
+	Private l_productohist As Label
+	Private l_s1 As Label
+	Private l_s2 As Label
+	Private l_s3 As Label
+	Private l_s4 As Label
+	Private CustomListView1 As CustomListView
+	Private L_PROMEDIOHIST As Label
+End Sub
+
+'You can add more parameters here.
+Public Sub Initialize As Object
+	Return Me
+End Sub
+
+'This event will be called once, before the page becomes visible.
+Private Sub B4XPage_Created (Root1 As B4XView)
+	Root = Root1
+	'load the layout to Root
+	Root.LoadLayout("nota3")
+	borra.Visible = False
+	Titulo.Text = "Acumulado"
+	b_desc.Visible = False
+End Sub
+
+
+
+
+
+Sub B4XPage_Appear
+	Panel1.Visible = False
+	If Not(Starter.gps.GPSEnabled) Then
+		ToastMessageShow("Es necesario tener el GPS encendido", True)
+		StartActivity(Starter.gps.LocationSettingsIntent)
+	End If
+	
+	L_CANT.Text = ""
+	L_TOTAL.Text = ""
+	
+	c = B4XPages.MainPage.skmt.ExecQuery("select count(*) as EXISTE from hist_ventastodos  WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) ORDER BY HVD_CODPROMO, HVD_COSTO_TOT ASC")
+	c.Position = 0
+	Existe = c.GetString("EXISTE")
+	c.Close
+	
+	' =====================================================================
+	' NUEVA LÓGICA DE LISTVIEW1: DISEÑO "TICKET MODERNO"
+	' =====================================================================
+	ListView1.Clear
+	ListView1.Visible = True
+	
+	' 1. Fondo de la lista: Un gris muy claro/hueso para simular el papel
+	ListView1.Color = xui.Color_RGB(245, 245, 245)
+	
+	' 2. Diseño del Encabezado (El Ticket y la Fecha)
+	ListView1.SingleLineLayout.Label.TextSize = 16
+	' Azul oscuro elegante para separar visualmente los tickets
+	ListView1.SingleLineLayout.Label.TextColor = xui.Color_RGB(25, 118, 210)
+	ListView1.SingleLineLayout.Label.Typeface = Typeface.DEFAULT_BOLD
+	' Centrado en ambas direcciones para que parezca un divisor
+	ListView1.SingleLineLayout.Label.Gravity = Bit.Or(Gravity.CENTER_VERTICAL, Gravity.CENTER_HORIZONTAL)
+	ListView1.SingleLineLayout.ItemHeight = 50dip
+	
+	' 3. Diseño del Detalle (Los Productos)
+	ListView1.TwoLinesLayout.Label.TextSize = 16
+	ListView1.TwoLinesLayout.Label.TextColor = xui.Color_RGB(33, 33, 33) ' Gris casi negro (mejor lectura)
+	ListView1.TwoLinesLayout.Label.Typeface = Typeface.DEFAULT_BOLD
+	ListView1.TwoLinesLayout.Label.Gravity = Gravity.CENTER_VERTICAL
+	
+	ListView1.TwoLinesLayout.SecondLabel.TextSize = 15
+	' Verde oscuro para destacar el dinero y la cantidad
+	ListView1.TwoLinesLayout.SecondLabel.TextColor = xui.Color_RGB(56, 142, 60)
+	ListView1.TwoLinesLayout.SecondLabel.Typeface = Typeface.DEFAULT_BOLD
+	ListView1.TwoLinesLayout.ItemHeight = 70dip ' Espacio cómodo para que respire el texto
+
+	' Query: Ordena de más antiguo a más reciente
+	Dim queryVentas As String = $"
+		SELECT HVD_NUM_TICKET, HVD_PRONOMBRE, HVD_CANT, HVD_COSTO_TOT, HVD_FECHA 
+		FROM hist_ventastodos 
+		WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) 
+		ORDER BY 
+			SUBSTR(HVD_FECHA, 7, 4) ASC,
+			SUBSTR(HVD_FECHA, 4, 2) ASC,
+			SUBSTR(HVD_FECHA, 1, 2) ASC,
+			HVD_NUM_TICKET ASC,
+			HVD_CODPROMO,
+			HVD_COSTO_TOT ASC
+	"$
+	
+	c = B4XPages.MainPage.skmt.ExecQuery(queryVentas)
+	
+	If c.RowCount > 0 Then
+		Dim currentTicket As String = ""
+		
+		For i = 0 To c.RowCount - 1
+			c.Position = i
+			
+			Dim ticket As String = c.GetString("HVD_NUM_TICKET")
+			Dim fecha As String = c.GetString("HVD_FECHA")
+			Dim producto As String = c.GetString("HVD_PRONOMBRE")
+			Dim cant As String = c.GetString("HVD_CANT")
+			Dim costo As String = c.GetString("HVD_COSTO_TOT")
+'			Dim Costotodo As Double = 0
+			
+			' Agregamos el separador de Ticket
+			If ticket <> currentTicket Then
+'				Costotodo = Costotodo + costo
+'				ListView1.AddSingleLine($"🎫 TICKET: ${ticket} | 📅 ${fecha} ${CRLF} 💵 Total: $${NumberFormat2(Costotodo,0,2,2,False)}"$)
+				ListView1.AddSingleLine($"🎫 TICKET: ${ticket} | 📅 ${fecha}"$)
+				currentTicket = ticket
+			End If
+			
+			' Formateamos el texto del detalle usando Smart String Literal para que se vea más profesional
+			Dim detalle As String = $"📦 Cantidad: ${cant}   |   💵 Total: $${costo}"$
+			ListView1.AddTwoLines(producto, detalle)
+		Next
+	End If
+	c.Close
+	' =====================================================================
+
+	' Lógica para totales
+	If Existe <> "0" Then
+		c = B4XPages.MainPage.skmt.ExecQuery("select SUM(HVD_CANT) AS PC_NOART, SUM(HVD_COSTO_TOT) AS PC_MONTO from hist_ventastodos where HVD_CLIENTE in (Select CUENTA from cuentaa)")
+		c.Position = 0
+		L_CANT.Text = c.GetString("PC_NOART")
+		L_TOTAL.Text = c.GetString("PC_MONTO")
+		c.Close
+	End If
+
+	' ...
+	' (AQUÍ SIGUE TU CÓDIGO DEL CustomListView1 PARA EL PROMEDIO DE 4 SEMANAS)
+	' CustomListView1.AsView.Height = Root.Height * 0.45
+	' ...
+End Sub
+
+
diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal
index 1f88f75..f6df813 100644
Binary files a/B4A/Files/cliente.bal and b/B4A/Files/cliente.bal differ
diff --git a/B4A/Files/encuesta_1.bal b/B4A/Files/encuesta_1.bal
new file mode 100644
index 0000000..9d22948
Binary files /dev/null and b/B4A/Files/encuesta_1.bal differ
diff --git a/B4A/Files/encuesta_2.bal b/B4A/Files/encuesta_2.bal
new file mode 100644
index 0000000..f35da3a
Binary files /dev/null and b/B4A/Files/encuesta_2.bal differ
diff --git a/B4A/Files/historicobat.bal b/B4A/Files/historicobat.bal
index 6fc98d5..a576fd2 100644
Binary files a/B4A/Files/historicobat.bal and b/B4A/Files/historicobat.bal differ
diff --git a/B4A/Files/historicobat2.bal b/B4A/Files/historicobat2.bal
index 1bd7329..0c2c47d 100644
Binary files a/B4A/Files/historicobat2.bal and b/B4A/Files/historicobat2.bal differ
diff --git a/B4A/Files/nota3.bal b/B4A/Files/nota3.bal
new file mode 100644
index 0000000..f415769
Binary files /dev/null and b/B4A/Files/nota3.bal differ
diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a
index 063dbe2..b3cbb1d 100644
--- a/B4A/Guna Vistas V3.1.b4a	
+++ b/B4A/Guna Vistas V3.1.b4a	
@@ -1,18 +1,21 @@
 Build1=Default,gunav2.keymon.com.mx
 File1=alert2.png
 File10=clientes.bal
-File100=seleccion.bal
-File101=senial.jpg
-File102=sync.png
-File103=tache_rojo.png
-File104=telefonos.bal
-File105=Ticket dia.jpg
-File106=ticketdia20.png
-File107=ticketsdia.bal
-File108=Tiendita.jpg
-File109=usuario.png
+File100=rojo.png
+File101=salma.jpg
+File102=salma.png
+File103=seleccion.bal
+File104=senial.jpg
+File105=sync.png
+File106=tache_rojo.png
+File107=telefonos.bal
+File108=Ticket dia.jpg
+File109=ticketdia20.png
 File11=comis.bal
-File110=verde.png
+File110=ticketsdia.bal
+File111=Tiendita.jpg
+File112=usuario.png
+File113=verde.png
 File12=contrasena.png
 File13=datoscliente.bal
 File14=detalle_promo.bal
@@ -20,95 +23,95 @@ File15=durakelo.png
 File16=durakelo1.png
 File17=ENCUESSTA_M3.bal
 File18=ENCUESTA.bal
-File19=ENCUESTA_M4.bal
+File19=encuesta_1.bal
 File2=alerta.jpg
-File20=ENCUESTA_M5.bal
-File21=ENCUESTA_PED.bal
-File22=engrane.jpg
-File23=engrane.png
-File24=engrane18.png
-File25=engraneactual.png
-File26=errormanager.bal
-File27=ESNCUESTA_M2.bal
-File28=fondo_kmt.jpg
-File29=fondo-rojo.jpg
+File20=encuesta_2.bal
+File21=ENCUESTA_M4.bal
+File22=ENCUESTA_M5.bal
+File23=ENCUESTA_PED.bal
+File24=engrane.jpg
+File25=engrane.png
+File26=engrane18.png
+File27=engraneactual.png
+File28=errormanager.bal
+File29=ESNCUESTA_M2.bal
 File3=alerta_amarilla.png
-File30=fondo-rojo.png
-File31=foto.bal
-File32=gps20.png
-File33=guardagestion.bal
-File34=guna.png
-File35=guna_192x192.jpg
-File36=guna_viejo.png
-File37=guna18.png
-File38=guna-fondo.jpg
-File39=guna-fondo.png
+File30=fondo_kmt.jpg
+File31=fondo-rojo.jpg
+File32=fondo-rojo.png
+File33=foto.bal
+File34=gps20.png
+File35=guardagestion.bal
+File36=guna.png
+File37=guna_192x192.jpg
+File38=guna_viejo.png
+File39=guna18.png
 File4=amarillo.png
-File40=Hacer pedido.jpg
-File41=hacerpedido30.png
-File42=historicobat.bal
-File43=historicobat2.bal
-File44=ic_cloud_download_white_24dp.png
-File45=images.png
-File46=infonavit1.jpg
-File47=inicioFinVenta.bal
-File48=intmex_logo_192x192.jpg
-File49=itembuttonblue.png
+File40=guna-fondo.jpg
+File41=guna-fondo.png
+File42=Hacer pedido.jpg
+File43=hacerpedido30.png
+File44=historicobat.bal
+File45=historicobat2.bal
+File46=ic_cloud_download_white_24dp.png
+File47=images.png
+File48=infonavit1.jpg
+File49=inicioFinVenta.bal
 File5=anterior.jpg
-File50=keymon_logo.png
-File51=kmt.db
-File52=login.bal
-File53=Logo Guna_192x192.png
-File54=Logo Guna-01.png
-File55=logo sanfer.jpg
-File56=Logo_192x192.jpg
-File57=logo_exitus1.jpg
-File58=logo-guna-18.png
-File59=logo-guna-contorno.png
+File50=intmex_logo_192x192.jpg
+File51=itembuttonblue.png
+File52=keymon_logo.png
+File53=kmt.db
+File54=login.bal
+File55=Logo Guna_192x192.png
+File56=Logo Guna-01.png
+File57=logo sanfer.jpg
+File58=Logo_192x192.jpg
+File59=logo_exitus1.jpg
 File6=bus-ar.png
-File60=MainPage.bal
-File61=Malo.jpg
-File62=mapa.bal
-File63=mapa_rutas.bal
-File64=maparutas.bal
-File65=mas-azul.png
-File66=mas-azul-red.png
-File67=mas-azul-red1.png
-File68=menos.png
-File69=menosred.png
+File60=logo-guna-18.png
+File61=logo-guna-contorno.png
+File62=MainPage.bal
+File63=Malo.jpg
+File64=mapa.bal
+File65=mapa_rutas.bal
+File66=maparutas.bal
+File67=mas-azul.png
+File68=mas-azul-red.png
+File69=mas-azul-red1.png
 File7=carrito.png
-File70=menos-red.png
-File71=nota (conflict 2022-07-08-00-16-40).bal
-File72=nota.bal
-File73=nota2.bal
-File74=noventa.bal
-File75=nuevocliente.bal
-File76=nuevo-cliente20.png
-File77=Nvo Cliente.jpg
-File78=p&g.png
-File79=palomita_verde.png
+File70=menos.png
+File71=menosred.png
+File72=menos-red.png
+File73=nota (conflict 2022-07-08-00-16-40).bal
+File74=nota.bal
+File75=nota2.bal
+File76=nota3.bal
+File77=noventa.bal
+File78=nuevocliente.bal
+File79=nuevo-cliente20.png
 File8=celltitle.bal
-File80=pedido.bal
-File81=planfia_logo.png
-File82=planfia_logo_old.png
-File83=planfia_logo_old2.png
-File84=principal.bal
-File85=proditem.bal
-File86=proditem1.bal
-File87=proditem2.bal
-File88=productos.bal
-File89=productos_.bal
+File80=Nvo Cliente.jpg
+File81=p&g.png
+File82=palomita_verde.png
+File83=pedido.bal
+File84=planfia_logo.png
+File85=planfia_logo_old.png
+File86=planfia_logo_old2.png
+File87=principal.bal
+File88=proditem.bal
+File89=proditem1.bal
 File9=cliente.bal
-File90=promociones.bal
-File91=qr.bal
-File92=qr_gallina.jpg
-File93=QRPlanLealtad.png
-File94=resdia.bal
-File95=ResDia.jpg
-File96=resdia20.png
-File97=rojo.png
-File98=salma.jpg
-File99=salma.png
+File90=proditem2.bal
+File91=productos.bal
+File92=productos_.bal
+File93=promociones.bal
+File94=qr.bal
+File95=qr_gallina.jpg
+File96=QRPlanLealtad.png
+File97=resdia.bal
+File98=ResDia.jpg
+File99=resdia20.png
 FileGroup1=Default Group
 FileGroup10=Default Group
 FileGroup100=Default Group
@@ -123,6 +126,9 @@ FileGroup108=Default Group
 FileGroup109=Default Group
 FileGroup11=Default Group
 FileGroup110=Default Group
+FileGroup111=Default Group
+FileGroup112=Default Group
+FileGroup113=Default Group
 FileGroup12=Default Group
 FileGroup13=Default Group
 FileGroup14=Default Group
@@ -259,42 +265,43 @@ Library9=compressstrings
 ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="30"/>~\n~<supports-screens android:largeScreens="true" ~\n~    android:normalScreens="true"~\n~    android:smallScreens="true"~\n~    android:anyDensity="true"/>)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~AddApplicationText(<activity android:name="com.google.zxing.client.android.CaptureActivity"~\n~android:screenOrientation="landscape" ~\n~android:configChanges="orientation|keyboardHidden"~\n~android:theme="@android:style/Theme.NoTitleBar.Fullscreen"~\n~android:windowSoftInputMode="stateAlwaysHidden">~\n~</activity>)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~	  'End of default text.~\n~	  ~\n~	  ''''' CAMBIA LA CLAVE API~\n~AddApplicationText(~\n~<meta-data~\n~  android:name="com.google.android.geo.API_KEY"~\n~   android:value="AIzaSyBlBnx3O-DncOSv3oFIp-12wgujOYYcl-U"/>~\n~  <meta-data android:name="com.google.android.gms.version"~\n~   android:value="@integer/google_play_services_version" />~\n~)~\n~AddApplicationText(~\n~<uses-library~\n~      android:name="org.apache.http.legacy"~\n~      android:required="false" />~\n~)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.WRITE_EXTERNAL_STORAGE"~\n~  android:maxSdkVersion="30" />~\n~)~\n~~\n~''CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~	  'End of default text.~\n~	  ~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~	AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.ACCESS_FINE_LOCATION"~\n~  android:maxSdkVersion="30" />~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.READ_PHONE_STATE"~\n~  android:maxSdkVersion="30" />~\n~)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"~\n~  android:maxSdkVersion="30" />~\n~) 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~~\n~'/////////////////////////   FLP Y PUSH /////////////~\n~	CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~	CreateResourceFromFile(Macro, FirebaseAnalytics.Firebase)~\n~	CreateResourceFromFile(Macro, FirebaseAnalytics.FirebaseAnalytics)~\n~	CreateResourceFromFile(Macro, FirebaseNotifications.FirebaseNotifications)~\n~	SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'//////////////////////////////////////////////////////~\n~~\n~'///////////////////////  App Updating ////////////////~\n~		AddManifestText(<uses-permission~\n~		   android:name="android.permission.WRITE_EXTERNAL_STORAGE"~\n~		   android:maxSdkVersion="30" />~\n~		)~\n~		AddApplicationText(~\n~		  <provider~\n~		  android:name="android.support.v4.content.FileProvider"~\n~		  android:authorities="$PACKAGE$.provider"~\n~		  android:exported="false"~\n~		  android:grantUriPermissions="true">~\n~		  <meta-data~\n~		  android:name="android.support.FILE_PROVIDER_PATHS"~\n~		  android:resource="@xml/provider_paths"/>~\n~		  </provider>~\n~		)~\n~		CreateResource(xml, provider_paths,~\n~		<paths>~\n~		   <external-files-path name="name" path="" />~\n~		   <files-path name="name" path="" />~\n~		   <files-path name="name" path="shared" />~\n~		</paths>~\n~		)~\n~AddManifestText(<uses-feature android:name="android.hardware.telephony" android:required="false" />)~\n~AddManifestText(<uses-feature android:name="android.hardware.camera" android:required="false" />)~\n~AddManifestText(<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />)~\n~AddManifestText(<uses-feature android:name="android.hardware.camera.flash" android:required="false" />)~\n~~\n~AddPermission(android.permission.REQUEST_INSTALL_PACKAGES)~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.INSTALL_PACKAGES)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~AddPermission(android.permission.WAKE_LOCK)~\n~CreateResourceFromFile(Macro, JhsIceZxing1.CaturePortrait)~\n~		~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~AddPermission(android.permission.BLUETOOTH_ADVERTISE)~\n~AddPermission(android.permission.BLUETOOTH_CONNECT)~\n~AddPermission(android.permission.BLUETOOTH_SCAN)~\n~AddManifestText(<queries>~\n~    <package android:name="com.google.android.apps.maps" />~\n~  </queries>)~\n~AddManifestText(<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />)~\n~~\n~AddManifestText(<queries>~\n~    <package android:name="com.google.android.apps.maps" />~\n~  </queries>)~\n~  AddPermission(android.permission.MANAGE_EXTERNAL_STORAGE)~\n~  SetApplicationAttribute(android:allowBackup, "false")~\n~  ~\n~  ~\n~  AddManifestText(<uses-permission~\n~		   android:name="android.permission.WRITE_EXTERNAL_STORAGE"~\n~		   android:maxSdkVersion="33" />~\n~		)~\n~	AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~~\n~ 'Para que se registre para abrir bases de datos~\n~' AddActivityText(main,~\n~'<intent-filter>~\n~'<action android:name="android.intent.action.VIEW" />~\n~'<category android:name="android.intent.category.DEFAULT" />~\n~'<data android:mimeType="application/octet-stream" />~\n~'</intent-filter>)~\n~~\n~ 'Para que se registre para abrir bases de datos~\n~ AddActivityText(main,~\n~<intent-filter>~\n~<action android:name="android.intent.action.VIEW" />~\n~<category android:name="android.intent.category.DEFAULT" />~\n~<data android:pathPattern=".*\\.db" />~\n~<data android:mimeType="*/*" />~\n~</intent-filter>)~\n~AddPermission(android.permission.CALL_PHONE)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~
 Module1=appUpdater
 Module10=C_historicobat
-Module11=C_Mapas
-Module12=C_Nota
-Module13=C_NoVenta
-Module14=C_NuevoCliente
-Module15=C_Pedidos
-Module16=C_Principal
-Module17=C_Productos
-Module18=C_Promos
-Module19=C_TicketsDia
+Module11=C_historicobatyodos
+Module12=C_Mapas
+Module13=C_Nota
+Module14=C_NoVenta
+Module15=C_NuevoCliente
+Module16=C_Pedidos
+Module17=C_Principal
+Module18=C_Productos
+Module19=C_Promos
 Module2=B4XMainPage
-Module20=C_UpdateAvailable
-Module21=CameraExClass
-Module22=cPDF
-Module23=DBRequestManager
-Module24=EscPosPrinter
-Module25=FirebaseMessaging
-Module26=MAPA_RUTAS
-Module27=Starter
-Module28=Subs
-Module29=Tracker
+Module20=C_TicketsDia
+Module21=C_UpdateAvailable
+Module22=CameraExClass
+Module23=cPDF
+Module24=DBRequestManager
+Module25=EscPosPrinter
+Module26=FirebaseMessaging
+Module27=MAPA_RUTAS
+Module28=Starter
+Module29=Subs
 Module3=BatteryUtilities
+Module30=Tracker
 Module4=C_Bitacora
 Module5=C_Cliente
 Module6=C_Clientes
 Module7=C_Cuestionario
 Module8=C_Historico
 Module9=C_Historico2
-NumberOfFiles=110
+NumberOfFiles=113
 NumberOfLibraries=36
-NumberOfModules=29
+NumberOfModules=30
 Version=12.8
 @EndOfDesignText@
 #Region  Project Attributes 
 	#ApplicationLabel: Guna Preventa
 	#VersionCode: 1
-	#VersionName: 6.02.05
+	#VersionName: 6.02.16
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
diff --git a/B4A/Guna Vistas V3.1.b4a.meta b/B4A/Guna Vistas V3.1.b4a.meta
index cab34ff..43f44aa 100644
--- a/B4A/Guna Vistas V3.1.b4a.meta	
+++ b/B4A/Guna Vistas V3.1.b4a.meta	
@@ -22,6 +22,7 @@ ModuleBookmarks27=
 ModuleBookmarks28=
 ModuleBookmarks29=
 ModuleBookmarks3=
+ModuleBookmarks30=
 ModuleBookmarks4=
 ModuleBookmarks5=
 ModuleBookmarks6=
@@ -52,6 +53,7 @@ ModuleBreakpoints27=
 ModuleBreakpoints28=
 ModuleBreakpoints29=
 ModuleBreakpoints3=
+ModuleBreakpoints30=
 ModuleBreakpoints4=
 ModuleBreakpoints5=
 ModuleBreakpoints6=
@@ -71,23 +73,24 @@ ModuleClosedNodes17=
 ModuleClosedNodes18=
 ModuleClosedNodes19=
 ModuleClosedNodes2=
-ModuleClosedNodes20=4
-ModuleClosedNodes21=
+ModuleClosedNodes20=
+ModuleClosedNodes21=4
 ModuleClosedNodes22=
 ModuleClosedNodes23=
 ModuleClosedNodes24=
 ModuleClosedNodes25=
 ModuleClosedNodes26=
-ModuleClosedNodes27=3,4,6,8,9
-ModuleClosedNodes28=
-ModuleClosedNodes29=20
+ModuleClosedNodes27=
+ModuleClosedNodes28=3,4,8,9
+ModuleClosedNodes29=
 ModuleClosedNodes3=
+ModuleClosedNodes30=20
 ModuleClosedNodes4=
 ModuleClosedNodes5=
 ModuleClosedNodes6=
 ModuleClosedNodes7=6,8,9,10,11
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Cliente,GPS_LocationChanged,1440,0,C_Cliente,MejorarPrecisionGPS,1278,0,C_Cliente,LA_GPS_Click,1359,0,C_Cliente,Impresion3,2984,6,C_Cliente,Impresion2,3225,0,B4XMainPage,revisaActualizacion,1037,0,C_Cliente,gestionar,1929,0,C_Principal,JobDone,1445,0,C_Cliente,Impresion,3548,0,C_Cliente,B_IMP_Click,2905,0
+NavigationStack=C_Cliente,cb_p7_SelectedIndexChanged,7431,0,C_Cliente,cb_p9_SelectedIndexChanged,7449,0,C_Principal,Subir_Click,659,1,C_Cliente,b_guadarenc_Click,7454,6,C_Cliente,b_ventatb_Click,7411,0,C_Principal,Class_Globals,0,0,C_Principal,connecta_Click,2483,0,C_Principal,JobDone,1419,1,C_Cliente,gest_Click,1928,3,C_Cliente,B4XPage_CloseRequest,3164,0,C_Cliente,gestionar,2342,0
 SelectedBuild=0
-VisibleModules=27,2,16,28,5,13,17,29,19,4
+VisibleModules=28,2,17,29,5,14,18,30,20,4
diff --git a/B4A/Starter.bas b/B4A/Starter.bas
index a6fe07e..b629a0f 100644
--- a/B4A/Starter.bas
+++ b/B4A/Starter.bas
@@ -120,6 +120,15 @@ Sub ENVIA_ULTIMA_GPS
 	reqManager.ExecuteCommand(cmd, "actualizaUltimaGPS")
 	skmt.ExecNonQuery2("Update cat_variables set CAT_VA_VALOR = ?  WHERE CAT_VA_DESCRIPCION = ?" , Array As String(DateTime.Time(DateTime.Now),"HoraIngreso"))
 	'Reiniciamos el timer para cuando llamamos el Sub desde "seleccion"
+	
+	If B4XPages.MainPage.rutapreventa <> 0 Then
+		cmd.Initialize
+		cmd.Name = "select_venta_tb_guna"
+		cmd.Parameters = Array As Object(B4XPages.MainPage.rutapreventa,B4XPages.MainPage.ALMACEN)
+		B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_ventastodos")
+	End If
+	
+	
 	Timer1.Enabled = False
 	Timer1.Interval = Interval * 1000
 	Timer1.Enabled = True
@@ -156,6 +165,29 @@ Sub JobDone(Job As HttpJob)
 			Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
 			Log($"Tag: ${RESULT.tag}, success=${Job.Success}"$)
 		End If
+		
+		If Job.JobName = "DBRequest" Then
+			Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
+			If RESULT.Tag = "hist_ventastodos" Then 'query tag
+				
+				For Each records() As Object In RESULT.Rows
+'					Log ("NO HACE NADA")
+					Dim HVD_CLIENTE As String = records(RESULT.Columns.Get("HVD_CLIENTE"))
+					Dim HVD_PRONOMBRE As String = records(RESULT.Columns.Get("HVD_PRONOMBRE"))
+					Dim HVD_CANT As String = records(RESULT.Columns.Get("HVD_CANT"))
+					Dim HVD_COSTO_TOT As String = records(RESULT.Columns.Get("HVD_COSTO_TOT"))
+					Dim HVD_FECHA As String = records(RESULT.Columns.Get("HVD_FECHA"))
+					Dim HVD_NUM_TICKET As String = records(RESULT.Columns.Get("HVD_NUM_TICKET"))
+					Dim HVD_CODPROMO As String = records(RESULT.Columns.Get("HVD_CODPROMO"))
+'					Log(HVD_CLIENTE&"--"&HVD_PRONOMBRE&"--"&HVD_CANT&"--"&HVD_COSTO_TOT)
+					Private tc As Cursor = skmt.ExecQuery($"select * from hist_ventastodos where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PRONOMBRE = '${HVD_PRONOMBRE}' AND HVD_CANT = '${HVD_CANT}' AND HVD_CODPROMO = '${HVD_CODPROMO}' AND HVD_COSTO_TOT = '${HVD_COSTO_TOT}' "$)
+					If tc.RowCount = 0 Then
+						B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO hist_ventastodos(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_NUM_TICKET,HVD_CODPROMO) VALUES (?,?,?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_NUM_TICKET,HVD_CODPROMO))
+					End If
+				Next
+				
+			End If
+		End If
 '		Log("JOBDONE SUCCESS")
 	End If
 End Sub
\ No newline at end of file
diff --git a/B4A/Subs.bas b/B4A/Subs.bas
index 3c11ede..d88eafc 100644
--- a/B4A/Subs.bas
+++ b/B4A/Subs.bas
@@ -779,7 +779,7 @@ End Sub
 Sub traeRuta2 (cliente As String) As String 'ignore
 	Private c As Cursor
 	Private r As String
-	c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_RUTA from kmt_info where CAT_CL_CODIGO = '${cliente}' UNION ALL select CAT_CL_RUTA from kmt_info2 where CAT_CL_CODIGO = '${cliente}'"$)
+	c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_RUTA from kmt_info3 where CAT_CL_CODIGO = '${cliente}'"$)
 	r = "0"
 	If c.RowCount > 0 Then
 		c.Position=0