diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas
index 96de365..31a0be9 100644
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -702,8 +702,8 @@ End Sub
 
 Sub i_engrane_Click
 	lv_server.Clear
-	lv_server.AddSingleLine("http://keymon.lat:1782")
-	If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1782")
+	lv_server.AddSingleLine("http://keymon.lat:1781")
+	If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1781")
 '	l_server.Text = Starter.DBReqServer
 	et_server.Text = Starter.DBReqServer
 	If user.Text = "KMTS1" Then b_importarBD.Visible = True Else b_importarBD.Visible = False
diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas
index b0a80a2..afc0380 100644
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -244,8 +244,8 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	p_mandaInfo.Height = Root.Height
 	s.centraPanel(P1, Root.Width)
 	l_version.Text = Application.VersionName
-	rd.Initialize 'Inicializamos el respaldo diario.
-	rd.vacuum
+'	rd.Initialize 'Inicializamos el respaldo diario.
+'	rd.vacuum
 	EJECUTANDO=1
 	Dim ruta As String
 	img2.Visible =False
@@ -318,9 +318,9 @@ Sub B4XPage_Appear
 '	s.reqManagerReInit 'Reiniciamos el DBReqManager de C_Subs por si hay modificacion en el servidor.
 	reqManager.Initialize(Me, Starter.DBReqServer)
 '	B4XPages.MainPage.cliente.mandaPendientes 'Ejecutamos mandaPendientes.
-	rd.respalda_pedido
-	rd.respalda_cat_gunaprod
-	rd.respalda_cat_detalle_paq
+'	rd.respalda_pedido
+'	rd.respalda_cat_gunaprod
+'	rd.respalda_cat_detalle_paq
 	nvo_cliente.Enabled = False
 	HORAINGRESO ="000000"
 	Btn_Ubicar.Left = (Root.Width/2) - (Btn_Ubicar.Width/2)
diff --git a/B4A/Mariana.b4a b/B4A/Mariana.b4a
index 75b681a..79a573d 100644
--- a/B4A/Mariana.b4a
+++ b/B4A/Mariana.b4a
@@ -1022,7 +1022,7 @@ Library6=byteconverter
 Library7=camera
 Library8=compressstrings
 Library9=core
-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="33"/>~\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~''''' 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="33" />~\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="33" />~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.READ_PHONE_STATE"~\n~  android:maxSdkVersion="33" />~\n~)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"~\n~  android:maxSdkVersion="33" />~\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="33" />~\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~AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~AddApplicationText(~\n~<service android:name="b4a.jsaplication.com.br.ReplyAuto"~\n~	android:label="Mariana" android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" android:exported="true">~\n~     <intent-filter><action android:name="android.service.notification.NotificationListenerService" /></intent-filter>~\n~ </service>)~\n~
+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="33"/>~\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~''''' 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="33" />~\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="33" />~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.READ_PHONE_STATE"~\n~  android:maxSdkVersion="33" />~\n~)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"~\n~  android:maxSdkVersion="33" />~\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="33" />~\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~AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~AddApplicationText(~\n~<service android:name="b4a.jsaplication.com.br.ReplyAuto"~\n~	android:label="Mariana" android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" android:exported="true">~\n~     <intent-filter><action android:name="android.service.notification.NotificationListenerService" /></intent-filter>~\n~ </service>)~\n~ ~\n~ AddManifestText(<queries>~\n~    <package android:name="com.google.android.apps.maps" />~\n~  </queries>)~\n~  ~\n~
 Module1=appUpdater
 Module10=C_NuevoCliente
 Module11=C_Pedidos
@@ -1058,7 +1058,7 @@ Version=12.5
 #Region  Project Attributes 
 	#ApplicationLabel: Mariana
 	#VersionCode: 1
-	#VersionName: 3.10.23
+	#VersionName: 3.10.24
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
diff --git a/B4A/Mariana.b4a.meta b/B4A/Mariana.b4a.meta
index 0dc061c..3d3bf21 100644
--- a/B4A/Mariana.b4a.meta
+++ b/B4A/Mariana.b4a.meta
@@ -82,10 +82,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-<<<<<<< HEAD
-NavigationStack=B4XMainPage,B_SERVER_Click,704,0,B4XMainPage,lv_server_ItemClick,719,0,B4XMainPage,CheckNotificationAccess,744,0,B4XMainPage,b_envioBD_Click,743,0,B4XMainPage,B4XPage_Appear,307,0,NotificationService,NotiMon_NotificationPosted,40,0,NotificationService,Service_Destroy,29,0,NotificationService,Service_Start,22,0,C_Principal,Subir_Click,633,0,Subs,traeMaxPromos,975,0,Subs,alcanzanLosVariablesParaPromo,954,0
-=======
-NavigationStack=B4XMainPage,b_envioBD_Click,743,0,Visual Designer,principal.bal,-100,5,FileHandler,Class_Globals,13,0,FileHandler,Initialize,24,0,B4XMainPage,B4XPage_Created,135,6,B4XMainPage,Class_Globals,88,0,B4XMainPage,b_importarBD_Click,770,0,B4XMainPage,CheckNotificationAccess,761,0,Visual Designer,login.bal,-100,6,B4XMainPage,i_engrane_Click,701,6
->>>>>>> 0a89a37668b0333c8b54d028f163148c7f807f0c
+NavigationStack=B4XMainPage,i_engrane_Click,699,0,Starter,Process_Globals,17,0,B4XMainPage,Class_Globals,85,0,C_Principal,Class_Globals,6,0,B4XMainPage,B4XPage_Created,275,0,C_RespaldoDiario,Initialize,25,0,B4XMainPage,B4XPage_Appear,296,0,B4XMainPage,Entrar_Click,378,0,C_Principal,B4XPage_Created,236,0,C_Principal,B4XPage_Appear,314,0
 SelectedBuild=0
-VisibleModules=2,12,25,16,26,5,4,6,7,8
+VisibleModules=1,2,3,4,5,6,7,8,9,10,25,12,15
diff --git a/B4A/Starter.bas b/B4A/Starter.bas
index 79f51aa..d262105 100644
--- a/B4A/Starter.bas
+++ b/B4A/Starter.bas
@@ -21,7 +21,7 @@ Sub Process_Globals
 '	Private flpStarted As Boolean
 	Dim reqManager As DBRequestManager
 '	Dim DBReqServer As String = "http://11.0.0.253:1782"
-	Dim DBReqServer As String = "http://187.189.244.154:1782"
+	Dim DBReqServer As String = "http://187.189.244.154:1781"
 '	Dim DBReqServer As String = "http://10.0.0.205:1782"
 '	Dim DBReqServer As String = "http://11.0.0.231:1782"
 	Dim Timer1 As Timer