5.07.25

B4A/C_Clientes.bas

@@ -615,8 +615,8 @@ Sub caculaRutaGPS(coords As List)
 	ProgressDialogShow2("Calculando distancia y tiempo, un momento por favor.", False)
 	Dim j As HttpJob
 	j.Initialize("trip", Me) 'Calculamos el resto de la ruta.
-	j.Download($"http://keymon.lat:9002/ruteador?m=OSRM&r=${Subs.traeRutaReparto}&a=${Subs.traeAlmacen}&f=CEDIS,${Starter.cedisLocation.Longitude},${Starter.cedisLocation.Latitude}&c=${coordsStr}"$)
-	Log($"http://keymon.lat:9002/ruteador?m=OSRM&r=${Subs.traeRutaReparto}&a=${Subs.traeAlmacen}&f=CEDIS,${Starter.cedisLocation.Longitude},${Starter.cedisLocation.Latitude}&c=${coordsStr}"$)
+	j.Download($"http://keymon.net:9002/ruteador?m=OSRM&r=${Subs.traeRutaReparto}&a=${Subs.traeAlmacen}&f=CEDIS,${Starter.cedisLocation.Longitude},${Starter.cedisLocation.Latitude}&c=${coordsStr}"$)
+	Log($"http://keymon.net:9002/ruteador?m=OSRM&r=${Subs.traeRutaReparto}&a=${Subs.traeAlmacen}&f=CEDIS,${Starter.cedisLocation.Longitude},${Starter.cedisLocation.Latitude}&c=${coordsStr}"$)
 	Wait For (j) JobDone(j As HttpJob)
 	If j.Success Then
 		Dim jp As JSONParser

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 and HVD_CLIENTE NOT IN (SELECT CUENTA FROM CUENTAA) 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) AND HVD_PROID IN (SELECT CAT_GP_ID FROM CAT_GUNAPROD WHERE CAT_GP_TIPO <> 'ALEN') 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

B4A/Mazapa_Reparto.b4a

@@ -3009,7 +3009,7 @@ Version=12.8
 #Region Project Attributes 
 	#ApplicationLabel: MAZAPA Reparto
 	#VersionCode: 1
-	#VersionName: 5.06.02
+	#VersionName: 5.07.25
 	'Aun no la subo, suvela
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait

B4A/Mazapa_Reparto.b4a.meta

@@ -94,6 +94,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Principal,B4XPage_Appear,604,6,Main,Globals,22,0,C_Principal,Subir_Click,758,0,C_Principal,envioinfo,1039,6,C_Principal,connecta_Click,1803,0,C_Principal,cargadedia,1214,0,Diseñador Visual,login.bal,-100,3,Starter,JobDone,149,0,B4XMainPage,i_engrane_Click,623,6,B4XMainPage,b_server_Click,682,0,B4XMainPage,Class_Globals,26,0
+NavigationStack=Diseñador Visual,login.bal,-100,3,Starter,JobDone,149,0,B4XMainPage,i_engrane_Click,623,6,B4XMainPage,b_server_Click,682,0,Diseñador Visual,principal.bal,-100,1,C_Cliente,Class_Globals,0,0,B4XMainPage,Class_Globals,26,0,C_Productos,Class_Globals,0,0,C_Productos,B4XPage_Appear,200,6,C_Clientes,caculaRutaGPS,612,2,appUpdater,Process_Globals,74,1
 SelectedBuild=0
-VisibleModules=29,2,6,7,16,31,30,17,13
+VisibleModules=29,2,6,7,16,31,30,17,13,1

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.06.01"
+	android:versionName="5.07.25"
 	android:installLocation="internalOnly">
 	
 	<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="33"/>
@@ -38,13 +38,13 @@
 		android:maxSdkVersion="33" />
 	<queries><package android:name="com.google.android.apps.maps" /></queries>
 	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-	<uses-permission android:name="android.permission.VIBRATE"/>
-	<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 	<uses-permission android:name="android.permission.BLUETOOTH"/>
 	<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.VIBRATE"/>
+	<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 	<uses-permission android:name="android.permission.WAKE_LOCK"/>
 	<uses-permission android:name="android.permission.CAMERA"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -131,11 +131,11 @@
 			
 		</activity>
 		<service
-			android:name=".appupdater"
+			android:name=".starter"
 			android:exported="true">
 		</service>
 		<receiver
-			android:name=".appupdater$appupdater_BR"
+			android:name=".starter$starter_BR"
 			android:exported="true">
 		</receiver>
 		<service
@@ -151,11 +151,11 @@
 			</intent-filter>
 		</receiver>
 		<service
-			android:name=".starter"
+			android:name=".appupdater"
 			android:exported="true">
 		</service>
 		<receiver
-			android:name=".starter$starter_BR"
+			android:name=".appupdater$appupdater_BR"
 			android:exported="true">
 		</receiver>
 		<service