mirror of
https://github.com/KeymonSoft/Mariana.git
synced 2026-04-17 21:06:16 +00:00
Puerto
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user