Merge branch 'main' of https://github.com/KeymonSoft/Mariana

# Conflicts:
#	B4A/Mariana.b4a.meta

B4A/B4XMainPage.bas

@@ -20,8 +20,6 @@ Version=9.85
 	'###########################################################################################################
 #End Region
 
-
-
 'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=github&Args=..\..\
 
 Sub Class_Globals
@@ -93,6 +91,7 @@ Sub Class_Globals
 	Public rutaBDBackup As String = ""
 	Dim MES1 As ManageExternalStorage
 	Dim device As Phone
+	Private b_importarBD As Button
 End Sub
 
 Public Sub Initialize
@@ -135,6 +134,19 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	historico.Initialize
 	B4XPages.AddPage("Historico", historico)
 	ruta = Starter.ruta
+
+'	Dim px As B4XView = xui.CreatePanel("")
+'	px.SetLayoutAnimated(0, 500, 30, 200dip, 45dip)
+'	px.Color = Colors.Cyan
+'	Dim tf As Label
+'	tf.Initialize("")
+'	tf.TextSize = 20
+'	tf.Color = Colors.gray
+'	tf.Gravity = Gravity.CENTER_VERTICAL
+'	tf.Text = "Hola"
+'	px.AddView(tf, 0, 0, px.Width - 10dip, px.Height)
+'	B4XPages.GetManager.ActionBar.RunMethod("setCustomView", Array(px))
+'	B4XPages.GetManager.ActionBar.RunMethod("setDisplayOptions", Array(16, 16))
 	
 	Provider.Initialize
 '	Subs.borraArribaDe100Errores 	' Para Websockets
@@ -694,6 +706,7 @@ Sub i_engrane_Click
 	If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1782")
 '	l_server.Text = Starter.DBReqServer
 	et_server.Text = Starter.DBReqServer
+	If user.Text = "KMTS1" Then b_importarBD.Visible = True Else b_importarBD.Visible = False
 	Subs.panelVisible(p_appUpdate,0,0)
 End Sub
 
@@ -757,4 +770,13 @@ Sub CheckNotificationAccess As Boolean
 	pstr = r.GetStaticField("anywheresoftware.b4a.BA", "packageName")
 	nstr = ph.GetSettings("enabled_notification_listeners")
 	Return nstr.Contains(pstr)
+End Sub
+
+Private Sub b_importarBD_Click
+	Private FH As FileHandler
+	FH.Initialize
+	Wait For (FH.Load) Complete (Result As LoadResult) 'Abre un fileManager para seleccionar la base de datos a importar.
+	File.Copy(Result.Dir, Result.FileName, File.DirInternal, "kmt.db") 'Copia la base de datos seleccionada al directorio interno.
+	Starter.skmt.Initialize(Starter.ruta,"kmt.db", True) 'Reiniciliza la base de datos con la recien importada.
+	ToastMessageShow("¡BD importada!", False)
 End Sub

B4A/C_Cliente.bas

@@ -140,6 +140,7 @@ Sub Class_Globals
 	Private Label20 As Label
 	Private l_calle1 As Label
 	Private l_ubicacion2 As Label
+	Private l_version As Label
 End Sub
 
 'You can add more parameters here.
@@ -149,27 +150,30 @@ End Sub
 
 'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
+	B4XPages.SetTitle(Me, $"${subs.capitalizar(B4XPages.GetPageId(Me))} - ${Application.VersionName}"$)
 	Root = Root1
 	'load the layout to Root
 '	Activity.RemoveAllViews
 	Root.LoadLayout("cliente")
+	l_version.Text = Application.VersionName
+	Subs.centraPanel(Panel1, Root.Width)
 	ruta = File.DirInternal
 	If File.Exists(ruta, "kmt.db") = False Then
 		File.Copy(File.DirAssets, "kmt.db", ruta, "kmt.db")
 	End If
 	skmt.Initialize(ruta,"kmt.db", True)
-	c=skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA  from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)")
+	c = skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA  from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)")
-	s=skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
+	s = skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
-	s.Position=0
+	s.Position = 0
 	If c.RowCount>0 Then
-		c.Position=0
+		c.Position = 0
 		la_cuenta.Text = c.GetString("CAT_CL_CODIGO")
 		cuenta = c.GetString("CAT_CL_CODIGO")
 		La_nombre.Text = c.GetString("CAT_CL_NOMBRE")
 		la_Calle.Text = c.GetString("CAT_CL_CALLE") & c.GetString("CAT_CL_NOEXT")
 		la_col.Text = c.GetString("CAT_CL_COLONIA")
 		la_edo.Text = c.GetString("CAT_CL_EDO")
-'			 la_cp.Text = c.GetString("CAT_CL_CP")
+'		la_cp.Text = c.GetString("CAT_CL_CP")
 		l_entre1.Text = c.GetString("CAT_CL_NOEXT")
 		l_entre2.Text = c.GetString("CAT_CL_NOINT")
 		l_atiende.Text = c.GetString("CAT_CL_ATIENDE1")

B4A/C_Clientes.bas

@@ -64,7 +64,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 End Sub
 
 Sub B4XPage_Appear
-	B4XPages.SetTitle(Me, $"Clientes - ${Starter.dia_semana}"$)
+	B4XPages.SetTitle(Me, $"Clientes - ${Starter.dia_semana} - ${Application.VersionName}"$)
 	busca.Text = ""
 	entro ="2"
 	colonia = 0

B4A/C_Historico.bas

@@ -39,6 +39,7 @@ End Sub
 
 'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
+	B4XPages.SetTitle(Me, $"${subs.capitalizar(B4XPages.GetPageId(Me))} - ${Application.VersionName}"$)
 	Root = Root1
 	'load the layout to Root
 	ruta = File.DirInternal

B4A/C_NoVenta.bas

@@ -40,6 +40,7 @@ End Sub
 
 'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
+	B4XPages.SetTitle(Me, $"${subs.capitalizar(B4XPages.GetPageId(Me))} - ${Application.VersionName}"$)
 	Root = Root1
 	'load the layout to Root
 	Root.LoadLayout("noventa")

B4A/C_Nota.bas

@@ -43,6 +43,7 @@ End Sub
 
 'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
+	B4XPages.SetTitle(Me, $"${subs.capitalizar(B4XPages.GetPageId(Me))} - ${Application.VersionName}"$)
 	Root = Root1
 	ruta = File.DirInternal
 	Root.LoadLayout("nota")

B4A/C_NuevoCliente.bas

@@ -52,6 +52,7 @@ End Sub
 
 'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
+	B4XPages.SetTitle(Me, $"${subs.capitalizar(B4XPages.GetPageId(Me))} - ${Application.VersionName}"$)
 	Root = Root1
 	'load the layout to Root
 	Root.LoadLayout("nuevocliente")

B4A/C_Pedidos.bas

@@ -68,6 +68,7 @@ End Sub
 
 'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
+	B4XPages.SetTitle(Me, $"${subs.capitalizar(B4XPages.GetPageId(Me))} - ${Application.VersionName}"$)
 	Root = Root1
 	'load the layout to Root
 	Root.LoadLayout("pedido")

B4A/C_Principal.bas

@@ -225,6 +225,7 @@ Sub Class_Globals
 	
 	Private p_principal As Panel
 	Private p_mandaInfo As Panel
+	Private l_version As Label
 End Sub
 
 'You can add more parameters here.
@@ -237,7 +238,12 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Root = Root1
 	'load the layout to Root
 	Root.LoadLayout("principal")
+	B4XPages.SetTitle(Me, $"${Subs.capitalizar(B4XPages.GetPageId(Me))}   ${Application.VersionName}"$)
 	s.Initialize(Me, "Subs")
+	p_mandaInfo.Width = Root.Width
+	p_mandaInfo.Height = Root.Height
+	s.centraPanel(P1, Root.Width)
+	l_version.Text = Application.VersionName
 	rd.Initialize 'Inicializamos el respaldo diario.
 	rd.vacuum
 	EJECUTANDO=1
@@ -481,11 +487,7 @@ End Sub
 
 Sub Subir_Click
 	CARGA = "SUBIR"
-	p_mandaInfo.Width = Root.Width
-	p_mandaInfo.Height = Root.Height
 	P1.Visible = True
-	P1.Left = (p_mandaInfo.Width/2) - (P1.Width/2)
-	P1.top = (p_mandaInfo.Height/2) - (P1.Height/2)
 	p_mandaInfo.Visible = True
 	P1.BringToFront
 	p_mandaInfo.BringToFront
@@ -689,7 +691,7 @@ Sub Subir_Click
 '		Dim fotox() As Byte
 '		Dim cmd As DBCommand
 '		c = Starter.skmt.ExecQuery("Select CODIGO, ALMACEN, RUTA, NOM_FOTO from HIST_FOTO_CLIENTE")
-'
+		'
 '		c.Position = 0
 '		
 '		Dim Dirp As String = File.DirInternal
@@ -745,197 +747,195 @@ Sub cargar_Click
 		End If
 	End If
 	If Not (pedidodiaanterior) Then
-	CARGA = "CARGAR"
+		CARGA = "CARGAR"
-	p_mandaInfo.Width = Root.Width
+		s.panelVisible(p_mandaInfo, 0, 0)
-	p_mandaInfo.Height = Root.Height
+		P1.Left = (p_mandaInfo.Width/2) - (P1.Width/2)
-	P1.Left = (p_mandaInfo.Width/2) - (P1.Width/2)
+		P1.top = (p_mandaInfo.Height/2) - (P1.Height/2)
-	P1.top = (p_mandaInfo.Height/2) - (P1.Height/2)
+		img2.Visible =True
-	img2.Visible =True
+		L_P_1.Visible = True
-	L_P_1.Visible = True
+		S_CC.Visible = True
-	S_CC.Visible = True
+		Btn_Ubicar.Visible = False
-	Btn_Ubicar.Visible=False
+		p_mandaInfo.Visible = True
-	P1.Visible = True
+		p_principal.Visible = False
-	p_mandaInfo.Visible = True
+		Subs.panelVisible(P1, 0, 0)
-	p_principal.Visible = False
+		Subs.centraPanel(P1, Root.Width)
-	Subs.panelVisible(P1, 0, 0)
+		Subs.centraPanelV(P1, Root.Height)
-	Subs.centraPanel(P1, Root.Width)
+'		trabajar.Visible = False
-	Subs.centraPanelV(P1, Root.Height)
+		NUEVO.Visible =False
-'	trabajar.Visible = False
+		BUSCA.Visible=False
-	NUEVO.Visible =False
+		connecta.Visible=False
-	BUSCA.Visible=False
+		L_P_3.Visible = True
-	connecta.Visible=False
+		S_CH.Visible = True
-	L_P_3.Visible = True
+		PB1.Visible = True
-	S_CH.Visible = True
+		Resumen.Visible= False
-	PB1.Visible = True
-	Resumen.Visible= False
 
-	L_P_1.Text = "Catalogo de Clientes"
+		L_P_1.Text = "Catalogo de Clientes"
-	L_P_2.Text = "Catalogos de Productos"
+		L_P_2.Text = "Catalogos de Productos"
-	L_P_3.Text = "Catalogos Historicos"
+		L_P_3.Text = "Catalogos Historicos"
-	S_CC.Text = "EN PROCESO"
+		S_CC.Text = "EN PROCESO"
-	S_CH.Text = "EN PROCESO"
+		S_CH.Text = "EN PROCESO"
-	S_CP.Text = "EN PROCESO"
+		S_CP.Text = "EN PROCESO"
-	PB1.Progress = 0
+		PB1.Progress = 0
-	PB2.Progress = 0
+		PB2.Progress = 0
-	EJECUTANDO = 1
+		EJECUTANDO = 1
 
-	'c=skmt.ExecQuery("CREATE TABLE kmt_info (pr_cd_credito NUMERIC,pr_cd_nombre TEXT,pr_cd_calle TEXT,pr_cd_numero TEXT,pr_cd_num_int TEXT,pr_cd_entrecalle1 TEXT,pr_cd_entrecalle2 TEXT,pr_cd_colonia TEXT,pr_cd_poblacion TEXT,pr_cd_edo TEXT,pr_cd_cp TEXT,pr_cd_zona TEXT,pr_cf_credito NUMERIC,pr_cf_saldotot NUMERIC,pr_cf_saldooper NUMERIC,pr_cf_saldof1 NUMERIC, pr_cf_penalizacion NUMERIC)")
+		'c=skmt.ExecQuery("CREATE TABLE kmt_info (pr_cd_credito NUMERIC,pr_cd_nombre TEXT,pr_cd_calle TEXT,pr_cd_numero TEXT,pr_cd_num_int TEXT,pr_cd_entrecalle1 TEXT,pr_cd_entrecalle2 TEXT,pr_cd_colonia TEXT,pr_cd_poblacion TEXT,pr_cd_edo TEXT,pr_cd_cp TEXT,pr_cd_zona TEXT,pr_cf_credito NUMERIC,pr_cf_saldotot NUMERIC,pr_cf_saldooper NUMERIC,pr_cf_saldof1 NUMERIC, pr_cf_penalizacion NUMERIC)")
-	TOPE = 0
+		TOPE = 0
-	' NUEVOS CLIENTE
+		' NUEVOS CLIENTE
 	
-	Starter.skmt.ExecNonQuery("delete from kmt_info")
+		Starter.skmt.ExecNonQuery("delete from kmt_info")
-	Starter.skmt.ExecNonQuery("delete from cod_result")
+		Starter.skmt.ExecNonQuery("delete from cod_result")
-	Starter.skmt.ExecNonQuery("delete from CAT_GIRO")
+		Starter.skmt.ExecNonQuery("delete from CAT_GIRO")
-	Starter.skmt.ExecNonQuery("delete from BANDERA")
+		Starter.skmt.ExecNonQuery("delete from BANDERA")
-	Starter.skmt.ExecNonQuery("delete from hist_gest")
+		Starter.skmt.ExecNonQuery("delete from hist_gest")
-	Starter.skmt.ExecNonQuery("delete from cat_gunaprod")
+		Starter.skmt.ExecNonQuery("delete from cat_gunaprod")
-	Starter.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ")
+		Starter.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ")
-	Starter.skmt.ExecNonQuery("delete from telefonos")
+		Starter.skmt.ExecNonQuery("delete from telefonos")
-	Starter.skmt.ExecNonQuery("delete from HIST_VENTAS")
+		Starter.skmt.ExecNonQuery("delete from HIST_VENTAS")
-	Starter.skmt.ExecNonQuery("delete from HIST_PROMOS")
+		Starter.skmt.ExecNonQuery("delete from HIST_PROMOS")
-	Starter.skmt.ExecNonQuery("delete from HIST_CLIENTE_CANT_PROMOS")
+		Starter.skmt.ExecNonQuery("delete from HIST_CLIENTE_CANT_PROMOS")
-	Starter.skmt.ExecNonQuery("delete from PROMOS_COMP")
+		Starter.skmt.ExecNonQuery("delete from PROMOS_COMP")
-	Starter.skmt.ExecNonQuery("delete from CAT_VERIFICACION")
+		Starter.skmt.ExecNonQuery("delete from CAT_VERIFICACION")
-	Starter.skmt.ExecNonQuery("DELETE FROM MARCAS_RUTAS")
+		Starter.skmt.ExecNonQuery("DELETE FROM MARCAS_RUTAS")
-	Starter.skmt.ExecNonQuery("DELETE FROM HIST_STAY_STORE")
+		Starter.skmt.ExecNonQuery("DELETE FROM HIST_STAY_STORE")
-	Starter.skmt.ExecNonQuery("DELETE FROM HIST_GEOCERCA")
+		Starter.skmt.ExecNonQuery("DELETE FROM HIST_GEOCERCA")
-	Starter.skmt.ExecNonQuery("DELETE FROM HIST_MARCAS_CUOTAS")
+		Starter.skmt.ExecNonQuery("DELETE FROM HIST_MARCAS_CUOTAS")
-	Starter.skmt.ExecNonQuery("DELETE FROM HIST_AVANCE")
+		Starter.skmt.ExecNonQuery("DELETE FROM HIST_AVANCE")
 
-	c = Starter.skmt.ExecQuery2("select count(CAT_VA_DESCRIPCION) as HoraIngreso from cat_variables where CAT_VA_DESCRIPCION = ? ", Array As String("HoraIngreso"))
+		c = Starter.skmt.ExecQuery2("select count(CAT_VA_DESCRIPCION) as HoraIngreso from cat_variables where CAT_VA_DESCRIPCION = ? ", Array As String("HoraIngreso"))
-	c.Position = 0
+		c.Position = 0
-	DateTime.TimeFormat = "HHmmss"
+		DateTime.TimeFormat = "HHmmss"
-	'Valida si ya se cuenta con hora actualiza el valor si no lo inserta-----------
+		'Valida si ya se cuenta con hora actualiza el valor si no lo inserta-----------
-	If c.GetString("HoraIngreso") > 0 Then
+		If c.GetString("HoraIngreso") > 0 Then
-		Starter.skmt.ExecNonQuery2("Update cat_variables set CAT_VA_VALOR = ?  WHERE CAT_VA_DESCRIPCION = ?" , Array As String(DateTime.Time(DateTime.Now),"HoraIngreso"))
+			Starter.skmt.ExecNonQuery2("Update cat_variables set CAT_VA_VALOR = ?  WHERE CAT_VA_DESCRIPCION = ?" , Array As String(DateTime.Time(DateTime.Now),"HoraIngreso"))
-	Else
+		Else
-		Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_VALOR,CAT_VA_DESCRIPCION)  VALUES (?,?)" , Array As String(DateTime.Time(DateTime.Now),"HoraIngreso"))
+			Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_VALOR,CAT_VA_DESCRIPCION)  VALUES (?,?)" , Array As String(DateTime.Time(DateTime.Now),"HoraIngreso"))
-	End If
+		End If
-	c.Close
+		c.Close
-	DateTime.TimeFormat = "HH:mm:ss"
+		DateTime.TimeFormat = "HH:mm:ss"
-	c=Starter.skmt.ExecQuery("select usuario from usuarioa")
+		c=Starter.skmt.ExecQuery("select usuario from usuarioa")
-	c.Position = 0
+		c.Position = 0
-	usuario = c.GetString("USUARIO")
+		usuario = c.GetString("USUARIO")
-	c.Close
+		c.Close
 '	
-	Dim sDate,sTime As String
+		Dim sDate,sTime As String
-	DateTime.DateFormat = "MM/dd/yyyy"
+		DateTime.DateFormat = "MM/dd/yyyy"
-	sDate=DateTime.Date(DateTime.Now)
+		sDate=DateTime.Date(DateTime.Now)
-	sTime=DateTime.Time(DateTime.Now)
+		sTime=DateTime.Time(DateTime.Now)
 	
-	Dim P As PhoneId
+		Dim P As PhoneId
 '	imei = P.GetDeviceId
-	imei = "yyyy"
+		imei = "yyyy"
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name ="insert_drop_MARDS_2"
+		cmd.Name ="insert_drop_MARDS_2"
-	cmd.Parameters = Array As Object(usuario,l_ruta.Text,sDate & sTime, l_porvisitar.Text,l_drop.Text,l_efectiva.Text,l_cuantosc.Text,l_cuantosn.Text, L_MONTOD.Text,"CARGA",ALMACEN)
+		cmd.Parameters = Array As Object(usuario,l_ruta.Text,sDate & sTime, l_porvisitar.Text,l_drop.Text,l_efectiva.Text,l_cuantosc.Text,l_cuantosn.Text, L_MONTOD.Text,"CARGA",ALMACEN)
-	reqManager.ExecuteCommand(cmd , "inst_noventa")
+		reqManager.ExecuteCommand(cmd , "inst_noventa")
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_cat_gunaprod_MARDS"
+		cmd.Name = "select_cat_gunaprod_MARDS"
-	cmd.Parameters = Array As Object(ALMACEN)
+		cmd.Parameters = Array As Object(ALMACEN)
-	reqManager.ExecuteQuery(cmd , 0, "gunaprod")
+		reqManager.ExecuteQuery(cmd , 0, "gunaprod")
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_cat_bandera_MARDS"
+		cmd.Name = "select_cat_bandera_MARDS"
-	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
-	reqManager.ExecuteQuery(cmd , 0, "bandera")
+		reqManager.ExecuteQuery(cmd , 0, "bandera")
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_cat_GIRO_MARDS"
+		cmd.Name = "select_cat_GIRO_MARDS"
-	reqManager.ExecuteQuery(cmd , 0, "giro")
+		reqManager.ExecuteQuery(cmd , 0, "giro")
 	
 '	cmd.Initialize
 '	cmd.Name = "select_resum_apk_INTMEX"   ''' va el nombre de archivo de config
 '	cmd.Parameters = Array As Object(ALMACEN)
 '	reqManager.ExecuteQuery(cmd , 0, "resum_apk") ''' donde regresa la info ver job_done
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_cat_paquetes_MARDS3"
+		cmd.Name = "select_cat_paquetes_MARDS3"
-	cmd.Parameters = Array As Object(ALMACEN)
+		cmd.Parameters = Array As Object(ALMACEN)
-	reqManager.ExecuteQuery(cmd , 0, "gunaprodp")
+		reqManager.ExecuteQuery(cmd , 0, "gunaprodp")
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_cat_paquetess_MARDS"
+		cmd.Name = "select_cat_paquetess_MARDS"
-	cmd.Parameters = Array As Object(ALMACEN)
+		cmd.Parameters = Array As Object(ALMACEN)
-	reqManager.ExecuteQuery(cmd , 0, "gunaprodp")
+		reqManager.ExecuteQuery(cmd , 0, "gunaprodp")
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_cat_detallepa_MARDS"
+		cmd.Name = "select_cat_detallepa_MARDS"
-	cmd.Parameters = Array As Object(ALMACEN)
+		cmd.Parameters = Array As Object(ALMACEN)
-	reqManager.ExecuteQuery(cmd , 0, "detallepaq")
+		reqManager.ExecuteQuery(cmd , 0, "detallepaq")
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_cat_clientes_MARDS"
+		cmd.Name = "select_cat_clientes_MARDS"
-	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
-	reqManager.ExecuteQuery(cmd , 0, "kmt_datos")
+		reqManager.ExecuteQuery(cmd , 0, "kmt_datos")
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_hist_datos_MARDS_2"
+		cmd.Name = "select_hist_datos_MARDS_2"
-	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.text, ALMACEN)
+		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.text, ALMACEN)
-	reqManager.ExecuteQuery(cmd , 0, "hist_datos")
+		reqManager.ExecuteQuery(cmd , 0, "hist_datos")
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_hist_promos_MARDS"
+		cmd.Name = "select_hist_promos_MARDS"
-	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
-	reqManager.ExecuteQuery(cmd , 0, "hist_promos")
+		reqManager.ExecuteQuery(cmd , 0, "hist_promos")
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_hist_cliente_promos_MARDS"
+		cmd.Name = "select_hist_cliente_promos_MARDS"
-	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
-	reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos")
+		reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos")
 	
 '	cmd.Initialize
 '	cmd.Name = "select_HIST_MARCAS_CUOTAS_INTMEX"
 '	cmd.Parameters = Array As Object( ALMACEN, e_ruta.text)
 '	reqManager.ExecuteQuery(cmd , 0, "HIST_MARCAS_CUOTAS")
 	
-	If E_RUTA2.text <> "" Then
+		If E_RUTA2.text <> "" Then
-		cmd.Initialize
+			cmd.Initialize
-		cmd.Name = "select_cat_clientes_MARDS"
+			cmd.Name = "select_cat_clientes_MARDS"
-		cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN)
+			cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN)
-		reqManager.ExecuteQuery(cmd , 0, "kmt_datos")
+			reqManager.ExecuteQuery(cmd , 0, "kmt_datos")
 	
-		cmd.Initialize
+			cmd.Initialize
-		cmd.Name = "select_hist_datos_MARDS"
+			cmd.Name = "select_hist_datos_MARDS"
-		cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN)
+			cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN)
-		reqManager.ExecuteQuery(cmd , 0, "hist_datos")
+			reqManager.ExecuteQuery(cmd , 0, "hist_datos")
 	
-		cmd.Initialize
+			cmd.Initialize
-		cmd.Name = "select_hist_promos_MARDS"
+			cmd.Name = "select_hist_promos_MARDS"
-		cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN)
+			cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN)
-		reqManager.ExecuteQuery(cmd , 0, "hist_promos")
+			reqManager.ExecuteQuery(cmd , 0, "hist_promos")
 	
-		cmd.Initialize
+			cmd.Initialize
-		cmd.Name = "select_hist_cliente_promos_MARDS"
+			cmd.Name = "select_hist_cliente_promos_MARDS"
-		cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN)
+			cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN)
-		reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos")
+			reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos")
-	End If
+		End If
 
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_promo_comp_MARDS"
+		cmd.Name = "select_promo_comp_MARDS"
-	cmd.Parameters = Array As Object(ALMACEN)
+		cmd.Parameters = Array As Object(ALMACEN)
-	reqManager.ExecuteQuery(cmd , 0, "hist_comp_promos")
+		reqManager.ExecuteQuery(cmd , 0, "hist_comp_promos")
 	
 '	cmd.Initialize
 '	cmd.Name = "select_verificacion_INTMEX"
 '	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
 '	reqManager.ExecuteQuery(cmd , 0, "cat_verificacion")
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_fecha"
+		cmd.Name = "select_fecha"
-	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
-	reqManager.ExecuteQuery(cmd , 0, "fecha")
+		reqManager.ExecuteQuery(cmd , 0, "fecha")
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_folio_MARDS"
+		cmd.Name = "select_folio_MARDS"
-	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
-	reqManager.ExecuteQuery(cmd , 0, "folio")
+		reqManager.ExecuteQuery(cmd , 0, "folio")
 	
-	cmd.Initialize
+		cmd.Initialize
-	cmd.Name = "select_marcas_rutas_MARDS"
+		cmd.Name = "select_marcas_rutas_MARDS"
-	cmd.Parameters = Array As Object( ALMACEN, e_ruta.text)
+		cmd.Parameters = Array As Object( ALMACEN, e_ruta.text)
-	reqManager.ExecuteQuery(cmd , 0, "marcas_rutas")
+		reqManager.ExecuteQuery(cmd , 0, "marcas_rutas")
 	
 '	cmd.Initialize
 '	cmd.Name = "select_CUEST_INTMEX"
@@ -958,9 +958,9 @@ Sub cargar_Click
 '	LogColor($"HIST_AVANCE Ruta=|${e_ruta.text}|, almacen=|${ALMACEN}|"$, Colors.Red)
 '	reqManager.ExecuteQuery(cmd , 0, "hist_avance")
 	
-	cargar.Visible = False
+		cargar.Visible = False
-	Subir.Visible = False
+		Subir.Visible = False
-	inv.Visible = False
+		inv.Visible = False
 		If Starter.marcaCel <> "Sony" Then ToastMessageShow("Se Actualizaran los datos, Este proceso podria tardar hasta un minuto, gracias" , True)
 	Else
 		Log("XXXX")
@@ -1778,6 +1778,7 @@ Sub connecta_Click
 	Log(Starter.DBReqServer)
 	connecta1 = connecta1 + 1
 '	imei = p.GetDeviceId
+	IME.HideKeyboard
 	imei = ""
 	conn = "1"
 	Dim cmd As DBCommand

B4A/C_Productos.bas

@@ -91,6 +91,7 @@ End Sub
 
 'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
+	B4XPages.SetTitle(Me, $"${subs.capitalizar(B4XPages.GetPageId(Me))} - ${Application.VersionName}"$)
 	Root = Root1
 	'load the layout to Root
 '	Activity.RemoveAllViews

B4A/C_Promos.bas

@@ -56,6 +56,7 @@ End Sub
 
 'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
+	B4XPages.SetTitle(Me, $"${subs.capitalizar(B4XPages.GetPageId(Me))} - ${Application.VersionName}"$)
 	Root = Root1
 	'load the layout to Root
 	Root.LoadLayout("promociones")

B4A/C_Subs.bas

@@ -371,16 +371,6 @@ Sub centraProgressBar(elemento As ProgressBar, anchoElementoSuperior As Int) 'ig
 	elemento.Left = Round(anchoElementoSuperior/2)-(elemento.Width/2)
 End Sub
 
-'Regresa el usuario de la tabla USUARIOA si es que existe, si no existe, regresa "SinUsuario".
-Sub buscaDBUsuario As String 'ignore
-	Private c As Cursor
-	Private usuario As String = "SinUsuario"
-	c=kmt.ExecQuery("select USUARIO from usuarioa")
-	c.Position=0
-	If c.RowCount > 0 Then usuario = c.GetString("USUARIO")
-	Return usuario
-End Sub
-
 'Regresa la fecha en el formato "MM/dd/yyyy"
 Sub traeFecha As String 'ignore
 	DateTime.DateFormat = "MM/dd/yyyy"
@@ -596,3 +586,22 @@ Sub mandaPendientes 'ignore
 	End If
 	ab.Close
 End Sub
+
+'Borra el pedido del cliente actual.
+'Borra los registros de la tabla "pedido" y "pedido_cliente"
+'Actualiza las tablas "cat_gunaprod" y "kmt_info".
+Sub borraPedidoClienteActual As String
+	Private thisC As Cursor
+	thisC=Starter.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ")
+	If thisC.RowCount>0 Then
+		For i=0 To thisC.RowCount -1
+			thisC.Position=i
+			Starter.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?", Array As Object(thisC.GetString("PE_CANT"),thisC.GetString("PE_PROID")))
+			Starter.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (traeAlmacen, thisC.GetString("PE_PROID"),thisC.GetString("PE_CANT")* -1))
+		Next
+	End If
+	Starter.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
+	Starter.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)")
+	Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
+	Return 1
+End Sub

B4A/C_TicketsDia.bas

@@ -25,6 +25,7 @@ End Sub
 
 'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
+	B4XPages.SetTitle(Me, $"Tickets Día - ${Application.VersionName}"$)
 	Root = Root1
 	'load the layout to Root
 	ruta = File.DirInternal

B4A/FileHandler.bas

@@ -0,0 +1,162 @@
+B4A=true
+Group=Default Group
+ModulesStructureVersion=1
+Type=Class
+Version=11
+@EndOfDesignText@
+'Requiere la librería "ContentResolver" y "FileProvider" o "AppUpdating"
+'
+'Copiar este codigo al boton_Click que se quiere que importe la base de datos.
+'
+' Private Sub b_importarBD_Click
+'	Private FH As FileHandler
+'	FH.Initialize
+'	Wait For (FH.Load) Complete (Result As LoadResult) 'Abre un fileManager para seleccionar la base de datos a importar.
+'	File.Copy(Result.Dir, Result.FileName, File.DirInternal, "kmt.db") 'Copia la base de datos seleccionada al directorio interno.
+'	Starter.skmt.Initialize(Starter.ruta,"kmt.db", True) 'Reiniciliza la base de datos con la recien importada.
+'	ToastMessageShow("¡BD importada!", False)
+' End Sub
+
+Sub Class_Globals
+	#if B4A
+	Private ion As Object
+	Private OldIntent As Intent
+	#end if
+	Type LoadResult (Success As Boolean, Dir As String, FileName As String, RealName As String, Size As Long, Modified As Long, MimeType As String)
+End Sub
+
+Public Sub Initialize
+
+End Sub
+
+#if B4A
+Public Sub SaveAs (Source As InputStream, MimeType As String, Title As String) As ResumableSub
+	Dim intent As Intent
+	intent.Initialize("android.intent.action.CREATE_DOCUMENT", "")
+	intent.AddCategory("android.intent.category.OPENABLE")
+	intent.PutExtra("android.intent.extra.TITLE", Title)
+	intent.SetType(MimeType)
+	StartActivityForResult(intent)
+	Wait For ion_Event (MethodName As String, Args() As Object)
+	If -1 = Args(0) Then 'resultCode = RESULT_OK
+		Dim result As Intent = Args(1)
+		Dim jo As JavaObject = result
+		Dim ctxt As JavaObject
+		Dim out As OutputStream = ctxt.InitializeContext.RunMethodJO("getContentResolver", Null).RunMethod("openOutputStream", Array(jo.RunMethod("getData", Null)))
+		File.Copy2(Source, out)
+		out.Close
+		Return True
+	End If
+	Return False
+End Sub
+
+Public Sub Load As ResumableSub
+	Dim cc As ContentChooser
+	cc.Initialize("cc")
+	cc.Show("application/octet-stream", "Choose text file")
+	Wait For CC_Result (Success As Boolean, Dir As String, FileName As String)
+	Log($"***************************${CRLF}${Dir}${CRLF} ${FileName}"$)
+	Dim res As LoadResult = CreateLoadResult(Success, Dir, FileName)
+	Log($"***************************${CRLF}${res.FileName}${CRLF} ${res}"$)
+	If res.Success Then ExtractInformationFromURI(res.FileName, res)
+	Return res
+End Sub
+
+Private Sub StartActivityForResult(i As Intent)
+	Dim jo As JavaObject = GetBA
+	ion = jo.CreateEvent("anywheresoftware.b4a.IOnActivityResult", "ion", Null)
+	jo.RunMethod("startActivityForResult", Array(ion, i))
+End Sub
+
+Private Sub GetBA As Object
+	Return Me.As(JavaObject).RunMethod("getBA", Null)
+End Sub
+
+Private Sub ExtractInformationFromURI (Uri As String, res As LoadResult)
+	Try
+		
+	Dim resolver As ContentResolver
+	resolver.Initialize("")
+	Dim u As Uri
+	u.Parse(Uri)
+	Dim rs As ResultSet = resolver.Query(u, Null, "", Null, "")
+	If rs.NextRow Then
+		Dim columns As B4XSet = B4XCollections.CreateSet
+		For i = 0 To rs.ColumnCount - 1
+			columns.Add(rs.GetColumnName(i))
+		Next
+		If columns.Contains("_display_name") Then res.RealName = rs.GetString("_display_name")
+		If columns.Contains("_size") Then res.Size = rs.GetLong("_size")
+		If columns.Contains("last_modified") Then res.Modified = rs.GetLong("last_modified")
+		If columns.Contains("mime_type") Then res.MimeType = rs.GetString("mime_type")
+	End If
+	rs.Close
+	
+	Catch
+		Log("error extracting information from file provider")
+		Log(LastException)
+	End Try
+End Sub
+
+Public Sub CheckForReceivedFiles As LoadResult
+	Dim Activity As Activity = B4XPages.GetNativeParent(B4XPages.MainPage)
+	If IsRelevantIntent(Activity.GetStartingIntent) Then
+		Dim in As Intent = Activity.GetStartingIntent
+		Dim uri As String
+		If in.HasExtra("android.intent.extra.STREAM") Then
+			uri = in.As(JavaObject).RunMethod("getParcelableExtra", Array("android.intent.extra.STREAM"))
+		Else
+			uri = in.GetData
+		End If
+		Dim res As LoadResult = CreateLoadResult(True, "ContentDir", uri)
+		ExtractInformationFromURI(res.FileName, res)
+		Return res
+	End If
+	Return CreateLoadResult(False, "", "")
+End Sub
+
+Private Sub IsRelevantIntent(in As Intent) As Boolean
+	If in.IsInitialized And in <> OldIntent And in.Action = in.ACTION_VIEW Then
+		OldIntent = in
+		Return True
+	End If
+	Return False
+End Sub
+
+#else if B4i
+Public Sub SaveAs(ParentPage As Object, AnchorView As Object, Text As String) As ResumableSub
+	Dim avc As ActivityViewController
+	avc.Initialize("avc", Array(Text))
+	avc.Show(B4XPages.GetNativeParent(ParentPage), AnchorView)
+	Wait For avc_Complete (Success As Boolean, ActivityType As String)
+	Return Success
+End Sub
+
+Public Sub Load (ParentPage As Object, AnchorView As Object) As ResumableSub
+	Dim DocumentPicker As DocumentPickerViewController
+	DocumentPicker.InitializeImport("picker", Array("public.text"))
+	DocumentPicker.Show(B4XPages.GetNativeParent(ParentPage), AnchorView)
+	Wait For Picker_Complete (Success As Boolean, URLs As List)
+	If Success And URLs.Size > 0 Then
+		Return UrlToLoadResult(URLs.Get(0))
+	End If
+	Return CreateLoadResult(False, "", "")
+End Sub
+
+Public Sub UrlToLoadResult(url As String) As LoadResult
+	Dim res As LoadResult = CreateLoadResult(IIf(File.Exists(url, ""), True, False), url, "")
+	res.RealName = res.Dir.SubString(res.Dir.LastIndexOf("/") + 1)
+	res.Size = File.Size(res.Dir, "")
+	Return res
+End Sub
+#end if
+
+Private Sub CreateLoadResult (Success As Boolean, Dir As String, FileName As String) As LoadResult
+	Dim t1 As LoadResult
+	t1.Initialize
+	t1.Success = Success
+	t1.Dir = Dir
+	t1.FileName = FileName
+	Return t1
+End Sub
+