28/10/23 - Se agrega còdigo para indicar la fecha del respaldo a restaurar.

- Si se agrega un numero negativo despues de la contraseña de la carga local, se toma el respaldo de "hoy menos x dias" para restaurar.
2026-04-20 19:49:12 +00:00 · 2023-10-28 02:42:22 -06:00
parent 261fe2b924
commit b42ce5947a
24 changed files with 534 additions and 462 deletions
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -206,8 +206,8 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 '	End If
 '	Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("ULTIMOMODULO"))
 '	Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("ULTIMOMODULO", "MAIN"))
-	c=Starter.skmt.ExecQuery2("select count(*) as CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SERVER"))
+	c = Starter.skmt.ExecQuery2("select count(*) as CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SERVER"))
-	c.Position =0
+	c.Position = 0
 	If c.GetString("CUANTOS") = 0 Then
 		Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("SERVER", Starter.DBReqServer))
 '	Else
@@ -224,7 +224,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 '	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_WRITE_EXTERNAL_STORAGE)
 '	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
 '	If Result Then Log("Tenemos permisos de escritura externa.")
-	c=Starter.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS FROM TMP_INSPECCION_AUTO_DIARIA")
+	c = Starter.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS FROM TMP_INSPECCION_AUTO_DIARIA")
 	c.Position = 0
 	CUANTOS = c.GetString("CUANTOS")
 	c.Close
@@ -355,13 +355,13 @@ Sub B4XPage_Appear
 	Starter.rutaPreventa =  0
 	Starter.CANTIDADPROD = 0
 	c.Close
-	c=Starter.skmt.ExecQuery2("select count(*) as CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("CODIGO"))
+	c = Starter.skmt.ExecQuery2("select count(*) as CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("CODIGO"))
-	c.Position =0
+	c.Position = 0
 	CUANTOS = c.GetString("CUANTOS")
 	c.Close
 	If CUANTOS > 0 Then
-		c=Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("CODIGO"))
+		c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("CODIGO"))
-		c.Position =0
+		c.Position = 0
 		If c.GetString("CAT_VA_VALOR") = "743" Then
 			Entrar.Visible = True
 		End If
@@ -370,15 +370,15 @@ Sub B4XPage_Appear
 		Log("INSERTAMOS CODIGO EN CAT_VARIABLES")
 		Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("CODIGO","743"))
 	End If
-	c=Starter.skmt.ExecQuery2("select COUNT(*) AS CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MACIMP"))
+	c = Starter.skmt.ExecQuery2("select COUNT(*) AS CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MACIMP"))
-	c.Position =0
+	c.Position = 0
 	If c.GetString("CUANTOS") = 0 Then
 		Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("MACIMP","0"))
 	End If
-	D=Starter.skmt.ExecQuery("select COUNT(*) AS CUANTOS from version")
+	D = Starter.skmt.ExecQuery("select COUNT(*) AS CUANTOS from version")
-	D.Position=0
+	D.Position = 0
 	If D.GetString("CUANTOS") > 0 Then
-		c=Starter.skmt.ExecQuery("select NOVERSION from version")
+		c = Starter.skmt.ExecQuery("select NOVERSION from version")
 		c.Position = 0
 		If c.GetString("NOVERSION") = "2.1" Then
 			Starter.skmt.ExecNonQuery("delete from VERSION")
@@ -386,10 +386,10 @@ Sub B4XPage_Appear
 		c.Close
 	End If
 	D.Close
-	D=Starter.skmt.ExecQuery("select COUNT(*) AS CUANTOS from version")
+	D = Starter.skmt.ExecQuery("select COUNT(*) AS CUANTOS from version")
-	D.Position=0
+	D.Position = 0
 	If D.GetString("CUANTOS") > 0 Then
-		c=Starter.skmt.ExecQuery("select NOVERSION from version")
+		c = Starter.skmt.ExecQuery("select NOVERSION from version")
 		c.Position = 0
 		If c.GetString("NOVERSION") <> "2.95" Then
 			Msgbox("INSTALAR NUEVO APK" ,"AVISO") 'ignore
@@ -417,8 +417,8 @@ Sub Entrar_Click
 		B4XPages.ShowPage("Principal")
 	End If
 '	c=Starter.skmt.ExecQuery2("select count(*) as EXISTE1 from usuarioa where usuario = ?", Array As String(user.Text))
-	c=Starter.skmt.ExecQuery2($"select count(*) as EXISTE1 from usuarioa where usuario = ? and fecha = ${DateTime.Date(DateTime.Now)}"$, Array As String(user.Text))
+	c = Starter.skmt.ExecQuery2($"select count(*) as EXISTE1 from usuarioa where usuario = ? and fecha = ${DateTime.Date(DateTime.Now)}"$, Array As String(user.Text))
-	c.Position=0
+	c.Position = 0
 	existe = c.GetString("EXISTE1")
 '	Log($"${existe}, ${DateTime.Date(DateTime.Now)}, ${user.Text}"$ )
 	'existe = 1
@@ -562,8 +562,8 @@ Sub user_EnterPressed
 		user.Text = ""
 	End If
 	DateTime.DateFormat = "yyyyMMdd"
-	c=Starter.skmt.ExecQuery2($"select count(*) as EXISTE1 from usuarioa where usuario = ? and fecha = ${DateTime.Date(DateTime.Now)}"$, Array As String(user.Text))
+	c = Starter.skmt.ExecQuery2($"select count(*) as EXISTE1 from usuarioa where usuario = ? and fecha = ${DateTime.Date(DateTime.Now)}"$, Array As String(user.Text))
-	c.Position=0
+	c.Position = 0
 	existe = c.GetString("EXISTE1")
 	If existe = 1 Then Subs.iniciaActividad("Principal")
 End Sub
@@ -580,8 +580,8 @@ Sub ImageView4_Click
 	Label1.TextColor = Colors.Black
 	If user.Text = "KMTS1" Then ListView1.AddSingleLine("http://10.0.0.205:1782")
 	ListView1.AddSingleLine("http://keymon.lat:1782")
-	c=Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SERVER"))
+	c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SERVER"))
-	c.Position =0
+	c.Position = 0
 	E_SERVER.text = c.GetString("CAT_VA_VALOR")
 	Panel1.Visible = True
 	Panel1.Width = Root.Width * 0.95
@@ -634,8 +634,8 @@ Sub b_fdCancelar_Click
 End Sub
 Sub b_findiaOk_Click
-	c=Starter.skmt.ExecQuery2("select count(*) as passOk from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ? and CAT_VA_VALOR = ?", Array As String ("FINDIA_PASS", et_autSup.Text))
+	c = Starter.skmt.ExecQuery2("select count(*) as passOk from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ? and CAT_VA_VALOR = ?", Array As String ("FINDIA_PASS", et_autSup.Text))
-	c.Position =0
+	c.Position = 0
 	If c.GetString("passOk") = 1 Or et_autSup.Text = "FinDiaAutOk" Then
 		Starter.skmt.ExecNonQuery("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'FINDIA_FECHA'")
 		ToastMessageShow("Ya se puede hacer FIN DIA!!", True)
@@ -679,13 +679,30 @@ End Sub
 Private Sub p_cargaLocal_Click
 End Sub
 'Recibe la contraseña para la carga local -> "CL" + diaMes * 3 + numMes * 4
 'Ej: para el 5 de agosto serìa : CL1532
 'Si se agrega un numero despues de la contraseña, lo toma como los dia hacia atras para tomar el dìa de respaldo.
 'Ej: CL1532-2  Serìa restaurar el respaldo del dìa 3 de agosto (5-2), puede haber espacios entre la clave y el numero de dìas.
 Private Sub b_cargaLocalOk_Click
 	Private pass1 As String = "CL" & (3 * DateTime.GetDayOfMonth(DateTime.now)) & (DateTime.GetMonth(DateTime.now) * 4)
-	If et_cargaLocal.Text = pass1 Then 
+	If et_cargaLocal.Text.StartsWith(pass1) Then 
 		p_cargaLocal.Visible = False
-'		Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD")
+'		Log(et_cargaLocal.Text.Length > pass1.Length)
-'		Log("OK")
+		kh.RD_fechaRestauracion = ""
-'		kh.string2date("10/03/2023")
+		If et_cargaLocal.Text.Length > pass1.Length Then
 			Private dias As String = et_cargaLocal.Text.SubString(pass1.Length).Trim
 '			Log("|" & dias & "|")
 			If IsNumber(dias) Then
 				Dim p As Period
 				p.Days = dias
 				Dim nextdate As Long = DateUtils.AddPeriod(DateTime.Now, p)
 				kh.RD_fechaRestauracion = nextdate
 '				Log($"Next date: $Date{nextdate}"$)   ' Next date: 20231018
 			Else
 				Log("NOT NUMBER")
 			End If
 		End If
 		kh.revisaRkmtAttached
 		kh.RD_restaura_cat_gunaprod
 		kh.RD_restaura_cat_gunaprod2
--- a/B4A/C_CheckList.bas
+++ b/B4A/C_CheckList.bas
@@ -543,7 +543,7 @@ Sub Bt_GuardarCheck_Click
 	If kmsOk = 1 And fotosOk = 1 Then
 		CUANTOS = 0
-		c=Starter.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS  FROM TMP_INSPECCION_AUTO_DIARIA")
+		c = Starter.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS FROM TMP_INSPECCION_AUTO_DIARIA")
 		If c.RowCount > 0 Then
 			c.Position = 0
 			CUANTOS = c.GetString("CUANTOS")
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -279,6 +279,8 @@ Sub Class_Globals
 	Dim errorImpresora As Int = 0
 	Private b_inicioFinVenta As Button
 	Dim dentroDeGeocerca As Boolean = False
 	Dim motivoNoVenta As String = ""
 	Dim precision As Int = 0
 End Sub
 'You can add more parameters here.
@@ -366,7 +368,7 @@ Sub B4XPage_Appear
 '	Log(Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
 	b_inicioFinVenta.Text = "INICIAR VENTA"
 	b_inicioFinVenta.BringToFront
-	If Not(Starter.enVenta) Then
+	If Not(Starter.enVenta) And la_cuenta.Text <> "0" Then
 		b_inicioFinVenta.Visible = True
 '		Log("EnVenta Visible")
 	Else
@@ -378,7 +380,7 @@ Sub B4XPage_Appear
 '	P_INF_GENERAL.Height = Root.Height
 '	P_INF_GENERAL.Width = Root.Width
-	c=Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MACIMP"))
+	c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MACIMP"))
 	c.Position = 0
 	If c.RowCount > 0 Then
 		MAC_IMPRESORA = c.GetString("CAT_VA_VALOR")
@@ -393,6 +395,8 @@ Sub B4XPage_Appear
 	If Not(muestraBoleta) Then Subs.panelVisibleCompleto(P_INF_GENERAL, Root)
 	p_pideGeoPass.Visible = False
 '	If Logger Then Log(muestraBoleta)
 	usuario = Subs.traeUsuarioDeBD
 	Id_Almacen = Subs.traeAlmacen
 	CallSubDelayed(Tracker, "StartFLP2")
 	b_ubicacion.Text = "SIN GPS"
 	b_ubicacion.TextColor = Colors.Red
@@ -430,6 +434,7 @@ Sub B4XPage_Appear
 			l_atiende2.Text = c.GetString("CAT_CL_ATIENTE2")
 			l_total.Text = s.GetString("TOTAL_CLIE")
 			total_cliente = s.GetString("TOTAL_CLIE")
 '			Log(Subs.sumaPedido(Subs.traeCliente) & " - " & total_cliente)
 			m_lat =c.GetString("CAT_CL_LAT")
 			m_lon =c.GetString("CAT_CL_LONG")
 			CREDITO_DISPONIBLE = c.GetString("CAT_CL_BFACTURA")
@@ -458,6 +463,7 @@ Sub B4XPage_Appear
 				If la_cuenta.Text = "0" Then
 					CREDITO_DISPONIBLE = 10000000
 					CREDITO = 0
 					b_inicioFinVenta.Visible = False
 				End If
 			End If
 			If S1.GetString("CUANTOS") = 0 Then
@@ -494,7 +500,7 @@ Sub B4XPage_Appear
 			la_saldotot.Text = MONTO_COMPRA
 			If MONTO_COMPRA <> "0" Then
-				META2 = 300 -  MONTO_COMPRA
+				META2 = NumberFormat2((300 - MONTO_COMPRA), 0, 4, 2, False)
 			Else
 				META2 = 300
 			End If
@@ -611,7 +617,7 @@ Sub B4XPage_Appear
 					c2=Starter.skmt.ExecQuery2("SELECT CAT_GP_ALMACEN FROM CAT_GUNAPROD2 WHERE CAT_GP_ID = ? ", Array As String("1008094223"))
 					c2.Position = 0
 					If c2.GetString("CAT_GP_ALMACEN") > 0 Then
-						b_whats.Visible = True
+'						b_whats.Visible = True
 					End If
 					c2.Close
 				End If
@@ -786,12 +792,10 @@ Sub Guardar_Click
 	c=Starter.skmt.ExecQuery("Select CUENTA from cuentaa")
 	c.Position=0
 	clie_id = c.GetString("CUENTA")
-	c=Starter.skmt.ExecQuery("select USUARIO from usuarioa")
+	usuario = Subs.traeUsuarioDeBD
 	c.Position=0
 	usuario = c.GetString("USUARIO")
 	If l_total.Text <> Null And l_total.Text <> "null" Then Subs.ponImpreso(clie_id) 'Solo lo marcamos com impreso si tiene venta (total > 0).
-	c=Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
+	c = Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
-	c.Position=0
+	c.Position = 0
 	If c.GetString("CUANTOS") > 0 Then
 		Starter.skmt.ExecNonQuery("delete from NOVENTA where NV_CLIENTE In (select cuenta from cuentaa)")
 		Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
@@ -837,7 +841,14 @@ Sub Guardar_Click
 '	B4XPages.ShowPageAndRemovePreviousPages("Principal")
 	Guardar.SendToBack
 	b_inicioFinVenta.Text = "TERMINAR VENTA"
 	If la_cuenta.Text <> "0" Then 'Si es ABORDO, no mostramos el boton b_inicioFinVenta y regresamos a Principal.
 		b_inicioFinVenta.Visible = True
 	Else
 		b_inicioFinVenta.Visible = False
 		Starter.enVenta = False
 		Subs.iniciaActividad("principal")
 		B4XPages.ShowPageAndRemovePreviousPages("Principal")
 	End If
 End Sub
 Sub NUEVO_Click
@@ -990,15 +1001,15 @@ Sub B_IMP2_Click
 	If la_cuenta.Text <> "0" And la_cuenta.Text <> "null" Then
 		Starter.skmt.ExecNonQuery2("UPDATE PEDIDO SET PE_TIPO = ? WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) ", Array As Object("VENTA"))
 		Starter.skmt.ExecNonQuery("UPDATE kmt_info set IMPRESION = 1 where CAT_CL_CODIGO In (select cuenta from cuentaa)")''
 		Guardar.Visible = True
 	End If
 	Guardar.Visible = True
 	Starter.skmt.ExecNonQuery("delete from pedido3")
-	Starter.skmt.ExecNonQuery("INSERT INTO PEDIDO3 (PE_PRECIO2,	PE_TIPO,	PE_DESC,	PE_COSTO_SIN,	PE_RUTA,	PE_CEDIS,	 PE_COSTO_TOT,	 PE_COSTOU,	 PE_CANT,	PE_PRONOMBRE,	PE_PROID,	PE_CLIENTE,	PE_USUARIO ) SELECT PE_PRECIO2,	PE_TIPO, PE_DESC, PE_COSTO_SIN,	PE_RUTA, PE_CEDIS,	SUM(PE_COSTO_TOT) AS PE_COSTO_TOT,	 PE_COSTOU,	SUM(PE_CANT) As PE_CANT,	PE_PRONOMBRE,	PE_PROID,	PE_CLIENTE,		PE_USUARIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) GROUP BY PE_PRECIO2,	PE_TIPO,	PE_DESC,	PE_COSTO_SIN,	PE_RUTA,	PE_CEDIS,	PE_COSTOU, PE_PRONOMBRE,	PE_PROID, PE_CLIENTE ")
+	Starter.skmt.ExecNonQuery("INSERT INTO PEDIDO3 (PE_PRECIO2,	PE_TIPO, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_USUARIO) SELECT PE_PRECIO2,	PE_TIPO, PE_DESC, PE_COSTO_SIN,	PE_RUTA, PE_CEDIS,	SUM(PE_COSTO_TOT) AS PE_COSTO_TOT,	 PE_COSTOU,	SUM(PE_CANT) As PE_CANT,	PE_PRONOMBRE,	PE_PROID,	PE_CLIENTE,		PE_USUARIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) GROUP BY PE_PRECIO2,	PE_TIPO,	PE_DESC,	PE_COSTO_SIN,	PE_RUTA,	PE_CEDIS,	PE_COSTOU, PE_PRONOMBRE,	PE_PROID, PE_CLIENTE ")
 	c=Starter.skmt.ExecQuery("select PE_PRECIO2,PE_TIPO,PE_FOLIO,PE_DESC,PE_COSTO_SIN,PE_RUTA,PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,	PE_FECHA,PE_USUARIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
-	If c.RowCount>0 Then
+	If c.RowCount > 0 Then
-		For i=0 To c.RowCount -1
+		For i = 0 To c.RowCount -1
-			c.Position=i
+			c.Position = i
 			Starter.skmt.ExecNonQuery2("UPDATE PEDIDO3 SET PE_FECHA= ? WHERE PE_CLIENTE = ? AND PE_PRONOMBRE = ? AND PE_PROID = ? AND PE_CEDIS = ? AND PE_FOLIO = ?", Array As Object(c.GetString("PE_FECHA"), c.GetString("PE_CLIENTE"),c.GetString("PE_PRONOMBRE"),c.GetString("PE_PROID"),c.GetString("PE_CEDIS"), c.GetString("PE_FOLIO")))
 		Next
 	End If
@@ -1200,7 +1211,7 @@ Sub B_IMP2_Click
 			''''''' PEDIDOS DOE
-			s=Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT, PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_CEDIS = ?  AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS,PE_PRONOMBRE", Array As String("DOE"))
+			s= Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT, PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_CEDIS = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS,PE_PRONOMBRE", Array As String("DOE"))
 			''		s=Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT, PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_TIPO = ? and pe_codpromo = ? and substr(pe_pronombre,1,6) <> ? AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS,PE_PRONOMBRE", Array As String("VENTA", "DOE", "CAMBIO"))
 			If S.RowCount>0 Then
@@ -1240,13 +1251,15 @@ Sub B_IMP2_Click
 			s=Starter.skmt.ExecQuery2("select sum(PE_CANT) as CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CEDIS <> PE_PROID AND PE_CEDIS = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("DOE"))
 			s.Position = 0
 			Private sTotal2 As Double
 			Log(sTotal2)
 			If s.GetString("TOTAL") <> Null And IsNumber(s.GETSTRING("TOTAL")) Then
 				sTotal2 = s.GetString("TOTAL")
 				sTotal2 = Subs.sumaPedido(Subs.traeCliente)
 				Printer1.WriteString(  $"Sub Total :   $${NumberFormat2(sTotal2, 1, 2, 2, False)}"$ & CRLF)
 			Else
 				sTotal2 = 0
 			End If
 			Log(sTotal2)
 			Private cantidad1 As String = "0"
 			If s.GetString("CANTIDAD") <> Null And IsNumber(s.GetString("CANTIDAD")) Then
 				cantidad1 = s.GetString("CANTIDAD")
@@ -1471,9 +1484,9 @@ Sub B_IMP2BAK_Click
 	Starter.skmt.ExecNonQuery("INSERT INTO PEDIDO3 (PE_PRECIO2,	PE_TIPO,	PE_DESC,	PE_COSTO_SIN,	PE_RUTA,	PE_CEDIS,	 PE_COSTO_TOT,	 PE_COSTOU,	 PE_CANT,	PE_PRONOMBRE,	PE_PROID,	PE_CLIENTE,	PE_USUARIO ) SELECT PE_PRECIO2,	PE_TIPO, PE_DESC, PE_COSTO_SIN,	PE_RUTA, PE_CEDIS,	SUM(PE_COSTO_TOT) AS PE_COSTO_TOT,	 PE_COSTOU,	SUM(PE_CANT) As PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_USUARIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) GROUP BY PE_PRECIO2, PE_TIPO, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, PE_COSTOU, PE_PRONOMBRE,	PE_PROID, PE_CLIENTE ")
 	c=Starter.skmt.ExecQuery("select PE_PRECIO2,PE_TIPO,PE_FOLIO,PE_DESC,PE_COSTO_SIN,PE_RUTA,PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,	PE_FECHA,PE_USUARIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
-	If c.RowCount>0 Then
+	If c.RowCount > 0 Then
-		For i=0 To c.RowCount -1
+		For i = 0 To c.RowCount - 1
-			c.Position=i
+			c.Position = i
 			Starter.skmt.ExecNonQuery2("UPDATE PEDIDO3 SET PE_FECHA= ? WHERE PE_CLIENTE = ? AND PE_PRONOMBRE = ? AND PE_PROID = ? AND PE_CEDIS = ? AND PE_FOLIO = ?", Array As Object(c.GetString("PE_FECHA"), c.GetString("PE_CLIENTE"),c.GetString("PE_PRONOMBRE"),c.GetString("PE_PROID"),c.GetString("PE_CEDIS"), c.GetString("PE_FOLIO")))
 		Next
 	End If
@@ -1678,7 +1691,7 @@ Sub B_IMP2BAK_Click
 			Printer1.WriteString("------------------------------" & CRLF)
 			Printer1.WriteString("PEDIDO DON TOÑO" & CRLF)
 			Printer1.WriteString("------------------------------" & CRLF)
-			s=Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT, PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_CEDIS = ?  AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS,PE_PRONOMBRE", Array As String("DOE"))
+			s = Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT, PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_CEDIS = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS,PE_PRONOMBRE", Array As String("DOE"))
 			''		s=Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT, PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_TIPO = ? and pe_codpromo = ? and substr(pe_pronombre,1,6) <> ? AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS,PE_PRONOMBRE", Array As String("VENTA", "DOE", "CAMBIO"))
 			If S.RowCount>0 Then
@@ -1711,7 +1724,7 @@ Sub B_IMP2BAK_Click
 			End If
 			s.Close
-			s=Starter.skmt.ExecQuery2("select sum(PE_CANT) as CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL  FROM PEDIDO WHERE PE_CEDIS <> PE_PROID AND PE_CEDIS = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("DOE"))
+			s = Starter.skmt.ExecQuery2("select sum(PE_CANT) as CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CEDIS <> PE_PROID AND PE_CEDIS = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("DOE"))
 			s.Position = 0
 			Private sTotal2 As Double
 			If s.GetString("TOTAL") <> Null And IsNumber(s.GETSTRING("TOTAL")) Then
@@ -1769,7 +1782,7 @@ Sub B_IMP2BAK_Click
 				Next
 			End If
 			s.Close
-			s=Starter.skmt.ExecQuery2("select sum(PE_CANT) as CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL  FROM PEDIDO WHERE PE_CEDIS <> PE_PROID AND PE_TIPO = ? and substr(pe_pronombre,1,6) <> ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("VENTA","CAMBIO"))
+			s = Starter.skmt.ExecQuery2("select sum(PE_CANT) as CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CEDIS <> PE_PROID AND PE_TIPO = ? and substr(pe_pronombre,1,6) <> ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("VENTA","CAMBIO"))
 			s.Position = 0
 			Private sTotal2 As Double
 			If s.GetString("TOTAL") <> Null And IsNumber(s.GETSTRING("TOTAL")) Then
@@ -1815,7 +1828,7 @@ Sub B_IMP2BAK_Click
 			End If
 			s.Close
-			s=Starter.skmt.ExecQuery2("select sum(PE_CANT) as CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL  FROM PEDIDO WHERE  PE_CEDIS <> PE_PROID AND  PE_TIPO = ? and substr(pe_pronombre,1,6) = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("VENTA","CAMBIO"))
+			s = Starter.skmt.ExecQuery2("select sum(PE_CANT) as CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CEDIS <> PE_PROID AND PE_TIPO = ? and substr(pe_pronombre,1,6) = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("VENTA","CAMBIO"))
 			s.Position = 0
 			Private sTotal3 As Double
 			If s.GetString("TOTAL") <> Null And IsNumber(s.GetString("TOTAL")) Then
@@ -1941,7 +1954,6 @@ Sub StartPrinter
 	End If
 End Sub
 Sub B_VENTA_Click
 	If la_cuenta.Text = "0" Then
 		Starter.tipov = "ABORDO"
@@ -2861,13 +2873,13 @@ Sub B_IMP_INVBAK_Click
 	Printer1.WriteString("---II---CD---IIT---VT---RMI---IF---" & CRLF)
 	' aqui es donde esta el pedo de julieta de los descuentos quitar el precio2 pero meter un if para saber si es ruta especial o es normal o que show.
-	s=Starter.skmt.ExecQuery2 ("select CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_ALMACEN  from cat_gunaprod2 where CAT_GP_CLASIF <> ? ORDER BY CAT_GP_NOMBRE ", Array As String("PROMOS"))
+	s = Starter.skmt.ExecQuery2 ("select CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_ALMACEN from cat_gunaprod2 where CAT_GP_CLASIF <> ? ORDER BY CAT_GP_NOMBRE ", Array As String("PROMOS"))
 	Log($"Reglones: ${s.RowCount}"$)
-	If s.RowCount>0 Then
+	If s.RowCount > 0 Then
-		For i=0 To S.RowCount -1
+		For i = 0 To S.RowCount - 1
 			Log(i)
 			Try
-				s.Position=i
+				s.Position = i
 				Printer1.WriteString(s.GetString("CAT_GP_NOMBRE")  & CRLF)
 				Log("p"&i)
 			Catch
@@ -2875,10 +2887,10 @@ Sub B_IMP_INVBAK_Click
 				If logger Then Log("Saliendo con Try/Catch")
 				Exit
 			End Try
-			S1=Starter.skmt.ExecQuery2("select CAT_GP_ALMACEN from cat_gunaprod5 where CAT_GP_ID = ?", Array As String(s.GetString("CAT_GP_ID")))
+			S1 = Starter.skmt.ExecQuery2("select CAT_GP_ALMACEN from cat_gunaprod5 where CAT_GP_ID = ?", Array As String(s.GetString("CAT_GP_ID")))
-			S1.Position=0
+			S1.Position = 0
-			S3=Starter.skmt.ExecQuery2("select count(*) as CUANTOS from HIST_ABORDO where HIST_PROID = ?", Array As String(s.GetString("CAT_GP_ID")))
+			S3 = Starter.skmt.ExecQuery2("select count(*) as CUANTOS from HIST_ABORDO where HIST_PROID = ?", Array As String(s.GetString("CAT_GP_ID")))
-			S3.Position=0
+			S3.Position = 0
 			If S3.GetString("CUANTOS") > 0 Then
 				S2=Starter.skmt.ExecQuery2("select HIST_CANT from HIST_ABORDO where HIST_PROID = ?", Array As String(s.GetString("CAT_GP_ID")))
 				S2.Position=0
@@ -2898,8 +2910,8 @@ Sub B_IMP_INVBAK_Click
 			'Printer1.WriteString("CARGA TOTAL : " &  S1.GetString("CAT_GP_ALMACEN") & CRLF)
 			a_total =  S1.GetString("CAT_GP_ALMACEN")
-			C4=Starter.skmt.ExecQuery2("select count(*) as CUANTOS from pedido where substr(pe_pronombre,1,6) <> ? AND PE_TIPO = ? and  PE_PROID = ? ", Array As String("CAMBIO","VENTA", s.GetString("CAT_GP_ID")))
+			C4 = Starter.skmt.ExecQuery2("select count(*) as CUANTOS from pedido where substr(pe_pronombre,1,6) <> ? AND PE_TIPO = ? and PE_PROID = ? ", Array As String("CAMBIO","VENTA", s.GetString("CAT_GP_ID")))
-			C4.Position=0
+			C4.Position = 0
 			If C4.GetString("CUANTOS") > 0 Then
 				C3=Starter.skmt.ExecQuery2("select SUM(PE_CANT) AS CANTIDAD,PE_PRONOMBRE from pedido where substr(pe_pronombre,1,6) <> ? AND PE_TIPO = ? AND PE_PROID = ? GROUP BY PE_PRONOMBRE", Array As String("CAMBIO","VENTA", s.GetString("CAT_GP_ID")))
 				C3.Position=0
@@ -2910,8 +2922,8 @@ Sub B_IMP_INVBAK_Click
 				a_venta = 0
 			End If
 			C4.Close
-			C4=Starter.skmt.ExecQuery2("select count(*) as CUANTOS from pedido where substr(pe_pronombre,1,6) = ? AND PE_PROID = ? ", Array As String("CAMBIO", s.GetString("CAT_GP_ID")))
+			C4 = Starter.skmt.ExecQuery2("select count(*) as CUANTOS from pedido where substr(pe_pronombre,1,6) = ? AND PE_PROID = ? ", Array As String("CAMBIO", s.GetString("CAT_GP_ID")))
-			C4.Position=0
+			C4.Position = 0
 			If C4.GetString("CUANTOS") > 0 Then
 				C1=Starter.skmt.ExecQuery2("select SUM(PE_CANT) AS CANTIDAD,PE_PRONOMBRE from pedido where substr(pe_pronombre,1,6) = ? AND PE_PROID = ? GROUP BY PE_PRONOMBRE", Array As String("CAMBIO", s.GetString("CAT_GP_ID")))
 				C1.Position=0
@@ -3157,13 +3169,13 @@ Sub B_IMP_INV_Click
 	Printer1.WriteString("---II---CD---IIT---VT---------IF---" & CRLF)
 	' aqui es donde esta el pedo de julieta de los descuentos quitar el precio2 pero meter un if para saber si es ruta especial o es normal o que show.
-	s=Starter.skmt.ExecQuery2 ("select CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_ALMACEN  from cat_gunaprod2 where CAT_GP_CLASIF <> ? ORDER BY CAT_GP_NOMBRE ", Array As String("PROMOS"))
+	s = Starter.skmt.ExecQuery2 ("select CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_ALMACEN from cat_gunaprod2 where CAT_GP_CLASIF <> ? ORDER BY CAT_GP_NOMBRE ", Array As String("PROMOS"))
 	Log($"Reglones: ${s.RowCount}"$)
-	If s.RowCount>0 Then
+	If s.RowCount > 0 Then
-		For i=0 To S.RowCount -1
+		For i = 0 To S.RowCount - 1
 			Log(i)
 			Try
-				s.Position=i
+				s.Position = i
 				Printer1.WriteString(s.GetString("CAT_GP_NOMBRE")  & CRLF)
 				Log("p"&i)
 			Catch
@@ -3171,13 +3183,13 @@ Sub B_IMP_INV_Click
 				If logger Then Log("Saliendo con Try/Catch")
 				Exit
 			End Try
-			S1=Starter.skmt.ExecQuery2("select CAT_GP_ALMACEN from cat_gunaprod5 where CAT_GP_ID = ?", Array As String(s.GetString("CAT_GP_ID")))
+			S1 = Starter.skmt.ExecQuery2("select CAT_GP_ALMACEN from cat_gunaprod5 where CAT_GP_ID = ?", Array As String(s.GetString("CAT_GP_ID")))
-			S1.Position=0
+			S1.Position = 0
-			S3=Starter.skmt.ExecQuery2("select count(*) as CUANTOS from HIST_ABORDO where HIST_PROID = ?", Array As String(s.GetString("CAT_GP_ID")))
+			S3 = Starter.skmt.ExecQuery2("select count(*) as CUANTOS from HIST_ABORDO where HIST_PROID = ?", Array As String(s.GetString("CAT_GP_ID")))
-			S3.Position=0
+			S3.Position = 0
 			If S3.GetString("CUANTOS") > 0 Then
-				S2=Starter.skmt.ExecQuery2("select HIST_CANT from HIST_ABORDO where HIST_PROID = ?", Array As String(s.GetString("CAT_GP_ID")))
+				S2 = Starter.skmt.ExecQuery2("select HIST_CANT from HIST_ABORDO where HIST_PROID = ?", Array As String(s.GetString("CAT_GP_ID")))
-				S2.Position=0
+				S2.Position = 0
 				a_inicial =  S1.GetString("CAT_GP_ALMACEN") -  S2.GetString("HIST_CANT")
 			Else
 				a_inicial =  S1.GetString("CAT_GP_ALMACEN")
@@ -3194,8 +3206,8 @@ Sub B_IMP_INV_Click
 			'Printer1.WriteString("CARGA TOTAL : " &  S1.GetString("CAT_GP_ALMACEN") & CRLF)
 			a_total =  S1.GetString("CAT_GP_ALMACEN")
-			C4=Starter.skmt.ExecQuery2("select count(*) as CUANTOS from pedido where substr(pe_pronombre,1,6) <> ? AND PE_TIPO = ? and  PE_PROID = ? ", Array As String("CAMBIO","VENTA", s.GetString("CAT_GP_ID")))
+			C4 = Starter.skmt.ExecQuery2("select count(*) as CUANTOS from pedido where substr(pe_pronombre,1,6) <> ? AND PE_TIPO = ? and PE_PROID = ? ", Array As String("CAMBIO","VENTA", s.GetString("CAT_GP_ID")))
-			C4.Position=0
+			C4.Position = 0
 			If C4.GetString("CUANTOS") > 0 Then
 				C3=Starter.skmt.ExecQuery2("select SUM(PE_CANT) AS CANTIDAD,PE_PRONOMBRE from pedido where substr(pe_pronombre,1,6) <> ? AND PE_TIPO = ? AND PE_PROID = ? GROUP BY PE_PRONOMBRE", Array As String("CAMBIO","VENTA", s.GetString("CAT_GP_ID")))
 				C3.Position=0
@@ -3207,11 +3219,11 @@ Sub B_IMP_INV_Click
 			End If
 			C4.Close
 			''' se conenta esto para el cambio de RMI
-			C4=Starter.skmt.ExecQuery2("select count(*) as CUANTOS from pedido where substr(pe_pronombre,1,6) = ? AND PE_PROID = ? ", Array As String("CAMBIO", s.GetString("CAT_GP_ID")))
+			C4 = Starter.skmt.ExecQuery2("select count(*) as CUANTOS from pedido where substr(pe_pronombre,1,6) = ? AND PE_PROID = ? ", Array As String("CAMBIO", s.GetString("CAT_GP_ID")))
-			C4.Position=0
+			C4.Position = 0
 			If C4.GetString("CUANTOS") > 0 Then
-				C1=Starter.skmt.ExecQuery2("select SUM(PE_CANT) AS CANTIDAD,PE_PRONOMBRE from pedido where substr(pe_pronombre,1,6) = ? AND PE_PROID = ? GROUP BY PE_PRONOMBRE", Array As String("CAMBIO", s.GetString("CAT_GP_ID")))
+				C1 = Starter.skmt.ExecQuery2("select SUM(PE_CANT) AS CANTIDAD,PE_PRONOMBRE from pedido where substr(pe_pronombre,1,6) = ? AND PE_PROID = ? GROUP BY PE_PRONOMBRE", Array As String("CAMBIO", s.GetString("CAT_GP_ID")))
-				C1.Position=0
+				C1.Position = 0
 				RMI = C1.GetString("CANTIDAD")
 			Else
 				RMI = 0
@@ -3345,13 +3357,13 @@ Sub B_IMP_INV_Click
 	End Try
 	If CUANTOS <> CUANTOS1 Then
 		Try
-			c=Starter.skmt.ExecQuery2("select  SUM(PE_CANT) AS CANTIDAD,PE_PRONOMBRE from pedido where substr(pe_pronombre,1,6) = ? GROUP BY PE_PRONOMBRE", Array As String("CAMBIO"))
+			c = Starter.skmt.ExecQuery2("select SUM(PE_CANT) AS CANTIDAD,PE_PRONOMBRE from pedido where substr(pe_pronombre,1,6) = ? GROUP BY PE_PRONOMBRE", Array As String("CAMBIO"))
 			Printer1.WriteString(CRLF)
 			Printer1.WriteString("-----------RMI----------------" & CRLF)
 			Printer1.WriteString(CRLF)
-			If C.RowCount>0 Then
+			If C.RowCount > 0 Then
-				For i=0 To C.RowCount -1
+				For i = 0 To C.RowCount - 1
-					C.Position=i
+					C.Position = i
 					Printer1.WriteString(C.GetString("CANTIDAD") & " " & C.GetString("PE_PRONOMBRE")  & CRLF)
 				Next
 			End If
@@ -3364,22 +3376,22 @@ Sub B_IMP_INV_Click
 	' TOTALES DE LOS ARCHIVOS
 	s.Close
-	S=Starter.skmt.ExecQuery2("select SUM(CAT_GP_ALMACEN) AS CAT_GP_ALMACEN from cat_gunaprod2 WHERE CAT_GP_CLASIF <> ? ", Array As String("PROMOS"))
+	S = Starter.skmt.ExecQuery2("select SUM(CAT_GP_ALMACEN) AS CAT_GP_ALMACEN from cat_gunaprod2 WHERE CAT_GP_CLASIF <> ? ", Array As String("PROMOS"))
-	S.Position=0
+	S.Position = 0
 	a_final =s.GetString("CAT_GP_ALMACEN")
 	S1.Close
-	S1=Starter.skmt.ExecQuery("select SUM(CAT_GP_ALMACEN) AS CAT_GP_ALMACEN from cat_gunaprod5 ")
+	S1 = Starter.skmt.ExecQuery("select SUM(CAT_GP_ALMACEN) AS CAT_GP_ALMACEN from cat_gunaprod5 ")
-	S1.Position=0
+	S1.Position = 0
 	a_total =  S1.GetString("CAT_GP_ALMACEN")
 	a_inicial =  S1.GetString("CAT_GP_ALMACEN")
 	S1.Close
-	ABORDO =0
+	ABORDO = 0
-	C3=Starter.skmt.ExecQuery2("select  SUM(PE_CANT) AS CANTIDAD, SUM(PE_COSTO_TOT) AS PE_TOTAL from pedido where pe_proid <> pe_cedis and substr(pe_pronombre,1,6) <> ? AND PE_CLIENTE <> ?", Array As String("CAMBIO", "0"))
+	C3 = Starter.skmt.ExecQuery2("select SUM(PE_CANT) AS CANTIDAD, SUM(PE_COSTO_TOT) AS PE_TOTAL from pedido where pe_proid <> pe_cedis and substr(pe_pronombre,1,6) <> ? AND PE_CLIENTE <> ?", Array As String("CAMBIO", "0"))
-	C8=Starter.skmt.ExecQuery2("select  SUM(PE_COSTO_TOT) AS PE_TOTAL from pedido where pe_proid <> pe_cedis AND PE_CLIENTE <> ?", Array As String( "0"))
+	C8 = Starter.skmt.ExecQuery2("select SUM(PE_COSTO_TOT) AS PE_TOTAL from pedido where pe_proid <> pe_cedis AND PE_CLIENTE <> ?", Array As String( "0"))
 	C8.Position=0
 	If C3.RowCount > 0 Then
-		C3.Position=0
+		C3.Position = 0
 		a_venta = C3.GetString("CANTIDAD")
 	Else
 		a_venta = 0
@@ -3387,8 +3399,8 @@ Sub B_IMP_INV_Click
 	If a_venta = Null Then a_venta = 0
 	If CUANTOS <> CUANTOS1 Then
-		C1=Starter.skmt.ExecQuery2("select  SUM(PE_CANT) AS CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL from pedido where substr(pe_pronombre,1,6) = ? ", Array As String("CAMBIO"))
+		C1 = Starter.skmt.ExecQuery2("select SUM(PE_CANT) AS CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL from pedido where substr(pe_pronombre,1,6) = ? ", Array As String("CAMBIO"))
-		C1.Position=0
+		C1.Position = 0
 		RMI = C1.GetString("CANTIDAD")
 		RMI_VALOR = C1.GetString("TOTAL")
 		C1.Close
@@ -3430,9 +3442,7 @@ Sub Bt_GuardarBoleta_Click
 	DateTime.DateFormat = "MM/dd/yyyy"
 	sDate=DateTime.Date(DateTime.Now)
 	sTime=DateTime.Time(DateTime.Now)
-	cursorBoleta=Starter.skmt.ExecQuery("select ID_ALMACEN FROM CAT_ALMACEN")
+'	Id_Almacen = Subs.traeAlmacen
 	cursorBoleta.Position=0
 	Id_Almacen=cursorBoleta.GetString("ID_ALMACEN")
 	Starter.skmt.ExecNonQuery("delete from TMP_CAT_BILLETE")
 	Starter.skmt.ExecNonQuery("delete from TMP_CAT_MONEDAS")
 	Starter.skmt.ExecNonQuery2("INSERT INTO TMP_CAT_BILLETE (TMP_BILLE_RUTA, TMP_BILLE_IDALMACEN, TMP_BILLE_FECHA, TMP_BILLE_MIL, TMP_BILLE_QUINIENTOS, TMP_BILLE_DOSCIENTOS, TMP_BILLE_CIEN, TMP_BILLE_CINCUENTA, TMP_BILLE_VEINTE) values (?,?,?,?,?,?,?,?,?)", Array As Object (RutaBoleta,Id_Almacen,sDate & sTime,EDT_CANMIL.Text,EDT_CANQUIN.Text,EDT_CANDOS.Text,EDT_CANCIEN.Text,EDT_CANCIN.Text,EDT_CANVEIN.Text))
@@ -3689,15 +3699,8 @@ Private Sub b_aceptarrpomo_Click
 	c.Position=0
 	usuario = c.GetString("USUARIO")
 	c.Close
-	c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
+'	Id_Almacen = Subs.traeAlmacen
 	If c.RowCount>0 Then
 		C.Position=0
 		Id_Almacen = C.GetString("ID_ALMACEN")
 	End If
 	c.Close
 	Starter.skmt.ExecNonQuery2("INSERT INTO HIST_PROMO_WHATS VALUES (?,?)", Array As Object(l_promowhats.Text, "PROMO ACEPTADA"))
 	Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0 , 0, 1, "KIT DE BIENVENIDA DON TOÑO", "PROMODOE",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,Starter.tipov,0))
 	Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "CAJA CHOCO ZUCARITAS 260 GR", "1008094223",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,Starter.tipov,0))
 	Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008094223"))
@@ -3791,12 +3794,7 @@ Sub JobDone(Job As HttpJob)
 End Sub
 Private Sub BP_DOE_A_Click
-	c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
+'	Id_Almacen = Subs.traeAlmacen
 	If c.RowCount>0 Then
 		C.Position=0
 		Id_Almacen = C.GetString("ID_ALMACEN")
 	End If
 	c.Close
 	DateTime.DateFormat = "MM/dd/yyyy"
 	sDate=DateTime.Date(DateTime.Now)
 	sTime=DateTime.Time(DateTime.Now)
@@ -3881,15 +3879,14 @@ Private Sub BP_DOE_R1_Click
 End Sub
 Private Sub b_inicioFinVenta_Click
 	Private precision As Int = 0
 	If dentroDeGeocerca Then precision = 1
 	If Starter.enVenta Then
-		Subs.bitacora(Subs.fechanormal(DateTime.Now),usuario, Id_Almacen, ruta_tienda, "Termina Venta", la_cuenta.text, "", Subs.fechanormal(DateTime.Now), Starter.lat_gps, Starter.lon_gps, precision, "", "")
+		Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Id_Almacen, ruta_tienda, "Termina Venta", la_cuenta.text, "", Subs.fechanormal(DateTime.Now), Starter.lat_gps, Starter.lon_gps, precision, motivoNoVenta, "")
 		Starter.enVenta = False
 		Subs.iniciaActividad("principal")
 		B4XPages.ShowPageAndRemovePreviousPages("Principal")
 	Else
-		Subs.bitacora(Subs.fechanormal(DateTime.Now),usuario, Id_Almacen, ruta_tienda, "Inicia Venta", la_cuenta.text, Subs.fechanormal(DateTime.Now), "", Starter.lat_gps, Starter.lon_gps, precision, "", "")
+		Subs.bitacora(Subs.fechanormal(DateTime.Now),usuario, Id_Almacen, ruta_tienda, "Inicia Venta", la_cuenta.text, Subs.fechanormal(DateTime.Now), "", Starter.lat_gps, Starter.lon_gps, precision, motivoNoVenta, "")
 		Starter.enVenta = True
 	End If
 	b_inicioFinVenta.Visible = False
--- a/B4A/C_Clientes.bas
+++ b/B4A/C_Clientes.bas
@@ -71,14 +71,14 @@ Sub B4XPage_Appear
 	b_bdd.Visible = True
 '	b_qr.Visible = True
 	busca.Text = ""
-	entro ="2"
+	entro = "2"
 	colonia = 0
-	c=Starter.skmt.ExecQuery2("select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO, CAT_CL_NUM_SERIEFISICO from kmt_info where  CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?) and gestion = 0 and cat_cl_codigo not in (select pe_cliente from pedido) and cat_cl_codigo <> 0 AND CAT_CL_TIPO_RUTA IN (?,?) and CAT_CL_CODIGO not in (select NV_CLIENTE from NOVENTA) ORDER BY CAT_CL_NUM_SERIEFISICO", Array As String("DIA_VISITA",SEMANA, "SEMANAL"))
+	c = Starter.skmt.ExecQuery2("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO, CAT_CL_NUM_SERIEFISICO from kmt_info where CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?) and gestion = 0 and cat_cl_codigo not in (select pe_cliente from pedido) and cat_cl_codigo <> 0 AND CAT_CL_TIPO_RUTA IN (?,?) and CAT_CL_CODIGO not in (select NV_CLIENTE from NOVENTA) ORDER BY CAT_CL_NUM_SERIEFISICO", Array As String("DIA_VISITA",SEMANA, "SEMANAL"))
 	ListView1.Clear
 	lfila.Text = "NOMBRE"
-	If c.RowCount>0 Then
+	If c.RowCount > 0 Then
-		For i=0 To c.RowCount -1
+		For i = 0 To c.RowCount - 1
-			c.Position=i
+			c.Position = i
 			Dim label1 As Label
 			label1 = ListView1.TwoLinesLayout.Label
 			label1.TextSize = 14
@@ -119,12 +119,12 @@ Sub ListView1_ItemClick (Position As Int, Value As Object)
 		End If
 		entro = "3"
 	Else If entro = "3" Then
-		c2=Starter.skmt.ExecQuery2("select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where  gestion = 0 and  CAT_CL_CALLE = ? AND CAT_CL_COLONIA = ? order by CAT_CL_NOMBRE ", Array As String(Value, colonia))
+		c2 = Starter.skmt.ExecQuery2("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where gestion = 0 and CAT_CL_CALLE = ? AND CAT_CL_COLONIA = ? order by CAT_CL_NOMBRE ", Array As String(Value, colonia))
 		ListView1.Clear
 		lfila.text = "Nombre"
-		If c2.RowCount>0 Then
+		If c2.RowCount > 0 Then
-			For i=0 To c2.RowCount -1
+			For i = 0 To c2.RowCount - 1
-				c2.Position=i
+				c2.Position = i
 				ListView1.AddTwoLines(c2.GetString("CAT_CL_CODIGO"), c2.GetString("CAT_CL_NOMBRE"))
 			Next
 		End If
@@ -148,12 +148,12 @@ End Sub
 Sub BUSCA_TextChanged (Old As String, New As String)
 	q_buscar = "%" & busca.Text & "%"
-	c2=Starter.skmt.ExecQuery2("select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ?) and  CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?) and gestion = 0 order by CAT_CL_NOMBRE ", Array As String(q_buscar,q_buscar,"DIA_VISITA"))
+	c2 = Starter.skmt.ExecQuery2("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ?) and CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?) and gestion = 0 order by CAT_CL_NOMBRE ", Array As String(q_buscar,q_buscar,"DIA_VISITA"))
 	ListView1.Clear
 	lfila.text = "Nombre y Calle"
-	If c2.RowCount>0 Then
+	If c2.RowCount > 0 Then
-		For i=0 To c2.RowCount -1
+		For i = 0 To c2.RowCount - 1
-			c2.Position=i
+			c2.Position = i
 			Dim label1 As Label
 			label1 = ListView1.TwoLinesLayout.Label
 			label1.TextSize = 14
@@ -181,11 +181,11 @@ Sub sc_result(atype As String,Values As String)
 	'If Logger Then Log("Type : " & atype)
 	'If Logger Then Log("Value : " & Values)
 	CODIGO = Values
-	c2=Starter.skmt.ExecQuery2("select   COUNT(*) AS ENCONTRADO from kmt_info where CAT_CL_NUM_SERIEFISICO = ?  order by CAT_CL_NOMBRE ", Array As String(CODIGO))
+	c2 = Starter.skmt.ExecQuery2("select COUNT(*) AS ENCONTRADO from kmt_info where CAT_CL_NUM_SERIEFISICO = ? order by CAT_CL_NOMBRE ", Array As String(CODIGO))
-	c2.Position =0
+	c2.Position = 0
 	If c2.GetString("ENCONTRADO") > 0 Then
-		s=Starter.skmt.ExecQuery2("select   CAT_CL_CODIGO from kmt_info where CAT_CL_NUM_SERIEFISICO = ?  order by CAT_CL_NOMBRE ", Array As String(CODIGO))
+		s = Starter.skmt.ExecQuery2("select CAT_CL_CODIGO from kmt_info where CAT_CL_NUM_SERIEFISICO = ? order by CAT_CL_NOMBRE ", Array As String(CODIGO))
-		s.Position =0
+		s.Position = 0
 		Starter.skmt.ExecNonQuery("delete from CUENTAA")
 		Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(s.GetString("CAT_CL_CODIGO")))
 		s.Close
@@ -217,12 +217,12 @@ End Sub
 Sub b_bdd_Click
 	q_buscar = "%" & busca.Text & "%"
-	c2=Starter.skmt.ExecQuery2("select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ?) and gestion = 0 order by CAT_CL_NOMBRE ", Array As String(q_buscar,q_buscar))
+	c2 = Starter.skmt.ExecQuery2("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ?) and gestion = 0 order by CAT_CL_NOMBRE ", Array As String(q_buscar,q_buscar))
 	ListView1.Clear
 	lfila.text = "Nombre y Calle"
-	If c2.RowCount>0 Then
+	If c2.RowCount > 0 Then
-		For i=0 To c2.RowCount -1
+		For i = 0 To c2.RowCount - 1
-			c2.Position=i
+			c2.Position = i
 			Dim label1 As Label
 			label1 = ListView1.TwoLinesLayout.Label
 			label1.TextSize = 14
--- a/B4A/C_Historico.bas
+++ b/B4A/C_Historico.bas
@@ -27,6 +27,7 @@ Sub Class_Globals
 	Private b_desc As Button
 	Private ListView2 As ListView
 	Private B_RMI As Button
 	Private p_historico As Panel
 End Sub
 'You can add more parameters here.
--- a/B4A/C_NoVenta.bas
+++ b/B4A/C_NoVenta.bas
@@ -86,15 +86,18 @@ Sub GUARDA_Click
 	Else
 		motivo = "NO ESTA EL ENCARGADO"
 	End If
 	usuario = Subs.traeUsuarioDeBD
 	If B4XPages.MainPage.cliente.IsInitialized Then
 		B4XPages.MainPage.cliente.motivoNoVenta = motivo
 		Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRuta, "Termina Venta", Subs.traeUsuarioDeBD, "", Subs.fechanormal(DateTime.Now), Starter.lat_gps, Starter.lon_gps, B4XPages.MainPage.cliente.precision, motivo, "")
 		Starter.enVenta = False
 	End If
 	DateTime.DateFormat = "MM/dd/yyyy"
 	sDate=DateTime.Date(DateTime.Now)
 	sTime=DateTime.Time(DateTime.Now)
 	c=Starter.skmt.ExecQuery("select CUENTA from cuentaa")
 	c.Position = 0
 	cuenta = c.GetString("CUENTA")
 	c=Starter.skmt.ExecQuery("select usuario from usuarioa")
 	c.Position = 0
 	usuario = c.GetString("USUARIO")
 	c=Starter.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ")
 	If c.RowCount>0 Then
 		For i=0 To c.RowCount -1
@@ -116,10 +119,8 @@ Sub GUARDA_Click
 			c.Close
 		End If
 	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.ExecNonQuery2("INSERT INTO NOVENTA (NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON) VALUES(?,?,?,?,?,?,?) ", Array As Object (cuenta,sDate & sTime, usuario, motivo,e_comm.text,Starter.lat_gps,Starter.lon_gps))
 	Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 3  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
 	Subs.iniciaActividad("Principal")
--- a/B4A/C_Nota.bas
+++ b/B4A/C_Nota.bas
@@ -51,15 +51,15 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	borra.Visible = True
 	Titulo.Text = "Pedido Actual"
 	Starter.skmt.ExecNonQuery("update pedido set pe_folio = 0 where pe_folio is null")
-	c=Starter.skmt.ExecQuery("select count(*) as EXISTE from pedido_cliente WHERE pc_cliente IN (Select CUENTA from cuentaa)")
+	c = Starter.skmt.ExecQuery("select count(*) as EXISTE from pedido_cliente WHERE pc_cliente IN (Select CUENTA from cuentaa)")
-	C.Position=0
+	C.Position = 0
 	Existe = C.GetString("EXISTE")
 	C.Close
 '	c=Starter.skmt.ExecQuery("select PE_PRONOMBRE,PE_COSTO_TOT, PE_CANT, PE_FOLIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PRONOMBRE asc")
 '	ListView1.Clear
 '	ListView1.TwoLinesLayout.ItemHeight = 90dip
 '	If c.RowCount>0 Then
-'		For i=0 To c.RowCount -1
+'		For i = 0 To c.RowCount -1
 '			c.Position=i
 '			Dim label1 As Label
 '			label1 = ListView1.TwoLinesLayout.Label
@@ -79,8 +79,8 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	list_prodsPedido.Initialize
 	Log("list_prodsPedido.Initialize")
 	If Existe <> 0 Then
-		c=Starter.skmt.ExecQuery("select pc_noart, pc_monto from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
+		c = Starter.skmt.ExecQuery("select pc_noart, pc_monto from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
-		C.Position=0
+		C.Position = 0
 		L_CANT.Text = c.GetString("PC_NOART")
 		L_TOTAL.Text = c.GetString("PC_MONTO")
 	End If
@@ -102,8 +102,8 @@ Sub B4XPage_Appear
 	L_CANT.Text =""
 	L_TOTAL.Text=""
 	Starter.skmt.ExecNonQuery("update pedido set pe_folio = 0 where pe_folio is null")
-	c=Starter.skmt.ExecQuery("select count(*) as EXISTE from pedido_cliente WHERE pc_cliente IN (Select CUENTA from cuentaa)")
+	c = Starter.skmt.ExecQuery("select count(*) as EXISTE from pedido_cliente WHERE pc_cliente IN (Select CUENTA from cuentaa)")
-	C.Position=0
+	C.Position = 0
 	Existe = C.GetString("EXISTE")
 	C.Close
 	c=Starter.skmt.ExecQuery("select PE_PRONOMBRE, PE_COSTO_TOT, PE_CANT, PE_FOLIO, PE_CEDIS, PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PRONOMBRE asc")
@@ -112,8 +112,8 @@ Sub B4XPage_Appear
 	clv_pedidos.Clear
 	ListView1.TwoLinesLayout.ItemHeight = 90dip
 	list_prodsPedido.Clear
-	If c.RowCount>0 Then
+	If c.RowCount  >0 Then
-		For i=0 To c.RowCount -1
+		For i = 0 To c.RowCount - 1
 			cs.Initialize
 			c.Position=i
 			Private txtPromo As String = ""
@@ -139,13 +139,13 @@ Sub B4XPage_Appear
 		Next
 	End If
 	If Existe <> 0 Then
-		c=Starter.skmt.ExecQuery("select sum(pe_cant) AS CANTIDAD, sum(pe_costo_tot) AS MONTO from  pedido where PE_CEDIS <> PE_PROID and pe_cliente in (Select CUENTA from cuentaa)")
+		c = Starter.skmt.ExecQuery("select sum(pe_cant) AS CANTIDAD, sum(pe_costo_tot) AS MONTO from pedido where PE_CEDIS <> PE_PROID and pe_cliente in (Select CUENTA from cuentaa)")
-		C.Position=0
+		C.Position = 0
 		L_CANT.Text = c.GetString("CANTIDAD")
 		L_TOTAL.Text = c.GetString("MONTO")
 		c.Close
-		c=Starter.skmt.ExecQuery("select SUM(IFNULL(PE_DESC,0)) AS DESCUENTO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
+		c = Starter.skmt.ExecQuery("select SUM(IFNULL(PE_DESC,0)) AS DESCUENTO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
-		c.Position=0
+		c.Position = 0
 		b_desc.Visible = False
 	End If
 	c=Starter.skmt.ExecQuery("select count(*) As CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
@@ -198,25 +198,24 @@ End Sub
 Sub borra_Click
 	If folio = "0" Then 'Si el folio es 0 o el cliente actual es "abordo", los deja borrar. - Mod por CHV 220512  'Para que el abordo borre siempre " Or Subs.clienteActual = "0""
-		result =  Msgbox2("Seguro que desea borrar el pedido?","Cancelar pedido", "Si", "", "No", LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
+		result =  Msgbox2("¿Seguro que desea borrar el pedido?","Cancelar pedido", "Si", "", "No", LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
 		If result = DialogResponse.POSITIVE Then
-			c=Starter.skmt.ExecQuery("select PE_PROID,PE_CANT, PE_TIPO FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ")
+'			c = Starter.skmt.ExecQuery("select PE_PROID, PE_CANT, PE_TIPO, PE_CEDIS FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ")
-			If c.RowCount>0 Then
+'			If c.RowCount>0 Then
-				For i=0 To c.RowCount -1
+'				For i=0 To c.RowCount -1
-					c.Position=i
+'					c.Position=i
-					TIPO = c.GetString("PE_TIPO")
+'					TIPO = c.GetString("PE_TIPO")
-					Starter.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(TIPO)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID")))
+'					If c.GetString("PE_CEDIS") <> "DUR" Then Starter.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(TIPO)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID")))
-				Next
+'				Next
-			End If
+'			End If
-			Starter.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
+'			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("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)")
+'			Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
-			
+			Subs.borraPedidoClienteActual
 			B4XPages.MainPage.productos.prodsMap.Initialize 'inicializamos mapa de productos para que noaparezcan como vendidos en la lista
 			B4XPages.MainPage.promos.promosMap.Initialize
 '			Log("Llamamos LlenaProdsLL")
 			If B4XPages.MainPage.productos.PCLV.IsInitialized Then B4XPages.MainPage.productos.LlenaProdsLL(Null, Null)
 			B4XPage_Appear
 		End If
 	Else
@@ -306,19 +305,19 @@ Sub b_desc_Click
 		DateTime.DateFormat = "MM/dd/yyyy"
 		sDate=DateTime.Date(DateTime.Now)
 		sTime=DateTime.Time(DateTime.Now)
-		c=Starter.skmt.ExecQuery("Select CUENTA from cuentaa")
+		c = Starter.skmt.ExecQuery("Select CUENTA from cuentaa")
-		c.Position=0
+		c.Position = 0
 		clie_id = c.GetString("CUENTA")
 		c.Close
-		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")
 		c.Close
 		result =  Msgbox2("Seguro que desea dar descuento del 5%?","Dar descuento", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
 		If result = DialogResponse.POSITIVE Then
 			Starter.skmt.ExecNonQuery("UPDATE pedido SET PE_COSTO_TOT = PE_COSTO_TOT * .95, PE_DESC = 5 WHERE PE_CLIENTE In (select cuenta from cuentaa)")
-			c=Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
+			c = Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
-			c.Position=0
+			c.Position = 0
 			Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
 			If logger Then LogColor($"Insertamos coordenadas en pedido: ${Starter.lon_gps}, ${Starter.lat_gps}"$, Colors.Magenta)
 			Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT) VALUES (?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps))
@@ -329,19 +328,19 @@ Sub b_desc_Click
 		DateTime.DateFormat = "MM/dd/yyyy"
 		sDate=DateTime.Date(DateTime.Now)
 		sTime=DateTime.Time(DateTime.Now)
-		c=Starter.skmt.ExecQuery("Select CUENTA from cuentaa")
+		c = Starter.skmt.ExecQuery("Select CUENTA from cuentaa")
-		c.Position=0
+		c.Position = 0
 		clie_id = c.GetString("CUENTA")
 		c.Close
-		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")
 		c.Close
 		result =  Msgbox2("Seguro que desea CANCELAR el descuento?","Cancelar descuento", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
 		If result = DialogResponse.POSITIVE Then
 			Starter.skmt.ExecNonQuery("UPDATE pedido SET PE_COSTO_TOT = PE_COSTO_TOT / .95, PE_DESC = 0 WHERE PE_CLIENTE In (select cuenta from cuentaa)")
-			c=Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
+			c = Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
-			c.Position=0
+			c.Position = 0
 			Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
 			If logger Then LogColor($"Insertamos coordenadas en pedido: ${Starter.lon_gps}, ${Starter.lat_gps}"$, Colors.Magenta)
 			Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT) VALUES (?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps))
@@ -353,28 +352,28 @@ End Sub
 Private Sub clv_pedidos_ItemLongClick (position As Int, Value As Object)
 	Private thisLog As Boolean = False
-	c=Starter.skmt.ExecQuery("select count(*) as CUANTOS from CLIENTE_IMPRESO where CI_CUENTA in  (Select CUENTA from cuentaa)")
+	c = Starter.skmt.ExecQuery("select count(*) as hayImpresos from CLIENTE_IMPRESO where CI_CUENTA in  (Select CUENTA from cuentaa)")
 	c.Position = 0
 	If thisLog Then Log("lista prods="&list_prodsPedido.Get(position))
 	Private m As Map = list_prodsPedido.Get(position)
-	If c.GetString("CUANTOS") = 0 Then 'Si la venta no está impresa o es abordo entonces continuamos ...   'Para que el aborod borre siempre " Or Subs.clienteActual = "0""
+	If c.GetString("hayImpresos") = 0 Then 'Si la venta no está impresa o es abordo entonces continuamos ...   'Para que el abordo borre siempre " Or Subs.clienteActual = "0""
 		c=Starter.skmt.ExecQuery2("select count(*) as CUANTOS FROM PEDIDO WHERE PE_CEDIS = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("DUR"))
 		c.Position = 0
 		CAMBIOS = c.GetString("CUANTOS")
 		c.Close
-		c=Starter.skmt.ExecQuery2("select PE_PRONOMBRE,PE_COSTO_TOT, PE_CANT, PE_FOLIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_PRONOMBRE = ? order by PE_PRONOMBRE asc", Array As String(Value) )
+		c = Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_COSTO_TOT, PE_CANT, PE_FOLIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_PRONOMBRE = ? order by PE_PRONOMBRE asc", Array As String(Value) )
 		c.Position = 0
 		If c.GetString("PE_FOLIO") = "0" Then   'Para que el abordo borre siempre " Or Subs.clienteActual = "0" "
 			result =  Msgbox2("Seguro que desea borrar este articulo?","Borrar Articulo", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
 			If result = DialogResponse.POSITIVE Then
-				Private prod As Cursor=Starter.skmt.ExecQuery2("select PE_PROID, PE_CANT, PE_CEDIS FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) ", Array As String(Value))
+				Private prod As Cursor = Starter.skmt.ExecQuery2("select PE_PROID, PE_CANT, PE_CEDIS FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) ", Array As String(Value))
-				prod.Position=0
+				prod.Position = 0
 				If thisLog Then Log("m2= " & m)
 				c.Close
 				If thisLog Then Log($"Buscamos: ${Value}, ${m.Get("cedis")}"$)
-				c=Starter.skmt.ExecQuery2("select count(*) AS CUANTOS from cat_gunaprod2 where CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cedis = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'", Array As String(Value, m.Get("cedis")))
+				c = Starter.skmt.ExecQuery2("select count(*) AS CUANTOS from cat_gunaprod2 where CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cedis = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'", Array As String(Value, m.Get("cedis")))
-				c.Position=0
+				c.Position = 0
-				If c.GetString("CUANTOS") > 0 Then
+				If c.GetString("CUANTOS") > 0 Then 'Si es promo, borramos la promo completa del pedido.
 					If thisLog Then Log($"Borramos de PROMO ${Value}"$)
 					Private pPromos As Cursor = Starter.skmt.ExecQuery($"select pe_proid, pe_cant from pedido where pe_cedis = '${m.Get("cedis")}'"$)
 					For tp = 0 To pPromos.RowCount - 1
@@ -385,7 +384,8 @@ Private Sub clv_pedidos_ItemLongClick (position As Int, Value As Object)
 					Starter.skmt.ExecNonQuery2("delete from pedido where pe_cedis in (select pe_cedis from pedido where PE_CEDIS = ? and pe_pronombre = ?) and pe_cliente in (Select CUENTA from cuentaa)", Array As Object(m.Get("cedis"), Value))
 				Else
 					If thisLog Then Log($"SUMAMOS ${m.get("cant")} a ${m.get("prodId")} "$)
-					Starter.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(Starter.tipov)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(m.get("cant"), m.get("prodId")))
+					'Si no es RMI, actualizamos el inventario.
 					If prod.GetString("PE_CEDIS") <> "DUR" Then Starter.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(Starter.tipov)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(m.get("cant"), m.get("prodId")))
 					If thisLog Then Log($"BORRAMOS ${Value}, ${m.Get("cedis")}"$)
 					Starter.skmt.ExecNonQuery2("delete from pedido where pe_pronombre = ?  and pe_cedis = ? and pe_cant = ? and pe_cliente in (Select CUENTA from cuentaa)", Array As Object(Value, m.Get("cedis"), m.Get("cant")))
 				End If
@@ -393,21 +393,19 @@ Private Sub clv_pedidos_ItemLongClick (position As Int, Value As Object)
 				DateTime.DateFormat = "MM/dd/yyyy"
 				sDate=DateTime.Date(DateTime.Now)
 				sTime=DateTime.Time(DateTime.Now)
-				c=Starter.skmt.ExecQuery("Select CUENTA from cuentaa")
+				c = Starter.skmt.ExecQuery("Select CUENTA from cuentaa")
-				c.Position=0
+				c.Position = 0
 				clie_id = c.GetString("CUENTA")
-				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")
-				c=Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
+				c = Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
-				c.Position=0
+				c.Position = 0
 				If c.GetString("CUANTOS") > 0 Then
 					Log($"==============   TOTAL = ${c.GetString("TOTAL_CLIE")}"$)
 					If c.GetString("TOTAL_CLIE") < 1 Then
 						Starter.skmt.ExecNonQuery("delete from pedido where PE_PRONOMBRE like 'CAMBIO%' and PE_CLIENTE In (select cuenta from cuentaa)"$)
 					End If
 					Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
 					If thisLog Then LogColor($"Insertamos coordenadas en pedido: ${Starter.lon_gps}, ${Starter.lat_gps}"$, Colors.Magenta)
 					Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT) VALUES (?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps))
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -210,43 +210,43 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 '	ruta = File.DirInternal
 	DateTime.DateFormat = "MM/dd/yyyy"
 	fecha=DateTime.Date(DateTime.Now)
-	b=Starter.skmt.ExecQuery("Select count(*) as CUANTOS from pedido_cliente")
+	b = Starter.skmt.ExecQuery("Select count(*) as CUANTOS from pedido_cliente")
-	b.Position=0
+	b.Position = 0
 	Cuantos = b.GetString("CUANTOS")
-	d=Starter.skmt.ExecQuery("select count(*) as TOTAL_VISITAR from kmt_info where gestion = 0")
+	d = Starter.skmt.ExecQuery("select count(*) as TOTAL_VISITAR from kmt_info where gestion = 0")
-	D.Position=0
+	D.Position = 0
 	b.Close
-	e=Starter.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info")
+	e = Starter.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info")
-	e.Position=0
+	e.Position = 0
-	f=Starter.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info")
+	f = Starter.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info")
-	f.Position=0
+	f.Position = 0
 	l_ruta.Text = f.GetString("CAT_CL_RUTA")
 	f.Close
 	If l_ruta.Text = 0 Then
-		l_ruta.Text =0
+		l_ruta.Text = 0
 	Else
-		f=Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
+		f = Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
-		f.Position=0
+		f.Position = 0
 		l_ruta.Text = f.GetString("CAT_CL_RUTA")
 		RUTA1.Text = l_ruta.TEXT
 		f.Close
 	End If
 	If Cuantos = 0 Then
-		L_MONTOD.Text =0
+		L_MONTOD.Text = 0
 		l_cuantosc.Text = 0
 		l_cuantosn.Text = 0
 		drop = 0
 		l_drop.Text = 0
 		efectiva = 0
-		l_efectiva.text =0
+		l_efectiva.text = 0
 		l_ctast.Text = d.GetString("TOTAL_VISITAR")
 	'	l_porvisitar.Text = e.GetString("POR_VISITAR")
 	Else
-		c=Starter.skmt.ExecQuery("select sum(pc_monto) as MONTO_DIA, count(pc_cliente) AS CLIENTES_DIA from pedido_cliente ")
+		c = Starter.skmt.ExecQuery("select sum(pc_monto) as MONTO_DIA, count(pc_cliente) AS CLIENTES_DIA from pedido_cliente ")
-		b=Starter.skmt.ExecQuery("select count(*) as CUANTOS from noventa")
+		b = Starter.skmt.ExecQuery("select count(*) as CUANTOS from noventa")
 		'where pc_fecha = ?", Array As String(fecha)
-		C.Position=0
+		C.Position = 0
-		b.Position=0
+		b.Position = 0
 		L_MONTOD.Text = c.GetString("MONTO_DIA")
 		l_cuantosc.Text = c.GetString("CLIENTES_DIA")
 			l_cuantosn.Text = b.GetString("CUANTOS")
@@ -297,27 +297,27 @@ Sub B4XPage_Appear
 	End If
 	e_ruta.Enabled = True
 	Starter.rutaV = l_ruta.Text
-	c=Starter.skmt.ExecQuery2("select count(*) as CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SERVER"))
+	c = Starter.skmt.ExecQuery2("select count(*) as CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SERVER"))
-	c.Position =0
+	c.Position = 0
 	If c.GetString("CUANTOS") = 0 Then
 		Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("SERVER", Starter.DBReqServer))
 	Else
-		c=Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SERVER"))
+		c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SERVER"))
-		c.Position =0
+		c.Position = 0
 		Starter.DBReqServer = c.GetString("CAT_VA_VALOR")
 	End If
-	c=Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("FECHA"))
+	c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("FECHA"))
 	If c.RowCount > 0 Then
 		c.Position = 0
 		Starter.FECHA_HOY = c.GetString("CAT_VA_VALOR")
 	End If
-	c=Starter.skmt.ExecQuery2("select count(*) AS CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SEMANA"))
+	c = Starter.skmt.ExecQuery2("select count(*) AS CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SEMANA"))
-	c.Position =0
+	c.Position = 0
 	SEMANA = c.GetString("CUANTOS")
 	c.Close
 	If SEMANA > 0 Then
-		c=Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SEMANA"))
+		c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SEMANA"))
-		c.Position =0
+		c.Position = 0
 		SEMANA = c.GetString("CAT_VA_VALOR")
 		c.Close
 	End If
@@ -327,7 +327,7 @@ Sub B4XPage_Appear
 	Starter.clientesTotal = c.GetString("CUANTOS")
 	l_porvisitar.Text = Starter.clientesTotal
 	PASO = 0
-	If EJECUTANDO =0 Then
+	If EJECUTANDO = 0 Then
 		Listo1 = 0
 		Listo2 = 0
 		Listo3 = 0
@@ -338,24 +338,24 @@ Sub B4XPage_Appear
 	End If
 	DateTime.DateFormat = "MM/dd/yyyy"
 	fecha=DateTime.Date(DateTime.Now)
-	b=Starter.skmt.ExecQuery("Select count(*) as CUANTOS from pedido_cliente where pc_cliente <> 0")
+	b = Starter.skmt.ExecQuery("Select count(*) as CUANTOS from pedido_cliente where pc_cliente <> 0")
-	b.Position=0
+	b.Position = 0
 	Cuantos = b.GetString("CUANTOS")
 '	If Starter.marcaCel <> "LGE" Then ToastMessageShow(Cuantos , True)
-	d=Starter.skmt.ExecQuery2("select count(*) as TOTAL_VISITAR from kmt_info where gestion = 0 and cat_cl_codigo <> 0 AND CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?)", Array As String("DIA_VISITA"))
+	d = Starter.skmt.ExecQuery2("select count(*) as TOTAL_VISITAR from kmt_info where gestion = 0 and cat_cl_codigo <> 0 AND CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?)", Array As String("DIA_VISITA"))
-	D.Position=0
+	D.Position = 0
 	b.Close
-	e=Starter.skmt.ExecQuery2("select count(*) as POR_VISITAR from kmt_info where cat_cl_codigo <> 0 and CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?) ", Array As String("DIA_VISITA"))
+	e = Starter.skmt.ExecQuery2("select count(*) as POR_VISITAR from kmt_info where cat_cl_codigo <> 0 and CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?) ", Array As String("DIA_VISITA"))
-	e.Position=0
+	e.Position = 0
-	f=Starter.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info where cat_cl_codigo <> 0")
+	f = Starter.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info where cat_cl_codigo <> 0")
-	f.Position=0
+	f.Position = 0
 	l_ruta.Text = f.GetString("CAT_CL_RUTA")
 	f.Close
 	If l_ruta.Text = 0 Then
-		l_ruta.Text =0
+		l_ruta.Text = 0
 	Else
-		f=Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
+		f = Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
-		f.Position=0
+		f.Position = 0
 		l_ruta.Text = f.GetString("CAT_CL_RUTA")
 		f.Close
 	End If
@@ -364,8 +364,8 @@ Sub B4XPage_Appear
 	usuario = c.GetString("USUARIO")
 	Starter.usuario = usuario
 	c.Close
-	c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
+	c = Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
-	C.Position =0
+	C.Position = 0
 	ALMACEN = C.GetString("ID_ALMACEN")
 	C.Close
 	Cursor_check = Starter.skmt.ExecQuery("select count(*) as CUANTOS from TMP_INSPECCION_AUTO_DIARIA where tmp_auto_kilometraje <> '' ")
@@ -437,8 +437,8 @@ Sub trabajar_Click
 		Msgbox("No se ha realizado aún el 'Checklist' del vehículo, por favor completelo antes de realizar una venta.", "FALTA EL CHECKLIST") 'ignore
 		Return
 	End If
-	c=Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MARCAS"))
+	c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MARCAS"))
-	c.Position =0
+	c.Position = 0
 	If c.RowCount > 0 Then
 		MARCASQ = c.GetString("CAT_VA_VALOR")
 		c.Close
@@ -479,9 +479,9 @@ Sub Subir_Click
 	PASO = 1
 	'End If
 	If PASO = 1 Then
-		c=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_RUTA from kmt_info")
+		c = Starter.skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_RUTA from kmt_info")
-		If c.RowCount>0 Then
+		If c.RowCount > 0 Then
-			For i=0 To c.RowCount -1
+			For i = 0 To c.RowCount - 1
 				c.Position=i
 				Starter.skmt.ExecNonQuery2("update PEDIDO set PE_RUTA = ? where PE_CLIENTE = ? ", Array As Object(c.GetString("CAT_CL_RUTA"),c.GetString("CAT_CL_CODIGO")))
 			Next
@@ -847,8 +847,6 @@ Sub cargar_Click
 		inv.Visible = False
 		If Starter.marcaCel <> "LGE" Then ToastMessageShow("Se Actualizarán los datos. Este proceso podria tardar hasta un minuto, gracias" , True)
 	End If
 End Sub
 Sub JobDone(Job As HttpJob)
@@ -916,7 +914,7 @@ Sub JobDone(Job As HttpJob)
 				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
-					EJECUTANDO=0
+					EJECUTANDO = 0
 				End If
 			End If
 			bcarga1 = 20
@@ -1120,7 +1118,7 @@ Sub JobDone(Job As HttpJob)
 				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
-					EJECUTANDO=0
+					EJECUTANDO = 0
 				End If
 			End If
 		End If
@@ -1160,9 +1158,9 @@ Sub JobDone(Job As HttpJob)
 				c.Close
 				If cuantos_pedidosc > 0 Then
 '					c=Starter.skmt.ExecQUERY("SELECT PE_PROID, SUM(PE_CANT) AS PE_CANT FROM PEDIDO WHERE PE_CLIENTE <> 0 GROUP BY PE_PROID")
-					c=Starter.skmt.ExecQUERY("SELECT PE_PROID, SUM(PE_CANT) AS PE_CANT, PE_PRONOMBRE FROM PEDIDO WHERE PE_CLIENTE <> '0' AND PE_PRONOMBRE NOT LIKE '%CAMBIO%' GROUP BY PE_PROID, PE_PRONOMBRE")
+					c = Starter.skmt.ExecQUERY("SELECT PE_PROID, SUM(PE_CANT) AS PE_CANT, PE_PRONOMBRE FROM PEDIDO WHERE PE_CLIENTE <> '0' AND PE_PRONOMBRE NOT LIKE '%CAMBIO%' GROUP BY PE_PROID, PE_PRONOMBRE")
-					If c.RowCount>0 Then
+					If c.RowCount > 0 Then
-						For i=0 To c.RowCount -1
+						For i = 0 To c.RowCount -1
 							c.Position=i
 							Starter.skmt.ExecNonQuery2("update CAT_GUNAPROD2 set CAT_GP_ALMACEN = CAT_GP_ALMACEN - ? where CAT_GP_ID = ? ", Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID")))
 						Next
@@ -1220,11 +1218,11 @@ Sub JobDone(Job As HttpJob)
 				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
-					EJECUTANDO=0
+					EJECUTANDO = 0
 				Else If Listo4 = 1 And Listo3 = 1 And inve = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
-					EJECUTANDO=0
+					EJECUTANDO = 0
 				End If
 			End If
 		End If
@@ -1267,11 +1265,11 @@ Sub JobDone(Job As HttpJob)
 				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
-					EJECUTANDO=0
+					EJECUTANDO = 0
 				Else If Listo4 = 1 And Listo3 = 1 And inve = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
-					EJECUTANDO=0
+					EJECUTANDO = 0
 				End If
 			End If
 		End If
@@ -1312,11 +1310,11 @@ Sub JobDone(Job As HttpJob)
 				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
-					EJECUTANDO=0
+					EJECUTANDO = 0
 				Else If Listo4 = 1 And Listo3 = 1 And inve = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
-					EJECUTANDO=0
+					EJECUTANDO = 0
 				End If
 			End If
 		End If
@@ -1336,7 +1334,7 @@ Sub JobDone(Job As HttpJob)
 				Next
 				Starter.skmt.TransactionSuccessful
 				Starter.skmt.EndTransaction
-				Listo3 =1
+				Listo3 = 1
 				If PB1.Progress = 0 Then
 					PB1.Progress = 30
 					S_CH.Text = "CARGANDO"
@@ -1347,10 +1345,10 @@ Sub JobDone(Job As HttpJob)
 					S_CH.Text = "LISTO"
 				End If
 '				ToastMessageShow("Venta historico Actualizado." , True)
-				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
+				If Listo1 = 1 And Listo2 = 1 And Listo3 = 1 And Listo4 = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
-					EJECUTANDO=0
+					EJECUTANDO = 0
 				End If
 			End If
 		End If
@@ -1379,10 +1377,10 @@ Sub JobDone(Job As HttpJob)
 					S_CH.Text = "LISTO"
 				End If
 '				ToastMessageShow("Venta historico Actualizado." , True)
-				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
+				If Listo1 = 1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
-					EJECUTANDO=0
+					EJECUTANDO = 0
 				End If
 			End If
 		End If
@@ -1558,10 +1556,10 @@ Sub JobDone(Job As HttpJob)
 				If RESULT.Rows.Size = 0 Then ToastMessageShow("No hay ruta para ese usuario", True)
 				For Each records() As Object In RESULT.Rows
 					Dim VALIDO As String = records(RESULT.Columns.Get("VALIDO"))
-					Log("|"&VALIDO&"|")
+					if starter.Logger then Log("|"&VALIDO&"|")
 '					If Logger Then Log(records(RESULT.Columns.Get("CAT_RU_CATEGORIA")))
 					Starter.rutaTipo = records(RESULT.Columns.Get("CAT_RU_CATEGORIA")) 'Traemos el tipo de ruta para que cuando sean foraneas no carguen la carta porte todos los dias.
-					Log($"=========    TIPO RUTA = ${Starter.rutaTipo}"$)
+					If Starter.Logger Then Log($"=========    TIPO RUTA = ${Starter.rutaTipo}"$)
 					If VALIDO = "OK" Then
 						cargar.Visible = True
 						Subir.Visible = True
@@ -2134,17 +2132,17 @@ End Sub
 Sub B_OK_PAS_Click
 	If CARGA = "SUBIR" And S_CP.Text = "INFO OK" Then
-		c=Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("PERFIL"))
+		c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("PERFIL"))
 		PERFIL = "0"
 		If c.RowCount > 0 Then
-			c.Position =0
+			c.Position = 0
 			PERFIL = c.GetString("CAT_VA_VALOR")
 		End If
 		c.Close
-		c=Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("NUMERO_PEDIDO"))
+		c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("NUMERO_PEDIDO"))
 		NUMERO_PEDIDO = "0"
 		If c.RowCount > 0 Then
-			c.Position =0
+			c.Position = 0
 			NUMERO_PEDIDO = c.GetString("CAT_VA_VALOR")
 		End If
 		c.Close
@@ -2266,35 +2264,35 @@ Sub Resumen_Click
 	DateTime.DateFormat = "MM/dd/yyyy"
 	fecha=DateTime.Date(DateTime.Now)
 	Starter.skmt.ExecNonQuery2("update PEDIDO set PE_TIPO = ? where PE_CLIENTE =?", Array As Object("ABORDO", "0"))
-	b=Starter.skmt.ExecQuery("Select count(*) as CUANTOS from pedido_cliente where pc_cliente <> 0")
+	b = Starter.skmt.ExecQuery("Select count(*) as CUANTOS from pedido_cliente where pc_cliente <> 0")
-	b.Position=0
+	b.Position = 0
 	Cuantos = b.GetString("CUANTOS")
 '	ToastMessageShow(Cuantos , True)
-	d=Starter.skmt.ExecQuery2("select count(*) as TOTAL_VISITAR from kmt_info where gestion = 0 and cat_cl_codigo <> 0 AND CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?)", Array As String("DIA_VISITA"))
+	d = Starter.skmt.ExecQuery2("select count(*) as TOTAL_VISITAR from kmt_info where gestion = 0 and cat_cl_codigo <> 0 AND CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?)", Array As String("DIA_VISITA"))
-	D.Position=0
+	D.Position = 0
 	b.Close
-	e=Starter.skmt.ExecQuery2("select count(*) as POR_VISITAR from kmt_info where cat_cl_codigo <> 0 and CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?) ", Array As String("DIA_VISITA"))
+	e = Starter.skmt.ExecQuery2("select count(*) as POR_VISITAR from kmt_info where cat_cl_codigo <> 0 and CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?) ", Array As String("DIA_VISITA"))
-	e.Position=0
+	e.Position = 0
-	f=Starter.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info where cat_cl_codigo <> 0")
+	f = Starter.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info where cat_cl_codigo <> 0")
-	f.Position=0
+	f.Position = 0
 	l_ruta.Text = f.GetString("CAT_CL_RUTA")
 	f.Close
 	If l_ruta.Text = 0 Then
-		l_ruta.Text =0
+		l_ruta.Text = 0
 	Else
-		f=Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
+		f = Starter.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
-		f.Position=0
+		f.Position = 0
 		l_ruta.Text = f.GetString("CAT_CL_RUTA")
 		f.Close
 	End If
 	If Cuantos = 0 Then
-		L_MONTOD.Text =0
+		L_MONTOD.Text = 0
 		l_cuantosc.Text = 0
 		l_cuantosn.Text = 0
 		drop = 0
 		l_drop.Text = 0
 		efectiva = 0
-		l_efectiva.text =0
+		l_efectiva.text = 0
 		l_ctast.Text = d.GetString("TOTAL_VISITAR")
 		'l_porvisitar.Text = e.GetString("POR_VISITAR")
 		d.Close
@@ -2343,12 +2341,15 @@ Sub Resumen_Click
 			l_monto_c3.Text = 2000
 		End If
 		DDD.Close
-		c=Starter.skmt.ExecQuery("select sum(pc_monto) as MONTO_DIA, count(pc_cliente) AS CLIENTES_DIA from pedido_cliente where pc_cliente <> 0")
+		c = Starter.skmt.ExecQuery("select sum(pc_monto) as MONTO_DIA, count(pc_cliente) AS CLIENTES_DIA from pedido_cliente where pc_cliente <> 0")
-		b=Starter.skmt.ExecQuery("select count(*) as CUANTOS from noventa")
+		b = Starter.skmt.ExecQuery("select count(*) as CUANTOS from noventa")
 		'where pc_fecha = ?", Array As String(fecha)
-		C.Position=0
+		C.Position = 0
-		b.Position=0
+		b.Position = 0
 		L_MONTOD.Text = c.GetString("MONTO_DIA")
 		L_MONTOD.Text = Subs.sumaPedido(Subs.traeCliente) 'Trae el monto sin el redondeo que a veces hace el SUM().
 '		Log(Subs.sumaPedido(Subs.traeCliente) & " - " & L_MONTOD.Text)
 		Subs.sumaPedido(Subs.traeCliente)
 		l_cuantosc.Text = c.GetString("CLIENTES_DIA")
 		l_cuantosn.Text = b.GetString("CUANTOS")
 		efectiva = c.GetString("CLIENTES_DIA") / e.GetString("POR_VISITAR")
@@ -2376,8 +2377,8 @@ Sub Resumen_Click
 		c.Close
 		b.Close
 	End If
-	b=Starter.skmt.ExecQuery("Select count(*) as CUANTOS from pedido where pe_cliente = 0")
+	b = Starter.skmt.ExecQuery("Select count(*) as CUANTOS from pedido where pe_cliente = 0")
-	b.Position=0
+	b.Position = 0
 	Cuantos = b.GetString("CUANTOS")
 	If Cuantos > 0 Then
 		c=Starter.skmt.ExecQuery("Select sum(PE_COSTO_TOT) AS TOTAL from pedido where pe_cliente = 0")
@@ -2912,7 +2913,7 @@ End Sub
 'Descarga del servidor el PDF de la carta porte del dia de hoy y la
 'guarda en el almacenamiento externo con el nombre "cartaPorte.pdf"
 Sub descargaCartaPorte
-	Log("Inicia descargaCartaPorte")
+	If Starter.Logger Then Log("Inicia descargaCartaPorte")
 	cartaPorteLista = False
 	'Generamos el nombre del PDF de la carta porte
 	DateTime.DateFormat = "ddMMyyyy"
@@ -2934,12 +2935,12 @@ Sub descargaCartaPorte
 	ProgressBarPDF.Progress = 0
 '	Log("Ocultamos panel descarga")
 	Subs.panelOculto(p_downloadPDF)
-	Log(p_progress1.Visible)
+	If Starter.Logger Then Log(p_progress1.Visible)
 End Sub
 'Muestra el panel de descarga de la carta porte con barra de progreso
 Sub descargaCartaPorteyProgreso (urlx As String) As ResumableSub
-	Log("Iniciamos descargaCartaPorteyProgreso")
+	If Starter.Logger Then Log("Iniciamos descargaCartaPorteyProgreso")
 	If logger Then Log("Mostramos panel descarga")
 	Subs.panelVisible(p_downloadPDF, 0, 0)
 	Subs.centraPanel(p_progress1, Root.Width)
@@ -2969,24 +2970,24 @@ Sub descargaCartaPorteyProgreso (urlx As String) As ResumableSub
 		Sleep(10)
 	Loop
 	Dim bx() As Boolean = Array As Boolean(False)
-	Log("Llamamos TrackProgress")
+	If Starter.Logger Then Log("Llamamos TrackProgress")
 	TrackProgress(job_PDF, bx, TaskId)
 	'**** Termina barra de progreso
-	Log("Iniciamos Wait for JobDone Descarga")
+	If Starter.Logger Then Log("Iniciamos Wait for JobDone Descarga")
-	Log("Mostramos panel descarga")
+	If Starter.Logger Then Log("Mostramos panel descarga")
 	Subs.panelVisible(p_downloadPDF, 0, 0)
 	Wait for (job_PDF) JobDone (job_PDF As HttpJob)
 '	Log("Terminamos Wait for JobDone Descarga ")
 	If job_PDF.Success = False Then Log("Error PDF")
 	If job_PDF.Success = True Then
 		Log("Carta descargada con exito")
-		Log("Ocultamos downloader")
+		If Starter.Logger Then Log("Ocultamos downloader")
 		cartaPorteLista = True
 		' // Delete existing file
 '		Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_WRITE_EXTERNAL_STORAGE)
 '		Wait For B4XPAges_PermissionResult (Permission As String, Result As Boolean)
-		Log("Ocultamos downloader 2")
+		If Starter.Logger Then Log("Ocultamos downloader 2")
 		If File.Exists(File.DirInternal,"cartaPorte.pdf") Then
 '			Log("Borramos carta anterior")
 			File.Delete(File.DirInternal,"cartaPorte.pdf")
--- a/B4A/C_Productos.bas
+++ b/B4A/C_Productos.bas
@@ -246,6 +246,7 @@ Sub B4XPage_Appear
 		b_rmi.Visible = False
 		l_mDisponible.Visible = True
 	End If
 	If B4XPages.MainPage.cliente.la_cuenta.text = "0" Then b_rmi.Visible = False
 '	Log(Starter.tipov)
 End Sub
@@ -255,6 +256,7 @@ End Sub
 Sub lv_catalogos_ItemClick (Position As Int, Value As Object)
 	If Value = "CATALOGO" Then
 '		Log("CATALOGO")
 '		lfila.text = "TIPO"
 		lfila.text = "PRODUCTOS"
 		lv_catalogos.Visible = False
@@ -563,7 +565,7 @@ Sub b_prodMas_Click
 	etCantHasFocus = False
 	Private buttonTag As String = Sender.As(Button).tag
 	Dim index As Int = clv_prods_ll.GetItemFromView(Sender)
-	LogColor("b_prodMas_Click", Colors.Magenta)
+'	LogColor("b_prodMas_Click", Colors.Magenta)
 	Dim pnl0 As B4XView = clv_prods_ll.GetPanel(index)
 	Dim pnl As B4XView = pnl0.GetView(0)
 	Dim laCant As B4XView = pnl.GetView(2).GetView(2)
@@ -689,7 +691,7 @@ Sub cuentaProds
 	p_botonesVenta.BringToFront
 	c.Position=0
 	If Subs.totalPedido > 1 And lfila.Text <> "RMI" And Starter.tipov <> "ABORDO" Then b_rmi.Visible = True Else b_rmi.Visible = False
-	Log(Subs.totalPedido)
+'	Log(Subs.totalPedido)
 	If lfila.Text = "RMI" Then l_mDisponible.Visible = True Else l_mDisponible.Visible = False
 	l_mDisponible.Text = $"Disponible: $${Subs.totalPedido}"$
 '	Log($"Total Prods: ${c.GetString("cant")}, Total Compra: $$1.2{c.GetString("total")}"$)
@@ -895,13 +897,13 @@ Private Sub lv_prodsPedido_ItemLongClick (Position As Int, Value As Object)
 		result =  Msgbox2("Seguro que desea borrar este articulo?","Borrar Articulo", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
 		If result = DialogResponse.POSITIVE Then
 			Private prod As Cursor=Starter.skmt.ExecQuery2("select PE_PROID, PE_CANT, PE_CEDIS FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) ", Array As String(Value))
-			prod.Position=0
+			prod.Position = 0
 			Log("m2= " & m)
 			c.Close
 			Log($"Buscamos: ${Value}, ${m.Get("cedis")}"$)
 			c=Starter.skmt.ExecQuery2("select count(*) AS CUANTOS from cat_gunaprod2 where CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cedis = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'", Array As String(Value, m.Get("cedis")))
-			c.Position=0
+			c.Position = 0
-			If c.GetString("CUANTOS") > 0 Then
+			If c.GetString("CUANTOS") > 0 Then 'Si es promo, borramos la promo completa del pedido.
 				Log($"Borramos de PROMO ${Value}"$)
 				Private pPromos As Cursor = Starter.skmt.ExecQuery($"select pe_proid, pe_cant from pedido where pe_cedis = '${m.Get("cedis")}'"$)
 				For tp = 0 To pPromos.RowCount - 1
@@ -912,7 +914,8 @@ Private Sub lv_prodsPedido_ItemLongClick (Position As Int, Value As Object)
 				Starter.skmt.ExecNonQuery2("delete from pedido where pe_cedis in (select pe_cedis from pedido where PE_CEDIS = ? and pe_pronombre = ?) and pe_cliente in (Select CUENTA from cuentaa)", Array As Object(m.Get("cedis"), Value))
 			Else
 				Log($"SUMAMOS ${m.get("cant")} a ${m.get("prodId")} "$)
-				Starter.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(Starter.tipov)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(m.get("cant"), m.get("prodId")))
+				'Si no es RMI, actualizamos el inventario.
 				If prod.GetString("PE_CEDIS") <> "DUR" Then Starter.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(Starter.tipov)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(m.get("cant"), m.get("prodId")))
 				Log($"BORRAMOS ${Value}, ${m.Get("cedis")}"$)
 				Starter.skmt.ExecNonQuery2("delete from pedido where pe_pronombre = ? and pe_cedis = ? and pe_cant = ? and pe_cliente in (Select CUENTA from cuentaa)", Array As Object(Value, m.Get("cedis"), m.Get("cant")))
 			End If
@@ -1120,10 +1123,11 @@ Sub LlenaProdsLL(p As ResultSet, extra As String)
 '	Log(p.IsInitialized)
 	If query = "" Or query = Null Then query = "cat_gunaprod2"
 	If p.IsInitialized Then
-'		Log($"YA HAY RESULTSET ${p.RowCount}"$)
+		Log($"YA HAY RESULTSET ${p.RowCount}"$)
 	Else
 '		Log("NO HAY RESULTSET")
 		Dim p As ResultSet = Starter.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD from ${Subs.traeTablaProds(Starter.tipov)} where CAT_GP_PRECIO > 0 And CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE"$)
 		Log(p.RowCount & " - " & Subs.traeTablaProds(Starter.tipov))
 	End If
 	Do While p.NextRow
--- a/B4A/C_Promos.bas
+++ b/B4A/C_Promos.bas
@@ -252,7 +252,7 @@ Sub b_prodMenos_Click
 End Sub
 Sub b_prodMas_Click
-'	LogColor($"prodmas clic - ${Starter.cp_running}"$,Colors.Magenta)
+	LogColor($"prodmas clic "$,Colors.Magenta)
 	If totalProds < prodsVarReq + tpf Then
 		Dim index As Int = clv_prodsVariabes.GetItemFromView(Sender)
 		Dim pnl0 As B4XView = clv_prodsVariabes.GetPanel(index)
--- a/B4A/C_Subs.bas
+++ b/B4A/C_Subs.bas
@@ -65,9 +65,9 @@ End Sub
 Sub fechaKMT(fecha As String) As String 'ignore
 '	Log(fecha)
 	Dim OrigFormat As String = DateTime.DateFormat  'save orig date format
-	DateTime.DateFormat="yyMMddHHmmss"
+	DateTime.DateFormat = "yyMMddHHmmss"
 	Dim nuevaFecha As String=DateTime.Date(fecha)
-	DateTime.DateFormat=OrigFormat  'return to orig date format
+	DateTime.DateFormat = OrigFormat  'return to orig date format
 '	Log(nuevaFecha)
 	Return nuevaFecha
 End Sub
@@ -75,10 +75,10 @@ End Sub
 'Escribimos las coordenadas y fecha a un archivo de texto 
 Sub guardaInfoEnArchivo(coords As String) 'ignore
 	'	Cambiamos el formato de la hora
-	Dim OrigFormat As String=DateTime.DateFormat  'save orig date format
+	Dim OrigFormat As String = DateTime.DateFormat  'save orig date format
 	DateTime.DateFormat="MMM-dd HH:mm:ss"
 	Dim lastUpdate As String=DateTime.Date(DateTime.Now)
-	DateTime.DateFormat=OrigFormat  'return to orig date format
+	DateTime.DateFormat = OrigFormat  'return to orig date format
 	Dim ubic As String = coords&","&lastUpdate
 	Dim out As OutputStream = File.OpenOutput(File.DirRootExternal, "gps.txt", True)
@@ -137,9 +137,9 @@ End Sub
 'Regresa la fecha y hora de hoy a las 00:00 en el formato "yyMMddHHMMSS"
 Sub fechaInicioHoy As String 'ignore
 	Dim OrigFormat As String = DateTime.DateFormat  'save orig date format
-	DateTime.DateFormat="yyMMdd"
+	DateTime.DateFormat = "yyMMdd"
 	Private h As String = DateTime.Date(DateTime.Now)&"000000"
-	DateTime.DateFormat=OrigFormat  'return to orig date format
+	DateTime.DateFormat = OrigFormat  'return to orig date format
 	Log("Hoy="&h)
 	Return h
 End Sub
@@ -210,10 +210,10 @@ Sub fechaKMT2Ticks(fKMT As String) As Long 'ignore
 			Private parteFecha As String = fKMT.SubString2(0,6)
 			Private parteHora As String = fKMT.SubString(6)
 			Private OrigFormat As String = DateTime.DateFormat  'save original date format
-			DateTime.DateFormat="yymmdd"
+			DateTime.DateFormat = "yymmdd"
-			DateTime.TimeFormat="HHmmss"
+			DateTime.TimeFormat = "HHmmss"
 			Private ticks As Long = DateTime.DateTimeParse(parteFecha,parteHora)
-			DateTime.DateFormat=OrigFormat  'return to original date format
+			DateTime.DateFormat = OrigFormat  'return to original date format
 			Return ticks
 		Else
 			Log("Formato de fecha incorrecto, debe de ser 'YYMMDDHHMMSS', no '"&fKMT&"' largo="&fKMT.Length)
--- a/B4A/DBRequestManager.bas
+++ b/B4A/DBRequestManager.bas
@@ -35,6 +35,7 @@ Public Sub ExecuteQuery(Command As DBCommand, Limit As Int, Tag As Object)
 	Dim j As HttpJob
 	Dim ms As OutputStream
 	Dim out2 As OutputStream = StartJob(j,ms, Tag)
 	If reqsList.IsInitialized Then reqsList.Add(Tag)
 	WriteObject(Command.Name, out2)
 	WriteInt(Limit, out2)
@@ -61,6 +62,7 @@ End Sub
 'Similar to ExecuteBatch. Sends a single command.
 Public Sub ExecuteCommand(Command As DBCommand, Tag As Object)
 	If reqsList.IsInitialized Then reqsList.Add(Tag)
 	ExecuteBatch(Array As DBCommand(Command), Tag)
 End Sub
--- a/B4A/Files/checks.bal
+++ b/B4A/Files/checks.bal
--- a/B4A/Files/cliente.bal
+++ b/B4A/Files/cliente.bal
--- a/B4A/Files/historico.bal
+++ b/B4A/Files/historico.bal
--- a/B4A/Files/noventa.bal
+++ b/B4A/Files/noventa.bal
--- a/B4A/Files/principal.bal
+++ b/B4A/Files/principal.bal
--- a/B4A/KelloggsV4.b4a
+++ b/B4A/KelloggsV4.b4a
@@ -871,7 +871,7 @@ Version=12.5
 #Region  Project Attributes	
 	#ApplicationLabel: Kelloggs Venta
 	#VersionCode: 3000
-	#VersionName: 3.10.23 PRUEBA V4
+	#VersionName: 3.10.25 PRUEBA V4
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
 	#BridgeLogger:true
--- a/B4A/KelloggsV4.b4a.meta
+++ b/B4A/KelloggsV4.b4a.meta
@@ -65,29 +65,29 @@ ModuleBreakpoints7=
 ModuleBreakpoints8=
 ModuleBreakpoints9=
 ModuleClosedNodes0=
-ModuleClosedNodes1=2
+ModuleClosedNodes1=
 ModuleClosedNodes10=
 ModuleClosedNodes11=
-ModuleClosedNodes12=1
+ModuleClosedNodes12=
 ModuleClosedNodes13=
 ModuleClosedNodes14=
 ModuleClosedNodes15=
 ModuleClosedNodes16=
 ModuleClosedNodes17=
-ModuleClosedNodes18=9,10,11,12,13,14,15,16,17,18
+ModuleClosedNodes18=9,10,11,12,13,15,16,17,18
 ModuleClosedNodes19=
 ModuleClosedNodes2=
 ModuleClosedNodes20=
 ModuleClosedNodes21=20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39
 ModuleClosedNodes22=
 ModuleClosedNodes23=
-ModuleClosedNodes24=9,11,13,15
+ModuleClosedNodes24=10,12,14
 ModuleClosedNodes25=
 ModuleClosedNodes26=2
 ModuleClosedNodes27=
 ModuleClosedNodes28=
 ModuleClosedNodes29=
-ModuleClosedNodes3=24
+ModuleClosedNodes3=
 ModuleClosedNodes30=
 ModuleClosedNodes31=
 ModuleClosedNodes32=
@@ -97,6 +97,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Clientes,Class_Globals,14,0,C_Cliente,Class_Globals,15,0,C_Cliente,b_mapa_Click,878,0,Visual Designer,cliente.bal,-100,6,Visual Designer,mapa.bal,-100,3,C_Mapas,Class_Globals,0,0,C_Mapas,B4XPage_Created,42,0,Visual Designer,mapas.bal,-100,6,Visual Designer,historico.bal,-100,2,C_Historico,Class_Globals,0,0
+NavigationStack=Subs,actualizaProducto,944,0,C_Cliente,B_IMP2BAK_Click,1474,0,C_Cliente,B4XPage_Appear,436,0,C_Cliente,B_IMP2_Click,988,0,kms_helperSubs,RD_restaura_kmt_info,278,3,kms_helperSubs,RD_restaura_cat_detalle_paq,240,0,kms_helperSubs,RD_restaura_cat_gunaprod,163,0,kms_helperSubs,RD_restaura_cat_gunaprod2,187,0,B4XMainPage,p_cargaLocal_Click,678,0,B4XMainPage,b_cargaLocalOk_Click,679,0
 SelectedBuild=0
-VisibleModules=1,30,11,24,31,14,9,4,3,6,5
+VisibleModules=1,30,11,31,14,24,3,32,7,12
--- a/B4A/Starter.bas
+++ b/B4A/Starter.bas
@@ -145,14 +145,14 @@ Sub ENVIA_ULTIMA_GPS
 	DateTime.TimeFormat = "HHmmss"
 	ultimaActualizacionGPS = DateTime.Time(DateTime.Now)
 	Private s1 As Cursor = skmt.ExecQuery2("select CAT_VA_VALOR as semana from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SEMANA")) 'Traemos la semana.
-	If s1.RowCount> 0 Then 
+	If s1.RowCount > 0 Then 
-		s1.Position=0
+		s1.Position = 0
 		Private laSemana As String = s1.GetString("semana")
 	Else
 		Private laSemana As String = ""
 	End If
-	Private cpv As Cursor = skmt.ExecQuery2("select  count(*) as CUANTOS from kmt_info where  CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?) and cat_cl_codigo <> 0 AND CAT_CL_TIPO_RUTA IN (?,?)  ORDER BY CAT_CL_NUM_SERIEFISICO", Array As String("DIA_VISITA", laSemana, "SEMANAL"))'Traemos los clientes a visitar hoy.
+	Private cpv As Cursor = skmt.ExecQuery2("select count(*) as CUANTOS from kmt_info where CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?) and cat_cl_codigo <> 0 AND CAT_CL_TIPO_RUTA IN (?,?)  ORDER BY CAT_CL_NUM_SERIEFISICO", Array As String("DIA_VISITA", laSemana, "SEMANAL")) 'Traemos los clientes a visitar hoy.
-	cpv.Position=0
+	cpv.Position = 0
 	Private clientesVisitaHoy As String = cpv.GetString("CUANTOS")
 	If lat_gps = 0 Or lat_gps = Null Then 'Si latitud es CERO o NULL traemos las ultimas coordenadas de la base de datos.
 		Private coords As List = Subs.traeCoordsDeBD
--- a/B4A/Subs.bas
+++ b/B4A/Subs.bas
@@ -67,7 +67,7 @@ Sub fechaKMT(fecha As String) As String 'ignore
 	Dim OrigFormat As String = DateTime.DateFormat  'save orig date format
 	DateTime.DateFormat="yyMMddHHmmss"
 	Dim nuevaFecha As String=DateTime.Date(fecha)
-	DateTime.DateFormat=OrigFormat  'return to orig date format
+	DateTime.DateFormat = OrigFormat  'return to orig date format
 '	if starter.logger then Log(nuevaFecha)
 	Return nuevaFecha
 End Sub
@@ -104,9 +104,9 @@ End Sub
 Sub guardaInfoEnArchivo(coords As String) 'ignore
 	'	Cambiamos el formato de la hora
 	Dim OrigFormat As String=DateTime.DateFormat  'save orig date format
-	DateTime.DateFormat="MMM-dd HH:mm:ss"
+	DateTime.DateFormat = "MMM-dd HH:mm:ss"
 	Dim lastUpdate As String=DateTime.Date(DateTime.Now)
-	DateTime.DateFormat=OrigFormat  'return to orig date format
+	DateTime.DateFormat = OrigFormat  'return to orig date format
 	Dim ubic As String = coords&","&lastUpdate
 	Dim out As OutputStream = File.OpenOutput(File.DirInternal, "gps.txt", True)
@@ -273,9 +273,9 @@ End Sub
 'Regresa la fecha y hora de hoy a las 00:00 en el formato "yyMMddHHMMSS"
 Sub fechaInicioHoy As String 'ignore
 		Dim OrigFormat As String = DateTime.DateFormat  'save orig date format
-		DateTime.DateFormat="yyMMdd"
+		DateTime.DateFormat = "yyMMdd"
 		Private h As String = DateTime.Date(DateTime.Now)&"000000"
-		DateTime.DateFormat=OrigFormat  'return to orig date format
+		DateTime.DateFormat = OrigFormat  'return to orig date format
 	If Starter.logger Then Log("Hoy="&h)
 	Return h
 End Sub
@@ -498,7 +498,7 @@ Sub fechaKMT2Ticks(fKMT As String) As Long 'ignore
 			DateTime.TimeFormat="HHmmss"
 			Private ticks As Long = DateTime.DateTimeParse(parteFecha,parteHora)
 '			Log(" +++ +++ pFecha:"&parteFecha&" | pHora:"&parteHora)
-			DateTime.DateFormat=OrigFormat  'return to original date format
+			DateTime.DateFormat = OrigFormat  'return to original date format
 			Return ticks
 		Else
 			Log("Formato de fecha incorrecto, debe de ser 'yyMMddHHmmss', no '"&fKMT&"' largo="&fKMT.Length)
@@ -778,7 +778,7 @@ End Sub
 Sub traeAlmacen As String 'ignore
 	Private c As Cursor
 	Private a As String
-	c=Starter.skmt.ExecQuery("select  ID_ALMACEN from CAT_ALMACEN")
+	c = Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
 	c.Position = 0
 	a = C.GetString("ID_ALMACEN")
 	c.Close
@@ -890,7 +890,7 @@ End Sub
 'Si "gestion=2" entonces el sistema considera que el pedido ya se guardó y ya no se debe modificar.
 Sub guardaProductoSinGestion(cedis As String, costoU As String, cant As String, nombre As String, prodId As String, clienteId As String, fecha As String, usuario As String, rutaV As String, precioSin As String, tipoVenta As String)
 	If nombre.Length < 6 Then ToastMessageShow("(guardaProductoSinGestion) El nombre del producto no es valido " & nombre, True)
-	LogColor("guardaProductoSinGestion: "&prodId&", cant="&cant&", tipo="&tipoVenta, Colors.Magenta)
+'	LogColor("guardaProductoSinGestion: "&prodId&", cant="&cant&", tipo="&tipoVenta, Colors.Magenta)
 	Private c As Cursor
 '	Private tablaProds As String = "cat_gunaprod2"
 '	If tipoVenta = "ABORDO" Then tablaProds = "cat_gunaprod"
@@ -927,13 +927,13 @@ Sub actualizaProducto(cedis As String, costoU As String, cant As String, nombre
 '	If tipoVenta = "ABORDO" Then tablaProds = "cat_gunaprod"
 	Private c As Cursor=Starter.skmt.ExecQuery($"select * from pedido where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}'"$)
 	If c.RowCount > 0 Then
-		LogColor("ACTUALIZAMOS PROD", Colors.Blue)
+		LogColor("ACTUALIZAMOS PROD - " & traeTablaProds(tipoVenta), Colors.Blue)
-		c.Position=0
+		c.Position = 0
 		Private antCant As Int = 0
 		If IsNumber(c.GetInt("PE_CANT")) Then antCant=c.GetInt("PE_CANT")
 		Private difCant As Int = cant - antCant
 		Starter.skmt.ExecNonQuery($"update pedido set pe_cant = ${cant}, pe_costo_tot = ${(cant*c.GetString("PE_COSTOU"))} where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}' "$)
-		Starter.skmt.ExecNonQuery($"update ${traeTablaProds(tipoVenta)} set cat_gp_almacen = cat_gp_almacen - (${difCant}) where cat_gp_id = '${prodId}' "$)
+		If cedis <> "DUR" Then Starter.skmt.ExecNonQuery($"update ${traeTablaProds(tipoVenta)} set cat_gp_almacen = cat_gp_almacen - (${difCant}) where cat_gp_id = '${prodId}' "$)
 		If cant = 0 Then
 			LogColor($"BORRAMOS PRODUCTO - ${prodId}"$, Colors.Red)
 			Starter.skmt.ExecNonQuery($"delete from pedido where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}' "$)
@@ -944,7 +944,7 @@ Sub actualizaProducto(cedis As String, costoU As String, cant As String, nombre
 		End If
 	Else
 		'INSERTAMOS
-		LogColor("INSERTAMOS PROD", Colors.red)
+'		LogColor("INSERTAMOS PROD", Colors.red)
 		If cant > 0 Then guardaProductoSinGestion(cedis, costoU, cant, nombre, prodId, clienteId, fecha, usuario, rutaV, precioSin, tipoVenta)
 	End If
 	c.Close
@@ -1398,11 +1398,11 @@ End Sub
 Sub borraPedidoClienteActual As String
 	Private thisC As Cursor
 '	Private tablaProds As String = "cat_gunaprod2"
-	thisC=Starter.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ")
+	thisC = Starter.skmt.ExecQuery("select PE_PROID, PE_CANT, PE_CEDIS 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 ${traeTablaProds(Starter.tipov)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(thisC.GetString("PE_CANT"),thisC.GetString("PE_PROID")))
+			If thisC.GetString("PE_CEDIS") <> "DUR" Then Starter.skmt.ExecNonQuery2($"update ${traeTablaProds(Starter.tipov)} 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
@@ -1539,9 +1539,9 @@ End Sub
 Sub fechanormal(fecha As String) As String 'ignore
 '	Log(fecha)
 	Dim OrigFormat As String = DateTime.DateFormat  'save orig date format
-	DateTime.DateFormat="yyyy/MM/dd HH:mm:ss"
+	DateTime.DateFormat = "yyyy/MM/dd HH:mm:ss"
 	Dim nuevaFecha As String=DateTime.Date(fecha)
-	DateTime.DateFormat=OrigFormat  'return to orig date format
+	DateTime.DateFormat = OrigFormat  'return to orig date format
 '	Log(nuevaFecha)
 	Return nuevaFecha
 End Sub
@@ -1551,5 +1551,20 @@ End Sub
 Sub bitacora(fechab As String, usuariob As String, almacenb As String, rutab As String, eventob As String, clienteb As String, iniciob As String, finb As String, latitudb As String, longitudb As String, precision As String, motivonoventa As String, motivonovisita As String )
 	Log("bitacora")
 	Starter.skmt.ExecNonQuery($"INSERT INTO BITACORAGPS (fechab, usuariob , almacenb , rutab , eventob , clienteb , iniciob , finb , latitudb , longitudb , precision , motivonoventa , motivonovisita) VALUES ('${fechab}' ,'${usuariob}' , '${almacenb}' , '${rutab}' , '${eventob}' , '${clienteb}' , '${iniciob}' , '${finb}' , '${latitudb}' , '${longitudb}' , '${precision}' , '${motivonoventa}' , '${motivonovisita}')"$)
-	
+End Sub
 'Trae la sumatoria del pedido del cliente especificado de la tabla PEDIDO.
 'A veces hace el SUM() REDONDEA el monto, con esta función no se redondea nada.
 Sub sumaPedido(cliente As String) As String 'ignore
 	Dim x As Cursor = Starter.skmt.ExecQuery($"select PE_COSTO_TOT from pedido where PE_CEDIS <> PE_PROID and pe_cliente = ${cliente} and PE_CEDIS <> "DOE""$)
 	Private total As String = 0
 	For i = 0 To x.RowCount - 1
 		x.Position = i
 '		LogColor(x.GetString("PE_COSTO_TOT"), Colors.Red)
 		total =  total + x.GetString("PE_COSTO_TOT")
 '		total = NumberFormat2(total, 0, 2, 2, False)
 '		LogColor(total, Colors.Blue)
 	Next
 	x.Close
 	Return NumberFormat2(total, 0, 2, 2, False)
 End Sub
--- a/B4A/Tracker.bas
+++ b/B4A/Tracker.bas
@@ -98,7 +98,7 @@ Public Sub StartFLP
 	If logger Then Log("StartFLP - flpStarted="&flpStarted)
 	Do While FLP.IsConnected = False
 		Sleep(500)
-		If logger Then Log("sleeping")
+		If logger Then Log("kll - sleeping")
 	Loop
 '	If flpStarted = False Then
 '	If logger Then Log("RequestLocationUpdates")
@@ -113,7 +113,7 @@ Public Sub StartFLP2
 	If logger Then Log("StartFLP2 - flpStarted="&flpStarted)
 	Do While FLP.IsConnected = False
 		Sleep(500)
-		If logger Then Log("sleeping")
+		If logger Then Log("kll - sleeping")
 	Loop
 	dameUltimaUbicacionConocida 'Regresamos ultima ubicacion conocida
 	FLP.RequestLocationUpdates(CreateLocationRequest2) 'Buscamos ubicacion 2 peticiones
@@ -125,7 +125,7 @@ Public Sub StartFLPSmall
 '	Log("StartFLPSmall - flpStarted="&flpStarted)
 	Do While FLP.IsConnected = False
 		Sleep(500)
-		Log("sleeping")
+		If logger Then Log("kll - sleeping")
 	Loop
 	dameUltimaUbicacionConocida 'Regresamos ultima ubicacion conocida
 	FLP.RequestLocationUpdates(CreateLocationRequestSmallD) 'Buscamos ubicacion 2 peticiones
@@ -255,9 +255,9 @@ End Sub
 Sub formatoFecha(fecha As String) As String 'ignore 'Convierte una fecha al formato yyMMddHHmmss
 '	Log(fecha)
 	Dim OrigFormat As String = DateTime.DateFormat  'save orig date format
-	DateTime.DateFormat="yyMMddHHmmss"
+	DateTime.DateFormat = "yyMMddHHmmss"
-	Dim lastUpdate As String=DateTime.Date(fecha)
+	Dim lastUpdate As String = DateTime.Date(fecha)
-	DateTime.DateFormat=OrigFormat  'return to orig date format
+	DateTime.DateFormat = OrigFormat  'return to orig date format
 '	Log(lastUpdate)
 	Return lastUpdate
 End Sub
--- a/B4A/kms_helperSubs.bas
+++ b/B4A/kms_helperSubs.bas
@@ -23,6 +23,8 @@ Sub Class_Globals
 '	Private mesEventName As String
 	Dim RD_Init_IsInitialized As Boolean = False
 	Dim btAdmin As BluetoothAdmin
 	Dim RD_fechaRestauracion As String = ""
 	Private fechaRestauracion As String = ""
 End Sub
 'Inicializa la clase "kms_helperSubs".
@@ -151,9 +153,12 @@ End Sub
 Sub RD_restaura_cat_gunaprod
 	Private inicio As String = DateTime.Now
 '	Log("Restaurando CAT_GUNAPROD ...")
 	Log($"FECHA RESTAURACION: ${RD_fechaRestauracion}"$)
 	fechaRestauracion = RD_fechaRestauracionSQL(RD_fechaRestauracion)
 	Private lasCols As String = getTableColumnListName(rkmt, "CAT_GUNAPROD")
 	Log(fechaRestauracion)
 	lasCols = lasCols.Replace(", FECHA", "") 'Quitamos la imagen del respaldo.
-	Private c As Cursor = rkmt.ExecQuery($"select distinct fecha from CAT_GUNAPROD order by fecha desc"$) 'where fecha <> '${fechaHoy}' 'Traemos la ultima fecha antes de hoy.
+	Private c As Cursor = rkmt.ExecQuery($"select distinct fecha from CAT_GUNAPROD ${fechaRestauracion} order by fecha desc"$) 'where fecha <> '${fechaHoy}' 'Traemos la ultima fecha antes de hoy.
 	Log(c.RowCount)
 	If c.RowCount > 0 Then
 		c.Position = 0
@@ -161,6 +166,8 @@ Sub RD_restaura_cat_gunaprod
 		skmt.ExecNonQuery("delete from CAT_GUNAPROD")
 		skmt.ExecNonQuery($"insert into CAT_GUNAPROD (${lasCols}) select ${lasCols} from rkmt1.CAT_GUNAPROD where fecha = '${c.GetString("FECHA")}'"$)
 		Log($"insert into CAT_GUNAPROD (${lasCols}) select ${lasCols} from rkmt1.CAT_GUNAPROD where fecha = '${c.GetString("FECHA")}'"$)
 	Else
 		ToastMessageShow($"No hay respaldo para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
 	End If
 	Log("R-GP: " & ((DateTime.Now - inicio)/1000) & " segs")
 End Sub
@@ -187,9 +194,10 @@ End Sub
 Sub RD_restaura_cat_gunaprod2
 	Private inicio As String = DateTime.Now
 '	Log("Restaurando CAT_GUNAPROD2 ...")
 	fechaRestauracion = RD_fechaRestauracionSQL(RD_fechaRestauracion)
 	Private lasCols As String = getTableColumnListName(rkmt, "CAT_GUNAPROD2")
 	lasCols = lasCols.Replace(", FECHA", "") 'Quitamos la fecha del respaldo.
-	Private c As Cursor = rkmt.ExecQuery($"select distinct fecha from CAT_GUNAPROD2 order by fecha desc"$) 'where fecha <> '${fechaHoy}' 'Traemos la ultima fecha antes de hoy.
+	Private c As Cursor = rkmt.ExecQuery($"select distinct fecha from CAT_GUNAPROD2 ${fechaRestauracion} order by fecha desc"$) 'where fecha <> '${fechaHoy}' 'Traemos la ultima fecha antes de hoy.
 '	Log(c.RowCount)
 	If c.RowCount > 0 Then
 		c.Position = 0
@@ -197,6 +205,8 @@ Sub RD_restaura_cat_gunaprod2
 		skmt.ExecNonQuery("delete from CAT_GUNAPROD2")
 		skmt.ExecNonQuery($"insert into CAT_GUNAPROD2 (${lasCols}) select ${lasCols} from rkmt1.CAT_GUNAPROD2 where fecha = '${c.GetString("FECHA")}'"$)
 		Log($"insert into CAT_GUNAPROD2 (${lasCols}) select ${lasCols} from rkmt1.CAT_GUNAPROD2 where fecha = '${c.GetString("FECHA")}'"$)
 	Else
 		ToastMessageShow($"No hay respaldo para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
 	End If
 	Log("R-GP2: " & ((DateTime.Now - inicio)/1000) & " segs")
 End Sub
@@ -222,9 +232,10 @@ End Sub
 Sub RD_restaura_cat_detalle_paq
 	Private inicio As String = DateTime.Now
 '	Log("Restaurando CAT_DETALLES_PAQ ...")
 	fechaRestauracion = RD_fechaRestauracionSQL(RD_fechaRestauracion)
 	Private lasCols As String = getTableColumnListName(rkmt, "CAT_DETALLES_PAQ")
 	lasCols = lasCols.Replace(", FECHA", "") 'Quitamos la fecha del respaldo.
-	Private c As Cursor = rkmt.ExecQuery($"select distinct fecha from CAT_DETALLES_PAQ order by fecha desc"$) 'where fecha <> '${fechaHoy}' 'Traemos la ultima fecha antes de hoy.
+	Private c As Cursor = rkmt.ExecQuery($"select distinct fecha from CAT_DETALLES_PAQ ${fechaRestauracion} order by fecha desc"$) 'where fecha <> '${fechaHoy}' 'Traemos la ultima fecha antes de hoy.
 '	Log(c.RowCount)
 	If c.RowCount > 0 Then
 		c.Position = 0
@@ -232,6 +243,8 @@ Sub RD_restaura_cat_detalle_paq
 		skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ")
 		skmt.ExecNonQuery($"insert into CAT_DETALLES_PAQ (${lasCols}) select ${lasCols} from rkmt1.CAT_DETALLES_PAQ where fecha = '${c.GetString("FECHA")}'"$)
 		Log($"insert into CAT_DETALLES_PAQ (${lasCols}) select ${lasCols} from rkmt1.CAT_DETALLES_PAQ where fecha = '${c.GetString("FECHA")}'"$)
 	Else
 		ToastMessageShow($"No hay respaldo para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
 	End If
 	Log("R-DP: " & ((DateTime.Now - inicio)/1000) & " segs")
 End Sub
@@ -257,9 +270,10 @@ End Sub
 Sub RD_restaura_kmt_info
 	Private inicio As String = DateTime.Now
 '	Log("Restaurando KMT_INFO ...")
 	fechaRestauracion = RD_fechaRestauracionSQL(RD_fechaRestauracion)
 	Private lasCols As String = getTableColumnListName(rkmt, "kmt_info")
 	lasCols = lasCols.Replace(", FECHA", "") 'Quitamos la fecha del respaldo.
-	Private c As Cursor = rkmt.ExecQuery($"select distinct fecha from kmt_info order by fecha desc"$) 'where fecha <> '${fechaHoy}' 'Traemos la ultima fecha antes de hoy.
+	Private c As Cursor = rkmt.ExecQuery($"select distinct fecha from kmt_info ${fechaRestauracion} order by fecha desc"$) 'where fecha <> '${fechaHoy}' 'Traemos la ultima fecha antes de hoy.
 '	Log(c.RowCount)
 	If c.RowCount > 0 Then
 		c.Position = 0
@@ -267,6 +281,8 @@ Sub RD_restaura_kmt_info
 		skmt.ExecNonQuery("delete from kmt_info")
 		skmt.ExecNonQuery($"insert into kmt_info (${lasCols}) select ${lasCols} from rkmt1.kmt_info where fecha = '${c.GetString("FECHA")}'"$)
 		Log($"insert into kmt_info (${lasCols}) select ${lasCols} from rkmt1.kmt_info where fecha = '${c.GetString("FECHA")}'"$)
 	Else
 		ToastMessageShow($"No hay respaldo para la fecha ${fechaRestauracion.SubString(fechaRestauracion.Length - 10)}"$, True)
 	End If
 	Log("R-KMT: " & ((DateTime.Now - inicio)/1000) & " segs")
 End Sub
@@ -277,6 +293,13 @@ Sub RD_vacuum 'ignore
 	rkmt.ExecNonQuery("vacuum;")
 End Sub
 'Regresa el SQL para la especificar la fecha de restauracion.
 Sub RD_fechaRestauracionSQL(fecha As String) As String
 	Private fechaSQL As String = ""
 	If fecha <> "" And IsNumber(fecha) Then fechaSQL = $"where fecha = '${ticksAformatoFecha(fecha, "yyyyMMdd")}'"$
 	Return fechaSQL
 End Sub
 'Agrega una columna a la tabla especificada.
 'Hay que indicar el "tipo"  de la columna (TEXT, INTEGER, ETC)
 'Ej. agregaColumna(DB, "TABLA", "COLUMNA", "TIPO")
@@ -530,6 +553,19 @@ Sub logJobDoneResultados(resultado As DBResult) 'ignore
 	Next
 End Sub
 'Regresa los tick en el formato de fecha especificado.
 'Ej. ticksAformatoFecha(dateTime.now, "yyyymmdd")
 'Regresa 20231018
 Sub ticksAformatoFecha(fecha As Long, formato As String) As String 'ignore
 '	Log(fecha)
 	Private OrigFormat As String = DateTime.DateFormat  'save orig date format
 	DateTime.DateFormat = formato
 	Private nuevaFecha As String=DateTime.Date(fecha)
 	DateTime.DateFormat = OrigFormat  'return to orig date format
 '	Log(nuevaFecha)
 	Return nuevaFecha
 End Sub
 'Revisa si la aplicación tiene permiso para acceder a las notificaciones.
 Sub CheckNotificationAccess As Boolean
 	Dim ph As Phone