From e594b7887a4f085101fb824955bead46fe6636ed Mon Sep 17 00:00:00 2001
From: cvaldes1201 <cj.valdes@keymonsoft.com>
Date: Wed, 10 Jul 2024 16:34:18 -0600
Subject: [PATCH] VERSION 4.07.04 SE AGREGA RECARGA Y SE CORRIGE QUE NO
 GUARDABA CUANDO ERA UN CLIENTE FUERA DE FRECUENCIA.

SALUDOS.
---
 B4A/B4XMainPage.bas    |  90 +++++++----
 B4A/C_Cliente.bas      | 333 ++++++++++++++++++++++++++++++++---------
 B4A/C_Clientes.bas     |   8 +-
 B4A/C_Nota.bas         |   2 +-
 B4A/C_NuevoCliente.bas |   2 +-
 B4A/C_Principal.bas    |  43 +++---
 B4A/C_Productos.bas    | 131 +++++++++++++---
 B4A/C_Subs.bas         |  24 +--
 B4A/Files/cliente.bal  | Bin 38445 -> 38445 bytes
 B4A/Files/login.bal    | Bin 18428 -> 19053 bytes
 B4A/MARQUEZ.b4a        |   2 +-
 B4A/MARQUEZ.b4a.meta   |   4 +-
 B4A/Subs.bas           |   4 +-
 13 files changed, 476 insertions(+), 167 deletions(-)

diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas
index d828fd8..e1c73a3 100644
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -118,6 +118,8 @@ Sub Class_Globals
 	Private b_cancelarcodigo As Button
 	Private b_aceptar As Button
 	Private p_validacion As Panel
+	Private b_recarga As Button
+	Dim recarga As String = "0"
 End Sub
 
 Public Sub Initialize
@@ -287,6 +289,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 End Sub
 
 Sub B4XPage_Appear
+	Log(recarga)
 	If Starter.muestraProgreso = 1 Then
 		muestraProgreso("Descargando actualización")
 		Starter.muestraProgreso = 0
@@ -591,7 +594,15 @@ Sub JobDone(Job As HttpJob)
 						Log(CAT_PA_PASS)
 						p_validacion.Visible = False
 						et_codigo.Text = ""
-						Subs.panelVisible(P_CIEGO,0,0)
+						If recarga = "0" Then
+							Subs.panelVisible(P_CIEGO,0,0)
+						Else If recarga = "1" Then
+							Starter.skmt.ExecNonQuery("delete from CUENTAA")
+							Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("1"))
+							B4XPages.MainPage.tipo_venta = "RECARGA"
+							B4XPages.ShowPage("Productos")
+							
+						End If
 					Else 
 						MsgboxAsync("Contraseña incorrecta","Atención")
 					End If
@@ -817,21 +828,7 @@ Private Sub lv_server_ItemClick (Position As Int, Value As Object)
 End Sub
 
 Private Sub b_enviarbd_Click
-	'	copiaDB
-'	Sleep(1000)
-	Dim FileName As String = "kmt.db"
-	'copy the shared file to the shared folder
-	Log("xxxxxx:"&Provider.SharedFolder)
-	Sleep(1000)
-	File.Copy(File.DirInternal, FileName, Provider.SharedFolder, FileName)
-	Dim email As Email
-	email.To.Add("soporte@keymonsoft.com")
-	email.Subject = "Envio Base de datos Marquez"
-	email.Attachments.Add(Provider.GetFileUri(FileName))
-'	email.Attachments.Add(Provider.GetFileUri(FileName)) 'second attachment
-	Dim in As Intent = email.GetIntent
-	in.Flags = 1 'FLAG_GRANT_READ_URI_PERMISSION
-	StartActivity(in)
+
 End Sub
 
 Private Sub b_importarBD_Click
@@ -852,11 +849,10 @@ Private Sub b_arqueocieego_Click
 	c = skmt.ExecQuery("SELECT * FROM CAT_GUNAPROD")
 	If c.RowCount > 0 Then
 		Subs.panelVisible(p_validacion,0,0)
+		recarga = "0"
 	Else
 		MsgboxAsync("No hay ruta cargada, favor de cargar día","Atención")
 	End If
-	
-
 End Sub
 
 Private Sub et_buspc_TextChanged (Old As String, New As String)
@@ -878,7 +874,7 @@ Private Sub et_buspc_TextChanged (Old As String, New As String)
 			Next
 			c.Close
 		
-			d=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE, CAT_GP_ID FROM CAT_GUNAPROD WHERE (CAT_GP_NOMBRE LIKE ? OR  CAT_GP_ID  LIKE ? ) and CAT_GP_CLASIF <> 'PROMOS'"$, Array As String(q_buscar,q_buscar))
+			d=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE, CAT_GP_ID FROM CAT_GUNAPROD WHERE (CAT_GP_NOMBRE LIKE ? OR  CAT_GP_ID  LIKE ? ) and CAT_GP_CLASIF <> 'PROMOS'AND CAT_GP_ID NOT IN (SELECT PC_ID_PROD FROM PICK_CIEGO)"$, Array As String(q_buscar,q_buscar))
 		
 			For i = 0 To d.RowCount - 1
 				d.Position = i
@@ -940,9 +936,12 @@ End Sub
 
 Private Sub B_PC_ENV_Click
 		
-	Dim sDate As String
-	DateTime.DateFormat = "MM/dd/yyyy"
+	Dim sDate, stime As String
+	DateTime.DateFormat = "dd/MM/yyyy"
+	DateTime.TimeFormat = "HH:mm:ss"
 	sDate = DateTime.Date(DateTime.Now)
+	stime = DateTime.Time(DateTime.Now)
+	
 	
 	For i = 0 To CLV_PICK_CIEGO.Size - 1
 		' Retrieve the panel and child views for the current item
@@ -960,26 +959,29 @@ Private Sub B_PC_ENV_Click
 		Dim idLabel As B4XView = innerPanel.GetView(0)
 		Dim idText As String = idLabel.As(Label).Text
 		Dim idParts() As String = Regex.Split(CRLF, idText)
-		Log(idParts(1))
+'		Log(idParts(1))
+		f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
+		f.Position=0
+
 		a=B4XPages.MainPage.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
 		If a.RowCount>0 Then
 			a.Position=0
 		End If
-		Log(a.GetString("ID_ALMACEN"))
-		Log(f.GetString("CAT_CL_RUTA"))
+'		Log(a.GetString("ID_ALMACEN"))
+'		Log(f.GetString("CAT_CL_RUTA"))
 				
 		If inputText <> 0 Then
 			c = Starter.skmt.ExecQuery2("SELECT * FROM PICK_CIEGO where PC_ID_PROD = ?", Array As String (idParts(0)))
 			If c.RowCount = 0 Then
 				' Insert data into the database
-				skmt.ExecNonQuery2("INSERT INTO PICK_CIEGO(PC_ID_PROD, PC_NOM_PROD, PC_CANT, PC_ALMACEN, PC_RUTA, PC_FECHA) VALUES(?,?,?,?,?,?)", Array As String(idParts(0), idParts(1), inputText, a.GetString("ID_ALMACEN"), f.GetString("CAT_CL_RUTA"), sDate))
+				skmt.ExecNonQuery2("INSERT INTO PICK_CIEGO(PC_ID_PROD, PC_NOM_PROD, PC_CANT, PC_ALMACEN, PC_RUTA, PC_FECHA) VALUES(?,?,?,?,?,?)", Array As String(idParts(0), idParts(1), inputText, a.GetString("ID_ALMACEN"), f.GetString("CAT_CL_RUTA"), sDate&" "&stime))
 			Else
 				B4XPages.MainPage.skmt.ExecNonQuery2("Update PICK_CIEGO set PC_CANT = ?  WHERE PC_ID_PROD = ?" , Array As String(inputText ,idParts(0)))
 			End If
 		End If
 		f.Close
 		a.Close
-		Log("Processed item " & i)
+'		Log("Processed item " & i)
 	Next
 	et_buspc.Text = ""
 	CLV_PICK_CIEGO.Clear
@@ -994,9 +996,11 @@ Private Sub b_terpc_Click
 		Wait For Msgbox_Result (resultado As Int)
 		If resultado = DialogResponse.POSITIVE Then
 		
-			Dim sDate As String
-			DateTime.DateFormat = "MM/dd/yyyy"
+			Dim sDate, stime As String
+			DateTime.DateFormat = "dd/MM/yyyy"
+			DateTime.TimeFormat = "HH:mm:ss"
 			sDate = DateTime.Date(DateTime.Now)
+			stime = DateTime.Time(DateTime.Now)
 	
 			For i = 0 To CLV_PICK_CIEGO.Size - 1
 				' Retrieve the panel and child views for the current item
@@ -1029,7 +1033,7 @@ Private Sub b_terpc_Click
 					c = Starter.skmt.ExecQuery2("SELECT * FROM PICK_CIEGO where PC_ID_PROD = ?", Array As String (idParts(0)))
 					If c.RowCount = 0 Then
 						' Insert data into the database
-						skmt.ExecNonQuery2("INSERT INTO PICK_CIEGO(PC_ID_PROD, PC_NOM_PROD, PC_CANT, PC_ALMACEN, PC_RUTA, PC_FECHA) VALUES(?,?,?,?,?,?)", Array As String(idParts(0), idParts(1), inputText, a.GetString("ID_ALMACEN"), f.GetString("CAT_CL_RUTA"), sDate))
+						skmt.ExecNonQuery2("INSERT INTO PICK_CIEGO(PC_ID_PROD, PC_NOM_PROD, PC_CANT, PC_ALMACEN, PC_RUTA, PC_FECHA) VALUES(?,?,?,?,?,?)", Array As String(idParts(0), idParts(1), inputText, a.GetString("ID_ALMACEN"), f.GetString("CAT_CL_RUTA"), sDate&" "&stime))
 					Else
 						B4XPages.MainPage.skmt.ExecNonQuery2("Update PICK_CIEGO set PC_CANT = ?  WHERE PC_ID_PROD = ?" , Array As String(inputText ,idParts(0)))
 					End If
@@ -1087,4 +1091,32 @@ End Sub
 
 Private Sub b_cancelarcodigo_Click
 	p_validacion.Visible = False
+End Sub
+
+Private Sub b_envioBD_Click
+	'	copiaDB
+'	Sleep(1000)
+	Dim FileName As String = "kmt.db"
+	'copy the shared file to the shared folder
+	Log("xxxxxx:"&Provider.SharedFolder)
+	Sleep(1000)
+	File.Copy(File.DirInternal, FileName, Provider.SharedFolder, FileName)
+	Dim email As Email
+	email.To.Add("soporte@keymonsoft.com")
+	email.Subject = "Envio Base de datos Marquez"
+	email.Attachments.Add(Provider.GetFileUri(FileName))
+'	email.Attachments.Add(Provider.GetFileUri(FileName)) 'second attachment
+	Dim in As Intent = email.GetIntent
+	in.Flags = 1 'FLAG_GRANT_READ_URI_PERMISSION
+	StartActivity(in)
+End Sub
+
+Private Sub b_recarga_Click
+	c = skmt.ExecQuery("SELECT * FROM CAT_GUNAPROD")
+	If c.RowCount > 0 Then
+		Subs.panelVisible(p_validacion,0,0)
+		recarga = "1"
+	Else
+		MsgboxAsync("No hay ruta cargada, favor de cargar día","Atención")
+	End If
 End Sub
\ No newline at end of file
diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas
index f199253..2ddc63e 100644
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -385,13 +385,13 @@ Sub B4XPage_Appear
 '	h.Close
 '	j.Close
 
-	If la_cuenta.Text = "0" Then
+	If la_cuenta.Text = "0" Or la_cuenta.Text = "1" Then
 		p_cbFactura.Visible = False
 		l_factura.Visible = False
 		b_ventaabordo.Visible = False
 	Else
-		p_cbFactura.Visible = True
-		l_factura.Visible = True
+		p_cbFactura.Visible = False
+		l_factura.Visible = False
 		b_ventaabordo.Visible = True
 	End If
 	
@@ -418,12 +418,12 @@ Sub B4XPage_Appear
 	
 	'SELECT CAT_CL_BCREDITO, CAT_CL_CODIGO, Ifnull(SALDO_PENDIENTE,0) FROM KMT_INFO INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)
 	
-	Private credi2 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_BCREDITO, CAT_CL_CODIGO, Ifnull(SALDO_PENDIENTE,0) As SALDO_PENDIENTE FROM KMT_INFO INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
+	Private credi2 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_BCREDITO, CAT_CL_CODIGO, Ifnull(SALDO_PENDIENTE,0) As SALDO_PENDIENTE FROM KMT_INFO INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_BCREDITO, CAT_CL_CODIGO, Ifnull(SALDO_PENDIENTE,0) As SALDO_PENDIENTE FROM KMT_INFO2 INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
 	If credi2.RowCount > 0 Then
 		credi2.Position = 0
 		If credi2.GetString ("CAT_CL_BCREDITO") = "1" Then
 			Log(2)
-			Private credi3 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT a_abono, CAT_CL_CODIGO FROM KMT_INFO INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
+			Private credi3 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT a_abono, CAT_CL_CODIGO FROM KMT_INFO INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT a_abono, CAT_CL_CODIGO FROM KMT_INFO2 INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
 			If credi3.RowCount > 0 Then
 				credi3.Position = 0
 				If credi2.GetString ("SALDO_PENDIENTE") <> credi3.GetString ("a_abono") Then
@@ -439,6 +439,17 @@ Sub B4XPage_Appear
 		End If
 	End If
 	credi2.Close
+	If la_cuenta.Text = "0" Then
+		gest.Text = "Abordo"
+		B4XPages.MainPage.recarga = "0"
+	Else If la_cuenta.Text = "1" Then
+		gest.Text = "Recarga"
+		B4XPages.MainPage.recarga = "1"
+	Else
+		gest.Text = "Pre-venta"
+		B4XPages.MainPage.recarga = "0"
+	End If
+	LogColor(B4XPages.MainPage.recarga,Colors.Blue)
 End Sub
 
 Sub GPS_LocationChanged (Location1 As Location)
@@ -481,9 +492,10 @@ End Sub
 Sub gest_Click
 	If la_cuenta.Text = "0" Then
 		B4XPages.MainPage.tipo_venta = "ABORDO"
+	Else If la_cuenta.Text = "1" Then
+		B4XPages.MainPage.tipo_venta = "RECARGA"
 	Else
-	
-	B4XPages.MainPage.tipo_venta = "PREVENTA"
+		B4XPages.MainPage.tipo_venta = "PREVENTA"
 	End If
 
 	'Buscamos en el historial de cuestionarios si el cliente ya tiene cuestionario contestado.
@@ -527,11 +539,7 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 '	Return True To close, False To cancel
 '	Log($"venimosDeTicketsDia=${venimosDeTicketsDia}"$)
 	If Starter.pre_viejo = pre_act Then
-		Log(Starter.pre_viejo)
-		Log(pre_act)
-		
-	
-		If la_cuenta.Text <> "0" Then
+		If (la_cuenta.Text <> "0" And la_cuenta.Text <> "1") Then
 			cuest.encuestaIniciada = False
 			cuest.ocultPanelPregunta
 			If IsNumber(l_total.text) And Not(Subs.pedidoGuardado) Then
@@ -548,13 +556,20 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 					Guardar_Click
 					ToastMessageShow("Venta Guardada", False)
 				End If
-			End If
+			End If			
 '	venimosDeTicketsDia = False
 			B4XPages.ShowPage("Clientes")
+'		Else If la_cuenta.Text = "1" Then
+'			If B4XPages.MainPage.recarga = "1" Then
+'				B4XPages.ShowPage("login")
+'			End If
 		Else
 		End If
-	Else
-		
+	Else 
+		If B4XPages.MainPage.recarga = "1" Then
+			B4XPages.ShowPage("login")
+		End If
+	
 	End If
 '	Return True
 	Return False
@@ -572,13 +587,14 @@ Sub DATOS_Click
 	B4XPages.ShowPage("telefonos")
 End Sub
 
-Sub Guardar_Click	
+Sub Guardar_Click
 	
 	c = B4XPages.MainPage.skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) and PE_FOLIO = ?", Array As String("PREVENTA"))
 	c.Position = 0
 	If c.GetString("CUANTOS") > 0 Then
 		If la_cuenta.Text <> 0 Then
-			Credi = B4XPages.MainPage.skmt.ExecQuery("Select CAT_CL_BCREDITO FROM kmt_info Where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) and CAT_CL_CODIGO NOT IN (SELECT CLIENTE FROM ABONOSP)")
+			Credi = B4XPages.MainPage.skmt.ExecQuery("Select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info Where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) and CAT_CL_CODIGO NOT IN (SELECT CLIENTE FROM ABONOSP) UNION Select IFNULL(CAT_CL_BCREDITO,0) AS CAT_CL_BCREDITO FROM kmt_info2 Where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) and CAT_CL_CODIGO NOT IN (SELECT CLIENTE FROM ABONOSP)")
+			'INNER JOIN KMT_INFO2 ON CAT_CL_CODIGO = CL_CUENTA
 			If Credi.RowCount > 0 Then
 				Credi.Position = 0
 				If Credi.GetString("CAT_CL_BCREDITO") = "1" Then
@@ -593,7 +609,7 @@ Sub Guardar_Click
 						If resultado = DialogResponse.POSITIVE Then
 							p_credito.Visible = True
 							Dim limitcred As Cursor
-							limitcred = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
+							limitcred = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_LIMITECREDITO FROM kmt_info2 WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
 							limitcred.Position = 0
 							l_limite.Text = "Limite de credito: $" & limitcred.GetString("CAT_CL_LIMITECREDITO")
 							If Subs.traeTotalClientepreventaparacredito >=  limitcred.GetString("CAT_CL_LIMITECREDITO") Then
@@ -612,10 +628,10 @@ Sub Guardar_Click
 					
 					
 				Else If Credi.GetString("CAT_CL_BCREDITO") = "0" Then
-					GuardaVenta					
+					GuardaVenta
 				End If
 			Else
-				Private credi2 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_BCREDITO, a_abono, SALDO_PENDIENTE FROM KMT_INFO INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
+				Private credi2 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_BCREDITO, a_abono, SALDO_PENDIENTE FROM KMT_INFO INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_BCREDITO, a_abono, SALDO_PENDIENTE FROM KMT_INFO2 INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE INNER JOIN ABONOS ON CAT_CL_CODIGO = a_cliente WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
 				If credi2.RowCount > 0 Then
 					credi2.Position = 0
 					If credi2.GetString ("CAT_CL_BCREDITO") = "1" And credi2.GetString ("a_abono")=credi2.GetString ("SALDO_PENDIENTE") Then
@@ -626,7 +642,7 @@ Sub Guardar_Click
 							If resultado = DialogResponse.POSITIVE Then
 								p_credito.Visible = True
 								Dim limitcred As Cursor
-								limitcred = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
+								limitcred = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_LIMITECREDITO FROM kmt_info2 WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
 								limitcred.Position = 0
 								l_limite.Text = "Limite de credito: $" & limitcred.GetString("CAT_CL_LIMITECREDITO")
 								If Subs.traeTotalClientepreventaparacredito >=  limitcred.GetString("CAT_CL_LIMITECREDITO") Then
@@ -650,7 +666,7 @@ Sub Guardar_Click
 '			Credi.Close
 		Else If la_cuenta.Text = 0 Then
 			GuardaVenta
-		End If	
+		End If
 	Else If c.GetString("CUANTOS") = 0 Then
 		GuardaVenta
 	End If
@@ -663,7 +679,7 @@ Private Sub b_acred_Click
 	usuario = c2.GetString("USUARIO")
 	c2.Close
 	Dim limitcred As Cursor
-	limitcred = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
+	limitcred = B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_LIMITECREDITO FROM kmt_info WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) UNION SELECT CAT_CL_LIMITECREDITO FROM kmt_info2 WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
 	limitcred.Position = 0
 	l_limite.Text = "Limite de credito: $" & limitcred.GetString("CAT_CL_LIMITECREDITO")
 	If Subs.traeTotalClientepreventaparacredito >=  limitcred.GetString("CAT_CL_LIMITECREDITO") Then
@@ -714,62 +730,126 @@ Private Sub b_cancred_Click
 End Sub
 
 Sub GuardaVenta
-	DateTime.DateFormat = "MM/dd/yyyy"
-	sDate=DateTime.Date(DateTime.Now)
-	sTime=DateTime.Time(DateTime.Now)
-	c=B4XPages.MainPage.skmt.ExecQuery("Select CUENTA from cuentaa")
-	c.Position=0
-	clie_id = c.GetString("CUENTA")
-	c.Close
-	c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO from usuarioa")
-	c.Position=0
-	usuario = c.GetString("USUARIO")
-	c.Close
-	c=B4XPages.MainPage.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
-	'	Log("xxxxxxxxxxxxxxx   " & c.GetString("CUANTOS"))
-	If c.GetString("CUANTOS") > 0 Then
-		Private cbFactura As Int = 0
-		If cb_factura.Checked Then cbFactura = 1
-		B4XPages.MainPage.skmt.ExecNonQuery("delete from NOVENTA where NV_CLIENTE In (select cuenta from cuentaa)")
-		B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
-		B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO, PC_LON, PC_LAT, PC_ENVIO_OK, PC_FACTURA) VALUES (?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps, 0, cbFactura))
-		B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 2  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
-	End If
-	c.Close
-	DateTime.TimeFormat = "HHmmss"
-	sTime=DateTime.Time(DateTime.Now)
-	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_OUT = ?  where HSS_OUT = 0 AND  HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(sTime))
-	'  B4XPages.MainPage.skmt.ExecNonQuery("UPDATE HIST_STAY_STORE set HSS_TOT = HSS_OUT - HSS_IN where HSS_CODIGO In (select cuenta from cuentaa)")
-	Try
-		c=B4XPages.MainPage.skmt.ExecQuery(" Select (substr(HSS_OUT,1,2) - substr(HSS_IN,1,2)) - Case when  (substr(HSS_OUT,3,2) - substr(HSS_IN,3,2)) < 0 Then 1 Else 0 end HORAS_TOTALES, " & _
+	Log(B4XPages.MainPage.recarga)
+	If B4XPages.MainPage.recarga = "0" Then
+		DateTime.DateFormat = "MM/dd/yyyy"
+		sDate=DateTime.Date(DateTime.Now)
+		sTime=DateTime.Time(DateTime.Now)
+		c=B4XPages.MainPage.skmt.ExecQuery("Select CUENTA from cuentaa")
+		c.Position=0
+		clie_id = c.GetString("CUENTA")
+		c.Close
+		c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO from usuarioa")
+		c.Position=0
+		usuario = c.GetString("USUARIO")
+		c.Close
+		c=B4XPages.MainPage.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
+		'	Log("xxxxxxxxxxxxxxx   " & c.GetString("CUANTOS"))
+		If c.GetString("CUANTOS") > 0 Then
+			Private cbFactura As Int = 0
+			If cb_factura.Checked Then cbFactura = 1
+			B4XPages.MainPage.skmt.ExecNonQuery("delete from NOVENTA where NV_CLIENTE In (select cuenta from cuentaa)")
+			B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
+			B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO, PC_LON, PC_LAT, PC_ENVIO_OK, PC_FACTURA) VALUES (?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps, 0, cbFactura))
+			B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 2  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
+			B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info2 set gestion = 2  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
+		End If
+		c.Close
+		DateTime.TimeFormat = "HHmmss"
+		sTime=DateTime.Time(DateTime.Now)
+		B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_OUT = ?  where HSS_OUT = 0 AND  HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(sTime))
+		'  B4XPages.MainPage.skmt.ExecNonQuery("UPDATE HIST_STAY_STORE set HSS_TOT = HSS_OUT - HSS_IN where HSS_CODIGO In (select cuenta from cuentaa)")
+		Try
+			c=B4XPages.MainPage.skmt.ExecQuery(" Select (substr(HSS_OUT,1,2) - substr(HSS_IN,1,2)) - Case when  (substr(HSS_OUT,3,2) - substr(HSS_IN,3,2)) < 0 Then 1 Else 0 end HORAS_TOTALES, " & _
 	"Case when  (substr(HSS_OUT,3,2) - substr(HSS_IN,3,2)) < 0 Then (substr(HSS_OUT,3,2) + 60 - substr(HSS_IN,3,2)) " & _
 	"	Else (substr(HSS_OUT,3,2) - substr(HSS_IN,3,2)) End - Case when  (substr(HSS_OUT,5,2) - substr(HSS_IN,5,2)) < 0 Then 1 Else 0 end  MINUTOS_TOTALES, " & _
 	"Case when  (substr(HSS_OUT,5,2) - substr(HSS_IN,5,2)) < 0 Then (substr(HSS_OUT,5,2) + 60 - substr(HSS_IN,5,2)) " & _
 	"	Else (substr(HSS_OUT,5,2) - substr(HSS_IN,5,2)) end SEGUNDOS_TOTALES " & _
 	"	from HIST_STAY_STORE where HSS_CODIGO In (Select cuenta from cuentaa) ")
-		c.Position = 0
-		stay_hh = c.GetString("HORAS_TOTALES") * 60 * 60
-		stay_mi = c.GetString("MINUTOS_TOTALES") * 60
-		stay_ss = c.GetString("SEGUNDOS_TOTALES")
-		B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_TOT = ?  where HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(stay_hh + stay_mi + stay_ss))
-		B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_OUT set HSO_FIN = ?  ", Array As Object(sTime))
+			c.Position = 0
+			stay_hh = c.GetString("HORAS_TOTALES") * 60 * 60
+			stay_mi = c.GetString("MINUTOS_TOTALES") * 60
+			stay_ss = c.GetString("SEGUNDOS_TOTALES")
+			B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_TOT = ?  where HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(stay_hh + stay_mi + stay_ss))
+			B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_OUT set HSO_FIN = ?  ", Array As Object(sTime))
+			c.Close
+		Catch
+			ToastMessageShow(".",True)
+		End Try
+	
+		skmt.ExecNonQuery2("update PEDIDO_INICIO_FINAL set PIF_HORA_FINAL = ? where PIF_CLIENTE = ? and PIF_HORA_FINAL = 0", Array As Object (DateTime.Now, la_cuenta.Text))
+		'	LogColor($"actualizamos "${la_cuenta.text},  hora_final=${DateTime.now}"$,Colors.Red)
+		Subs.actualizaTET(la_cuenta.text)
+		DateTime.TimeFormat = "HH:mm:ss"
+	
+		mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!!
+		mandapiezas
+		B4XPages.MainPage.productos.reiniciarlistaProds = True
+		B4XPages.MainPage.productos.prodsMap.Initialize
+		B4XPages.MainPage.promos.promosMap.Initialize
+		B4XPages.ShowPage("Principal")
+	Else If B4XPages.MainPage.recarga = "1" Then
+		DateTime.DateFormat = "MM/dd/yyyy"
+		sDate=DateTime.Date(DateTime.Now)
+		sTime=DateTime.Time(DateTime.Now)
+		c=B4XPages.MainPage.skmt.ExecQuery("Select CUENTA from cuentaa")
+		c.Position=0
+		clie_id = c.GetString("CUENTA")
 		c.Close
-	Catch
-		ToastMessageShow(".",True)
-	End Try
+		c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO from usuarioa")
+		c.Position=0
+		usuario = c.GetString("USUARIO")
+		c.Close
+		c=B4XPages.MainPage.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
+		'	Log("xxxxxxxxxxxxxxx   " & c.GetString("CUANTOS"))
+		If c.GetString("CUANTOS") > 0 Then
+			Private cbFactura As Int = 0
+			If cb_factura.Checked Then cbFactura = 1
+			B4XPages.MainPage.skmt.ExecNonQuery("delete from NOVENTA where NV_CLIENTE In (select cuenta from cuentaa)")
+			B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
+			B4XPages.MainPage.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO, PC_LON, PC_LAT, PC_ENVIO_OK, PC_FACTURA) VALUES (?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps, 0, cbFactura))
+			B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 2  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
+		End If
+		c.Close
+		DateTime.TimeFormat = "HHmmss"
+		sTime=DateTime.Time(DateTime.Now)
+		B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_OUT = ?  where HSS_OUT = 0 AND  HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(sTime))
+		'  B4XPages.MainPage.skmt.ExecNonQuery("UPDATE HIST_STAY_STORE set HSS_TOT = HSS_OUT - HSS_IN where HSS_CODIGO In (select cuenta from cuentaa)")
+'		Try
+'			c=B4XPages.MainPage.skmt.ExecQuery(" Select (substr(HSS_OUT,1,2) - substr(HSS_IN,1,2)) - Case when  (substr(HSS_OUT,3,2) - substr(HSS_IN,3,2)) < 0 Then 1 Else 0 end HORAS_TOTALES, " & _
+'	"Case when  (substr(HSS_OUT,3,2) - substr(HSS_IN,3,2)) < 0 Then (substr(HSS_OUT,3,2) + 60 - substr(HSS_IN,3,2)) " & _
+'	"	Else (substr(HSS_OUT,3,2) - substr(HSS_IN,3,2)) End - Case when  (substr(HSS_OUT,5,2) - substr(HSS_IN,5,2)) < 0 Then 1 Else 0 end  MINUTOS_TOTALES, " & _
+'	"Case when  (substr(HSS_OUT,5,2) - substr(HSS_IN,5,2)) < 0 Then (substr(HSS_OUT,5,2) + 60 - substr(HSS_IN,5,2)) " & _
+'	"	Else (substr(HSS_OUT,5,2) - substr(HSS_IN,5,2)) end SEGUNDOS_TOTALES " & _
+'	"	from HIST_STAY_STORE where HSS_CODIGO In (Select cuenta from cuentaa) ")
+'			c.Position = 0
+'			stay_hh = c.GetString("HORAS_TOTALES") * 60 * 60
+'			stay_mi = c.GetString("MINUTOS_TOTALES") * 60
+'			stay_ss = c.GetString("SEGUNDOS_TOTALES")
+'			B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_TOT = ?  where HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(stay_hh + stay_mi + stay_ss))
+'			B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_OUT set HSO_FIN = ?  ", Array As Object(sTime))
+'			c.Close
+'		Catch
+'			ToastMessageShow(".",True)
+'		End Try
 	
-	skmt.ExecNonQuery2("update PEDIDO_INICIO_FINAL set PIF_HORA_FINAL = ? where PIF_CLIENTE = ? and PIF_HORA_FINAL = 0", Array As Object (DateTime.Now, la_cuenta.Text))
-	'	LogColor($"actualizamos "${la_cuenta.text},  hora_final=${DateTime.now}"$,Colors.Red)
-	Subs.actualizaTET(la_cuenta.text)
-	DateTime.TimeFormat = "HH:mm:ss"
+		skmt.ExecNonQuery2("update PEDIDO_INICIO_FINAL set PIF_HORA_FINAL = ? where PIF_CLIENTE = ? and PIF_HORA_FINAL = 0", Array As Object (DateTime.Now, la_cuenta.Text))
+		'	LogColor($"actualizamos "${la_cuenta.text},  hora_final=${DateTime.now}"$,Colors.Red)
+		Subs.actualizaTET(la_cuenta.text)
+		DateTime.TimeFormat = "HH:mm:ss"
 	
-	mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!!
-	mandapiezas
-	B4XPages.MainPage.productos.reiniciarlistaProds = True
-	B4XPages.MainPage.productos.prodsMap.Initialize
-	B4XPages.MainPage.promos.promosMap.Initialize
-	B4XPages.ShowPage("Principal")
+'		mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!!
+'		mandapiezas
+		mandaPendientesrecarga
+		mandapiezasrecarga
+		B4XPages.MainPage.productos.reiniciarlistaProds = True
+		B4XPages.MainPage.productos.prodsMap.Initialize
+		B4XPages.MainPage.promos.promosMap.Initialize
+		B4XPages.ShowPage("login")
+		B4XPages.MainPage.recarga = "0"
+	End If
 End Sub
 
 Sub NUEVO_Click
@@ -1577,7 +1657,7 @@ Sub mandaPendientes
 		End If
 
 		'PEDIDO (Pendientes)
-		c = skmt.ExecQuery($"SELECT PE_ENVIO_OK, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM PEDIDO where PE_ENVIO_OK <> 1"$)
+		c = skmt.ExecQuery($"SELECT PE_ENVIO_OK, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, PE_CANTC, PE_BCAJAS FROM PEDIDO where PE_ENVIO_OK <> 1"$)
 		Log($"Pedido PENDIENTE: ${c.RowCount}"$)
 		If c.RowCount>0 Then
 			For i=0 To c.RowCount -1
@@ -1585,7 +1665,7 @@ Sub mandaPendientes
 				Dim cmd As DBCommand
 				cmd.Initialize
 				cmd.Name = "insert_pedido2_MARQUEZ"
-				cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+				cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"),C.GetString("PE_CANTC"),c.GetString("PE_BCAJAS"))
 				reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}_${c.GetString("PE_PROID")}"$)
 				Log($">>>>  INS_PEDIDO= ${C.GetString("PE_CEDIS")},${ALMACEN},${C.GetString("PE_COSTO_TOT")},${C.GetString("PE_COSTOU")},${C.GetString("PE_CANT")}, ${C.GetString("PE_PRONOMBRE")}, ${C.GetString("PE_PROID")}, ${C.GetString("PE_CLIENTE")}, ${C.GetString("PE_FECHA")}, ${C.GetString("PE_USUARIO")}, ${C.GetString("PE_RUTA")}, ${C.GetString("PE_COSTO_SIN")}, ${C.GetString("PE_DESC")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}"$)
 '				sql.insert_pedido_INTMEX=INSERT INTO INTMEX.PEDIDO (PE_CODPROMO,PE_FECHA_SINC,PE_IDALMACEN,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN, PE_DESCUENTO, PE_TIPO) VALUES ((?),SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),nvl((?),0),(?))
@@ -1663,6 +1743,68 @@ Sub mandaPendientes
 	End If
 End Sub
 
+Sub mandaPendientesrecarga
+'	PEDIDO_CLIENTE (Pendientes)
+	Log(">>>>>>>  MANDA PENDIENTES")
+	Dim PCNoArts As String
+	Dim PCMonto As String
+	If usuario <> "KMTS1"  Then
+		f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
+		f.Position=0
+		d = skmt.ExecQuery("SELECT * FROM PEDIDO_CLIENTE where PC_ENVIO_OK = 0 AND PC_CLIENTE = 1")
+		c = skmt.ExecQuery("SELECT * FROM PEDIDO_CLIENTE where PC_ENVIO_OK = 0 AND PC_CLIENTE = 1")
+		Log($"Pedido_Cliente PENDIENTE: ${c.RowCount}"$)
+		If c.RowCount > 0 Then
+			For i = 0 To c.RowCount - 1
+				c.Position = i
+				Log($"${c.GetString("PC_CLIENTE")}|${c.GetString("PC_FECHA")}|${c.GetString("PC_ENVIO_OK")}|"$)
+				Dim cmd As DBCommand
+				cmd.Initialize
+				cmd.Name = "insert_pedidos_MARQUEZ"
+				cmd.Parameters = Array As Object("0", c.GetString("PC_FECHA"), c.GetString("PC_USER"), c.GetString("PC_NOART"), c.GetString("PC_MONTO"), c.GetString("PC_LON"), c.GetString("PC_LAT"), Subs.traeAlmacen, f.GetString("CAT_CL_RUTA"), c.GetString("PC_COSTO_SIN"), c.GetString("PC_FACTURA"))
+				PCNoArts = c.GetString("PC_NOART")
+				PCMonto = c.GetString("PC_MONTO")
+''				sql.insert_pedidos_INTMEX=INSERT INTO INTMEX.PEDIDO_CLIENTE(PC_FECHA_SINC,PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_IDALMACEN, PC_RUTA, PC_COSTO_SIN, PC_FACTURA) VALUES (SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?))
+				reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_head_${c.GetString("PC_CLIENTE")}"$)
+			Next
+		End If
+		f.Close
+		'PEDIDO (Pendientes)
+		c = skmt.ExecQuery($"SELECT PE_ENVIO_OK, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, PE_CANTC, PE_BCAJAS FROM PEDIDO where PE_ENVIO_OK <> 1 AND PE_FOLIO = 'RECARGA'"$)
+		Log($"Pedido PENDIENTE: ${c.RowCount}"$)
+		If c.RowCount>0 Then
+			For i=0 To c.RowCount -1
+				c.Position=i
+				Dim cmd As DBCommand
+				cmd.Initialize
+				cmd.Name = "insert_pedido2_MARQUEZ"
+				cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),"0",C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"),C.GetString("PE_CANTC"),c.GetString("PE_BCAJAS"))
+				reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}_${c.GetString("PE_PROID")}"$)
+				Log($">>>>  INS_PEDIDO= ${C.GetString("PE_CEDIS")},${ALMACEN},${C.GetString("PE_COSTO_TOT")},${C.GetString("PE_COSTOU")},${C.GetString("PE_CANT")}, ${C.GetString("PE_PRONOMBRE")}, ${C.GetString("PE_PROID")}, ${C.GetString("PE_CLIENTE")}, ${C.GetString("PE_FECHA")}, ${C.GetString("PE_USUARIO")}, ${C.GetString("PE_RUTA")}, ${C.GetString("PE_COSTO_SIN")}, ${C.GetString("PE_DESC")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}"$)
+'				sql.insert_pedido_INTMEX=INSERT INTO INTMEX.PEDIDO (PE_CODPROMO,PE_FECHA_SINC,PE_IDALMACEN,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN, PE_DESCUENTO, PE_TIPO) VALUES ((?),SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),nvl((?),0),(?))
+'				sql.insert_pedido2_INTMEX=INSERT INTO INTMEX.PEDIDO (PE_CODPROMO,PE_FECHA_SINC,PE_IDALMACEN,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN, PE_DESCUENTO, PE_TIPO, PE_CANT_TOTAL, PE_VENTA_TOTAL) VALUES ((?),SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),nvl((?),0),(?),(?),(?))
+			Next
+		End If
+	End If
+End Sub
+
+Sub mandapiezasrecarga
+	If l_total.Text <>  Null Or l_total.Text <> "null" Then
+		Dim PCNoArts As String
+		Dim PCMonto As String
+		c = skmt.ExecQuery2("SELECT * FROM PEDIDO_CLIENTE WHERE PC_CLIENTE = ?", Array As String("1"))
+		If c.RowCount > 0 Then
+			c.Position = 0
+			Log(la_cuenta.Text&", "& ALMACEN&", "& LA_RUTA)
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "select_piezas_MARQUEZ"
+			cmd.Parameters = Array As Object(la_cuenta.Text, ALMACEN, LA_RUTA)
+			reqManager.ExecuteQuery(cmd , 0, "piezasrecarga")
+		End If
+	End If
+End Sub
+
 Sub mandapiezas
 	If l_total.Text <>  Null Or l_total.Text <> "null" Then
 		Dim PCNoArts As String
@@ -1762,6 +1904,51 @@ Sub JobDone(Job As HttpJob)
 
 			End If
 		End If
+		
+		If Job.JobName = "DBRequest" Then
+			Dim resultado As DBResult = reqManager.HandleJob(Job)
+			If resultado.Tag = "piezasrecarga" Then 'query tag
+'				B4XPages.MainPage.picking.cl_picking.Clear
+				Dim piezasexiste As Int
+				For Each records() As Object In resultado.Rows
+					piezasexiste = records(resultado.Columns.Get("COUNT(*)"))
+					Log(piezasexiste)
+					DateTime.DateFormat = "MM/dd/yyyy"
+					DateTime.TimeFormat = "HH:mm:ss"
+					sDate=DateTime.Date(DateTime.Now)
+					sTime=DateTime.Time(DateTime.Now)
+					If piezasexiste =  0 Then
+						Dim PCNoArts As String
+						Dim PCMonto As String
+						c = skmt.ExecQuery2("SELECT * FROM PEDIDO_CLIENTE WHERE PC_CLIENTE = ?", Array As String("1"))
+						If c.RowCount > 0 Then
+							c.Position = 0
+							PCNoArts = c.GetString("PC_NOART")
+							PCMonto = c.GetString("PC_MONTO")
+						End If
+						Dim cmd As DBCommand
+						cmd.Initialize
+						cmd.Name = "insert_HVC_MARQUEZ"
+						cmd.Parameters = Array As Object((sDate & " " & sTime), "0", PCNoArts, PCMonto, ALMACEN, LA_RUTA)
+						reqManager.ExecuteCommand(cmd , "insert_hvc")
+'						reqManager.ExecuteCommand(cmd , $"ins_abonosPendientes_${ab.GetString("a_cliente")}"$)
+					Else If piezasexiste = 1 Then
+						Dim PCNoArts As String
+						Dim PCMonto As String
+						c = skmt.ExecQuery2("SELECT * FROM PEDIDO_CLIENTE WHERE PC_CLIENTE = ?", Array As String("1"))
+						If c.RowCount > 0 Then
+							c.Position = 0
+							PCNoArts = c.GetString("PC_NOART")
+							PCMonto = c.GetString("PC_MONTO")
+						End If
+						cmd.Initialize
+						cmd.Name = "update_HVC_MARQUEZ"
+						cmd.Parameters = Array As Object((sDate & " " & sTime), "0", PCNoArts, PCMonto, ALMACEN, LA_RUTA, la_cuenta.Text, ALMACEN, LA_RUTA)
+						reqManager.ExecuteCommand(cmd, "update_hvc")
+					End If
+				Next
+			End If
+		End If
 
 		If Job.JobName = "DBRequest" Then
 			Dim resultado As DBResult = reqManager.HandleJob(Job)
diff --git a/B4A/C_Clientes.bas b/B4A/C_Clientes.bas
index ab29e68..5b0ec58 100644
--- a/B4A/C_Clientes.bas
+++ b/B4A/C_Clientes.bas
@@ -75,7 +75,7 @@ Sub B4XPage_Appear
 	busca.Text = ""
 	entro ="2"
 	colonia = 0
-	c=B4XPages.MainPage.skmt.ExecQuery($"select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where  gestion = 0 AND CAT_CL_CODIGO <> ${"0"} ORDER BY CAT_CL_CODIGO"$)
+	c=B4XPages.MainPage.skmt.ExecQuery($"select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where  gestion = 0 AND CAT_CL_CODIGO <> ${"0"} AND CAT_CL_CODIGO <> ${"1"} ORDER BY CAT_CL_CODIGO"$)
 	ListView1.Clear
 	lfila.Text = "NOMBRE"
 	
@@ -187,7 +187,7 @@ End Sub
 Sub BUSCA_TextChanged (Old As String, New As String)
 	If CHECK = 0 Then
 		q_buscar = "%" & busca.Text & "%"
-		c2=B4XPages.MainPage.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 ? OR CAT_CL_CALLE LIKE ?)and gestion = 0 AND CAT_CL_CODIGO <> ${"0"} order by CAT_CL_NOMBRE "$, Array As String(q_buscar,q_buscar,q_buscar))
+		c2=B4XPages.MainPage.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 ? OR CAT_CL_CALLE LIKE ?)and gestion = 0 AND CAT_CL_CODIGO <> ${"0"} AND CAT_CL_CODIGO <> ${"1"} order by CAT_CL_NOMBRE "$, Array As String(q_buscar,q_buscar,q_buscar))
 		ListView1.Clear
 		lfila.text = "Nombre y Calle"
 	
@@ -369,7 +369,7 @@ Private Sub b_buscar_Click
 		busca.Text = ""
 		entro ="2"
 		colonia = 0
-		c=B4XPages.MainPage.skmt.ExecQuery($"select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info2 where  gestion = 0 AND CAT_CL_CODIGO <> ${"0"} ORDER BY CAT_CL_CODIGO"$)
+		c=B4XPages.MainPage.skmt.ExecQuery($"select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info2 where  gestion = 0 AND CAT_CL_CODIGO <> ${"0"} AND CAT_CL_CODIGO <> ${"1"} ORDER BY CAT_CL_CODIGO"$)
 		ListView1.Clear
 		lfila.Text = "NOMBRE"
 		ListView1.Clear
@@ -408,7 +408,7 @@ Private Sub b_buscar_Click
 		busca.Text = ""
 		entro ="2"
 		colonia = 0
-		c=B4XPages.MainPage.skmt.ExecQuery($"select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where  gestion = 0 AND CAT_CL_CODIGO <> ${"0"} ORDER BY CAT_CL_CODIGO"$)
+		c=B4XPages.MainPage.skmt.ExecQuery($"select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where  gestion = 0 AND CAT_CL_CODIGO <> ${"0"} AND CAT_CL_CODIGO <> ${"1"} ORDER BY CAT_CL_CODIGO"$)
 		ListView1.Clear
 		lfila.Text = "NOMBRE"
 		ListView1.Clear
diff --git a/B4A/C_Nota.bas b/B4A/C_Nota.bas
index 33c080e..05be972 100644
--- a/B4A/C_Nota.bas
+++ b/B4A/C_Nota.bas
@@ -92,7 +92,7 @@ Sub B4XPage_Appear
 			Private textColor As Int = Colors.black
 			If c.GetString("PE_FOLIO") = "VENTA" Then
 				textColor = Colors.RGB(48,3,195)
-			Else If c.GetString("PE_FOLIO") = "PREVENTA" Or c.GetString("PE_FOLIO") = "ABORDO" Then
+			Else If c.GetString("PE_FOLIO") = "PREVENTA" Or c.GetString("PE_FOLIO") = "ABORDO" Or c.GetString("PE_FOLIO") = "RECARGA" Then
 				textColor = Colors.RGB(166,0,0)
 			End If
 			If Not(IsNumber(c.GetString("PE_CEDIS"))) And c.GetString("PE_FOLIO") = "VENTA" Then
diff --git a/B4A/C_NuevoCliente.bas b/B4A/C_NuevoCliente.bas
index edd4545..f9ecc57 100644
--- a/B4A/C_NuevoCliente.bas
+++ b/B4A/C_NuevoCliente.bas
@@ -92,7 +92,7 @@ End Sub
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
 
 Sub B4XPage_Appear
-	
+	et_direccion.Text = ""
 	E_NOMBRE.Text =  ""
 	If Not(Starter.gps.GPSEnabled) Then
 		ToastMessageShow("Es necesario tener el GPS encendido", True)
diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas
index 644a5c4..fac0100 100644
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -277,7 +277,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 		l_ctast.Text = d.GetString("TOTAL_VISITAR")
 		l_porvisitar.Text = e.GetString("POR_VISITAR")
 	Else
-		c=B4XPages.MainPage.skmt.ExecQuery("select  sum(pc_monto) as MONTO_DIA, count(pc_cliente) AS CLIENTES_DIA  from pedido_cliente where PC_CLIENTE <> 0 ")
+		c=B4XPages.MainPage.skmt.ExecQuery("select  sum(pc_monto) as MONTO_DIA, count(pc_cliente) AS CLIENTES_DIA  from pedido_cliente where PC_CLIENTE <> 0 AND PC_CLIENTE <> 1")
 		b=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CUANTOS from noventa")
 		'where pc_fecha = ?", Array As String(fecha)
 		c.Position=0
@@ -285,7 +285,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 		L_MONTOD.Text = c.GetString("MONTO_DIA")
 		l_cuantosc.Text = c.GetString("CLIENTES_DIA")
 		l_cuantosn.Text = b.GetString("CUANTOS")
-		drop = c.GetString("MONTO_DIA") / c.GetString("CLIENTES_DIA")
+'		drop = c.GetString("MONTO_DIA") / c.GetString("CLIENTES_DIA")
 		l_drop.Text = Round2(drop,2)
 		efectiva = c.GetString("CLIENTES_DIA") / e.GetString("POR_VISITAR")
 		l_efectiva.text = Round2(efectiva*100,2)
@@ -410,16 +410,16 @@ Sub B4XPage_Appear
 	End If
 	DateTime.DateFormat = "MM/dd/yyyy"
 	fecha=DateTime.Date(DateTime.Now)
-	b=B4XPages.MainPage.skmt.ExecQuery("Select count(*) as CUANTOS from pedido_cliente")
+	b=B4XPages.MainPage.skmt.ExecQuery("Select count(*) as CUANTOS from pedido_cliente WHERE PC_CLIENTE <> 0  AND PC_CLIENTE <> 1")
 	b.Position=0
 	Cuantos = b.GetString("CUANTOS")
 	b.Close
 '	If Starter.marcaCel <> "Sony" Then ToastMessageShow(Cuantos , True)
 	d=B4XPages.MainPage.skmt.ExecQuery("select count(*) as TOTAL_VISITAR from kmt_info where gestion = 0")
 	d.Position=0
-	e=B4XPages.MainPage.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info WHERE CAT_CL_CODIGO <>0")
+	e=B4XPages.MainPage.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info WHERE CAT_CL_CODIGO <>0 OR CAT_CL_CODIGO <>1 ")
 	e.Position=0
-	f=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info WHERE CAT_CL_CODIGO <>0")
+	f=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info WHERE CAT_CL_CODIGO <>0 OR CAT_CL_CODIGO <>1 ")
 	f.Position=0
 	l_ruta.Text = f.GetString("CAT_CL_RUTA")
 	f.Close
@@ -477,14 +477,14 @@ Sub B4XPage_Appear
 		Else
 			ImageView3.Bitmap = LoadBitmap(File.DirAssets, "palomita_verde.png")
 		End If
-		L_TICKPROM.Text =  Round2((c.GetString("MONTO_DIA") / c.GetString("CLIENTES_DIA")),2)
-		If c.GetString("MONTO_DIA") < 4000 Then
-			ImageView5.Bitmap = LoadBitmap(File.DirAssets, "tache_rojo.png")
-		Else if c.GetString("MONTO_DIA") > =  4000  And c.GetString("MONTO_DIA") < 6250 Then
-			ImageView5.bitmap = LoadBitmap(File.DirAssets, "alerta_amarilla.png")
-		Else
-			ImageView5.Bitmap = LoadBitmap(File.DirAssets, "palomita_verde.png")
-		End If
+'		L_TICKPROM.Text =  Round2((c.GetString("MONTO_DIA") / c.GetString("CLIENTES_DIA")),2)
+'		If c.GetString("MONTO_DIA") < 4000 Then
+'			ImageView5.Bitmap = LoadBitmap(File.DirAssets, "tache_rojo.png")
+'		Else if c.GetString("MONTO_DIA") > =  4000  And c.GetString("MONTO_DIA") < 6250 Then
+'			ImageView5.bitmap = LoadBitmap(File.DirAssets, "alerta_amarilla.png")
+'		Else
+'			ImageView5.Bitmap = LoadBitmap(File.DirAssets, "palomita_verde.png")
+'		End If
 		b.Close
 		c.Close
 	End If
@@ -666,8 +666,6 @@ Sub Subir_Click
 		If c.RowCount>0 Then
 			For i = 0 To c.RowCount - 1
 				c.Position = i
-				Log(File.Exists(Dirp&Dir&Dir2,c.GetString("CN_FOTO")))
-				If File.Exists(Dirp&Dir&Dir2,c.GetString("CN_FOTO")) Then fotocn = Bit.InputStreamToBytes(File.OpenInput(Dirp&Dir,c.GetString("CN_FOTO")))
 				Dim dia As Int = DateTime.GetDayOfWeek(DateTime.Now)
 				If dia = 2  Then
 					Dim dialetra As String = "LUNES"
@@ -685,7 +683,7 @@ Sub Subir_Click
 				Dim cmd As DBCommand
 				cmd.Initialize
 				cmd.Name = "insert_clientesnuevos_MARQUEZ"
-				cmd.Parameters = Array As Object(c.GetString("CN_ID"), c.GetString("CN_FECHA"), c.GetString("CN_USER"), c.GetString("CN_LAT"), c.GetString("CN_LON"), c.GetString("CN_NOMBRE"), c.GetString("CN_DIRECCION"),ALMACEN, c.GetString("CN_RUTA"), fotocn, "En espera",c.GetString("CN_GIRO"),dialetra)
+				cmd.Parameters = Array As Object(c.GetString("CN_ID"), c.GetString("CN_FECHA"), c.GetString("CN_USER"), c.GetString("CN_LAT"), c.GetString("CN_LON"), c.GetString("CN_NOMBRE"), c.GetString("CN_DIRECCION"),ALMACEN, c.GetString("CN_RUTA"), "En espera",c.GetString("CN_GIRO"),dialetra)
 				reqManager.ExecuteCommand(cmd , "inst_clientesn")
 			Next
 		End If
@@ -707,8 +705,8 @@ Sub Subir_Click
 		' PEDIDO_CLIENTE
 		Dim PCNoArts As String
 		Dim PCMonto As String
-		c = B4XPages.MainPage.skmt.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE ")
-		d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDOSC FROM PEDIDO_CLIENTE ")
+		c = B4XPages.MainPage.skmt.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE WHERE PC_CLIENTE <> '1' ")
+		d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDOSC FROM PEDIDO_CLIENTE WHERE PC_CLIENTE <> 1 ")
 		If c.RowCount > 0 Then
 			For i = 0 To c.RowCount - 1
 				c.Position = i
@@ -728,7 +726,7 @@ Sub Subir_Click
 		d.Close
 
 		' PEDIDO
-		c = B4XPages.MainPage.skmt.ExecQuery("SELECT PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM PEDIDO")
+		c = B4XPages.MainPage.skmt.ExecQuery("SELECT PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, PE_CANTC, PE_BCAJAS FROM PEDIDO WHERE PE_FOLIO <> 'RECARGA'")
 		d = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO")
 		If c.RowCount > 0 Then
 			For i = 0 To c.RowCount - 1
@@ -737,7 +735,7 @@ Sub Subir_Click
 				cmd.Initialize
 				cmd.Name = "insert_pedido2_MARQUEZ" 'CON TOTALES INCLUIDOS
 				Log(C.GetString("PE_CEDIS")&", "&ALMACEN&", "&C.GetString("PE_COSTO_TOT")&", "&C.GetString("PE_COSTOU")&", "&C.GetString("PE_CANT")&", "&C.GetString("PE_PRONOMBRE")&", "&C.GetString("PE_PROID")&", "&C.GetString("PE_CLIENTE")&", "&C.GetString("PE_FECHA")&", "&C.GetString("PE_USUARIO")&", "&C.GetString("PE_RUTA")&", "& C.GetString("PE_COSTO_SIN")&", "&C.GetString("PE_DESC")&", "&c.GetString("PE_FOLIO")&", "& ALMACEN)
-				cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+				cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"),ALMACEN,C.GetString("PE_COSTO_TOT"),C.GetString("PE_COSTOU"),C.GetString("PE_CANT"),C.GetString("PE_PRONOMBRE"),C.GetString("PE_PROID"),C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"),C.GetString("PE_CANTC"),c.GetString("PE_BCAJAS"))
 				reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}_${c.GetString("PE_PROID")}"$)
 '				Log($">>>>  INS_PEDIDO= ${C.GetString("PE_CEDIS")},${ALMACEN},${C.GetString("PE_COSTO_TOT")},${C.GetString("PE_COSTOU")},${C.GetString("PE_CANT")}, ${C.GetString("PE_PRONOMBRE")}, ${C.GetString("PE_PROID")}, ${C.GetString("PE_CLIENTE")}, ${C.GetString("PE_FECHA")}, ${C.GetString("PE_USUARIO")}, ${C.GetString("PE_RUTA")}, ${C.GetString("PE_COSTO_SIN")}, ${C.GetString("PE_DESC")}, ${c.GetString("PE_FOLIO")}, ${PCNoArts}, ${PCMonto}"$)
 '				cmd.Name = "insert_pedido_INTMEX"  ' SIN TOTALES INCLUIDOS
@@ -828,7 +826,7 @@ Sub Subir_Click
 '		c.Close
 		
 		
-		c = B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM PEDIDO_CLIENTE")
+		c = B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM PEDIDO_CLIENTE WHERE PC_CLIENTE <> 01")
 		If c.RowCount > 0 Then
 			For i = 0 To c.RowCount - 1
 				c.Position = i
@@ -1236,6 +1234,7 @@ Sub JobDone(Job As HttpJob)
 					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_STAY_STORE(HSS_CODIGO,  HSS_IN , HSS_OUT , HSS_TOT) VALUES (?,0,0,0)", Array As Object (CAT_CL_CODIGO))
 				Next
 				Starter.skmt.ExecNonQuery2("INSERT INTO kmt_info(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,0,0) ",Array As Object ("0",e_ruta.TEXT, "VENTA ABORDO","null","null","null","null","null","null","null","null","null","null","null","null","NULL","null","NULL"))
+				Starter.skmt.ExecNonQuery2("INSERT INTO kmt_info(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,0,0) ",Array As Object ("1",e_ruta.TEXT, "VENTA RECARGA","null","null","null","null","null","null","null","null","null","null","null","null","NULL","null","NULL"))
 				Listo1 = 1
 				S_CC.Text = "LISTO"
 				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Catalogo Clientes Actualizados." , True)
@@ -1266,7 +1265,7 @@ Sub JobDone(Job As HttpJob)
 						
 						Dim PCNoArts As String
 						Dim PCMonto As String
-						c = B4XPages.MainPage.skmt.ExecQuery2("SELECT * FROM PEDIDO_CLIENTE WHERE PC_CLIENTE = ?", Array As String(userpiezas))
+						c = B4XPages.MainPage.skmt.ExecQuery2("SELECT * FROM PEDIDO_CLIENTE WHERE PC_CLIENTE = ? AND PC_CLIENTE <> 1", Array As String(userpiezas))
 						
 						If c.RowCount > 0 Then
 							c.Position = 0
diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas
index 40592b6..7aa2b03 100644
--- a/B4A/C_Productos.bas
+++ b/B4A/C_Productos.bas
@@ -143,7 +143,7 @@ End Sub
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
 
 Sub B4XPage_Appear
-	If B4XPages.MainPage.tipo_venta = "PREVENTA" Or B4XPages.MainPage.tipo_venta = "ABORDO" Then
+	If B4XPages.MainPage.tipo_venta = "PREVENTA" Or B4XPages.MainPage.tipo_venta = "ABORDO" Or B4XPages.MainPage.tipo_venta = "RECARGA" Then
 		Starter.tabla = "CAT_GUNAPROD"
 	Else If B4XPages.MainPage.tipo_venta = "VENTA" Then
 		Starter.tabla = "CAT_GUNAPROD2"
@@ -577,7 +577,15 @@ Sub b_prodMenos_Click
 			o.Position = 0
 			invActualizado = o.GetString("CAT_GP_ALMACEN")
 		End If
-		If 2 = 2 Then lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & invActualizado).Color(0xFF017F01).Append($"   $${NumberFormat2(precio, 1, 2, 2, False)}"$).Popall
+		If clv_prods_ll.GetValue(index).As(Map).Get("precio_caja").As(Float) = 0 Or clv_prods_ll.GetValue(index).As(Map).Get("conversion").As(Int) = 1 Then
+			Private maxcajas As Int = 0
+			Log("cajas a 0")
+		Else
+			Private maxcajas As Int = invActualizado/clv_prods_ll.GetValue(index).As(Map).Get("conversion")
+			Log("cajas no a 0")
+		End If
+'		Private maxcajas As Int = invActualizado/clv_prods_ll.GetValue(index).As(Map).Get("conversion")
+		If 2 = 2 Then lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & invActualizado).Color(0xFF017F01).Append($"   $${NumberFormat2(precio, 1, 2, 2, False)}${CRLF}Max. Cajas: ${maxcajas}"$).Popall
 '		Log(lProdX.Text)
 	End If
 	If Subs.totalPedido < 1 Then laCant.Text = "0"
@@ -587,6 +595,17 @@ Sub b_prodMenos_Click
 		Log("invisible")
 		panelbotonesc.Visible = False
 	End If
+	
+	If clv_prods_ll.GetValue(index).As(Map).Get("almacen") < clv_prods_ll.GetValue(index).As(Map).Get("conversion") Then
+		Log(clv_prods_ll.GetValue(index).As(Map).Get("cant"))
+		If clv_prods_ll.GetValue(index).As(Map).Get("cant").As(Int) = 0 Then
+			Log("Aqui debemos ponerlo invisible")
+			panelcajas.Visible = False
+		Else
+				
+		End If
+'					p_botMasMenc.Visible = False
+	End If
 	'fin aparecer parte de cajas
 '	LogColor("InvTotal PRODMAS: " & invTotal, Colors.Red)
 End Sub
@@ -666,7 +685,14 @@ Sub b_prodMas_Click
 			o.Position = 0
 			invActualizado = o.GetString("CAT_GP_ALMACEN")
 		End If
-		If 2 = 2 Then lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & invActualizado).Color(0xFF017F01).Append($"   $${NumberFormat2(precio, 1, 2, 2, False)}"$).Popall
+		If clv_prods_ll.GetValue(index).As(Map).Get("precio_caja").As(Float) = 0 Or clv_prods_ll.GetValue(index).As(Map).Get("conversion").As(Int) = 1 Then
+			Private maxcajas As Int = 0
+			Log("cajas a 0")
+		Else
+			Private maxcajas As Int = invActualizado/clv_prods_ll.GetValue(index).As(Map).Get("conversion")
+			Log("cajas no a 0")
+		End If
+		If 2 = 2 Then lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & invActualizado).Color(0xFF017F01).Append($"   $${NumberFormat2(precio, 1, 2, 2, False)}${CRLF}Max. Cajas: ${maxcajas}"$).Popall
 '		Log(lProdX.Text)
 	End If
 	invTotal = totalcajasmaspiezas + Subs.traeinventario(id)
@@ -766,7 +792,14 @@ Private Sub et_pCant_TextChanged (Old As String, New As String)
 '			End If
 		
 			If New = "" Then New = 0
-			lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & (Subs.traeinventario(id))).Color(0xFF017F01).Append($"   $${NumberFormat2(precio, 1, 2, 2, False)}"$).Popall
+			If clv_prods_ll.GetValue(index).As(Map).Get("precio_caja").As(Float) = 0 Or clv_prods_ll.GetValue(index).As(Map).Get("conversion").As(Int) = 1 Then
+				Private maxcajas As Int = 0
+				Log("cajas a 0")
+			Else
+				Private maxcajas As Int = invActualizado/clv_prods_ll.GetValue(index).As(Map).Get("conversion")
+				Log("cajas no a 0")
+			End If
+			lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & (Subs.traeinventario(id))).Color(0xFF017F01).Append($"   $${NumberFormat2(precio, 1, 2, 2, False)}${CRLF}Max. Cajas: ${maxcajas}"$).Popall
 		End If
 	End If
 End Sub
@@ -780,7 +813,7 @@ Sub cuentaProds
 	p_botonesVenta.Visible = True
 	p_botonesVenta.BringToFront
 	c.Position=0
-	Log($"Total Prods: ${c.GetString("cant")}, Total Compra: $$1.2{c.GetString("total")}"$)
+'	Log($"Total Prods: ${c.GetString("cant")}, Total Compra: $$1.2{c.GetString("total")}"$)
 	c.Close
 '	Log($"HAY PEDIDO: ${hayPedido}"$)
 End Sub
@@ -813,7 +846,7 @@ Sub b_terminar1_Click
 			
 			If c_prods.GetString("PE_FOLIO") = "VENTA" Then
 				textColor = Colors.RGB(48,3,195)
-			Else If c_prods.GetString("PE_FOLIO") = "PREVENTA" Or c_prods.GetString("PE_FOLIO") = "ABORDO" Then
+			Else If c_prods.GetString("PE_FOLIO") = "PREVENTA" Or c_prods.GetString("PE_FOLIO") = "ABORDO" Or c_prods.GetString("PE_FOLIO") = "RECARGA" Then
 				textColor = Colors.RGB(166,0,0)
 			End If
 			If Not(IsNumber(c_prods.GetString("PE_CEDIS"))) And c_prods.GetString("PE_FOLIO") = "VENTA" Then
@@ -1100,6 +1133,7 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In
 '						b_prodMas.Enabled = False
 						b_prodMenos.Enabled = False
 					End If
+				
 				End If
 				
 				Private precio As String=NumberFormat2(clv_prods_ll.GetValue(i).As(Map).Get("precio").As(Double),1,2,2,False)
@@ -1137,11 +1171,31 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In
 '					p_botMasMenc.Visible = True
 '					Log("visible verdadero")
 '				End If
-				l_prodX.Text = cs.Color(Colors.red).append(clv_prods_ll.GetValue(i).As(Map).Get("prod")).pop.append(CRLF).Append("Existencias: " & clv_prods_ll.GetValue(i).As(Map).Get("almacen")).Color(0xFF017F01).Append($"   $${precio}"$).Popall
+				If clv_prods_ll.GetValue(i).As(Map).Get("precio_caja").As(Float) = 0 Or clv_prods_ll.GetValue(i).As(Map).Get("conversion").As(Int) = 1 Then
+					Private maxcajas As Int = 0
+					Log("cajas a 0")
+				Else
+					Private maxcajas As Int = clv_prods_ll.GetValue(i).As(Map).Get("almacen")/clv_prods_ll.GetValue(i).As(Map).Get("conversion")
+					Log("cajas no a 0")
+				End If
+'				Private maxcajas As Int = clv_prods_ll.GetValue(i).As(Map).Get("almacen")/clv_prods_ll.GetValue(i).As(Map).Get("conversion") 
+				l_prodX.Text = cs.Color(Colors.red).append(clv_prods_ll.GetValue(i).As(Map).Get("prod")).pop.append(CRLF).Append("Existencias: " & clv_prods_ll.GetValue(i).As(Map).Get("almacen")).Color(0xFF017F01).Append($"   $${precio}${CRLF}Max. Cajas: ${maxcajas}"$).Popall
 				'aqui si lo comentamos aparece la parte de cajas
-				If clv_prods_ll.GetValue(i).As(Map).Get("conversion") = "1" Or clv_prods_ll.GetValue(i).As(Map).Get("precio_caja") = "0" Then
+				'' por aqui vamos a corregir
+				''Or clv_prods_ll.GetValue(i).As(Map).Get("almacen") < clv_prods_ll.GetValue(i).As(Map).Get("conversion")
+				If clv_prods_ll.GetValue(i).As(Map).Get("conversion") = "1" Or clv_prods_ll.GetValue(i).As(Map).Get("precio_caja") = "0"  Then
 					p_botMasMenc.Visible = False
 				End If
+				If clv_prods_ll.GetValue(i).As(Map).Get("almacen") < clv_prods_ll.GetValue(i).As(Map).Get("conversion") Then
+					Log(clv_prods_ll.GetValue(i).As(Map).Get("cant"))
+					If clv_prods_ll.GetValue(i).As(Map).Get("cant").As(Int) = 0 Then
+						Log("Aqui debemos ponerlo invisible")
+						p_botMasMenc.Visible = False
+					Else
+				
+					End If
+'					p_botMasMenc.Visible = False
+				End If
 				'fin aparecer parte de cajas
 			End If
 '				Log($"${i}, ${FirstIndex}, ${LastIndex}, ${Pnl.NumberOfViews}. ${clv_prods_ll.Size}"$)
@@ -1313,7 +1367,7 @@ Sub b_prodMenosc_Click
 	If laCant2.Text = 0 Then prodsMap.Remove(id)
 	If laCant2.Text = 0 Then
 		panelpiezas.Visible = True
-	Else If laCant2.Text > 0 Then
+	Else If laCant2.Text > 0 Or clv_prods_ll.GetValue(index).As(Map).Get("conversion") < clv_prods_ll.GetValue(index).As(Map).Get("almacen") Then
 		panelpiezas.Visible = False
 	End If
 '	If laCant.IsInitialized Then
@@ -1337,7 +1391,14 @@ Sub b_prodMenosc_Click
 			o.Position = 0
 			invActualizado = o.GetString("CAT_GP_ALMACEN")
 		End If
-		If 2 = 2 Then lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & invActualizado).Color(0xFF017F01).Append($"   $${NumberFormat2(precio, 1, 2, 2, False)}"$).Popall
+		If clv_prods_ll.GetValue(index).As(Map).Get("precio_caja").As(Float) = 0 Or clv_prods_ll.GetValue(index).As(Map).Get("conversion").As(Int) = 1 Then
+			Private maxcajas2 As Int = 0
+			Log("cajas a 0")
+		Else
+			Private maxcajas2 As Int = invActualizado/clv_prods_ll.GetValue(index).As(Map).Get("conversion")
+			Log("cajas no a 0")
+		End If
+		If 2 = 2 Then lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & invActualizado).Color(0xFF017F01).Append($"   $${NumberFormat2(precio, 1, 2, 2, False)}${CRLF}Max. Cajas: ${maxcajas2}"$).Popall
 '		Log(lProdX.Text)
 	End If
 	If Subs.totalPedido < 1 Then laCant2.Text = "0"
@@ -1425,7 +1486,14 @@ Sub b_prodMasc_Click
 			o.Position = 0
 			invActualizado = o.GetString("CAT_GP_ALMACEN")
 		End If
-		If 2 = 2 Then lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & invActualizado).Color(0xFF017F01).Append($"   $${NumberFormat2(precio, 1, 2, 2, False)}"$).Popall
+		If clv_prods_ll.GetValue(index).As(Map).Get("precio_caja").As(Float) = 0 Or clv_prods_ll.GetValue(index).As(Map).Get("conversion").As(Int) = 1 Then
+			Private maxcajas2 As Int = 0
+			Log("cajas a 0")
+		Else
+			Private maxcajas2 As Int = invActualizado/clv_prods_ll.GetValue(index).As(Map).Get("conversion")
+			Log("cajas no a 0")
+		End If
+		If 2 = 2 Then lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & invActualizado).Color(0xFF017F01).Append($"   $${NumberFormat2(precio, 1, 2, 2, False)}${CRLF}Max. Cajas: ${maxcajas2}"$).Popall
 '		Log(lProdX.Text)
 	End If
 	invTotal = totalcajasmaspiezas + Subs.traeinventario(id)
@@ -1457,10 +1525,11 @@ Private Sub et_pCantc_FocusChanged (HasFocus As Boolean)
 End Sub
 
 Private Sub et_pCantc_TextChanged (Old As String, New As String)
-	Log(etCantHasFocus)
-	Log("InvTotal: " & invTotal)
+'	Log(etCantHasFocus)
+'	Log("InvTotal: " & invTotal)
 	If etCantHasFocus = True Then
-		LogColor($"txt changed: ${Old}|${New}, hasfocus=${etCantHasFocus}"$,Colors.Magenta)
+'		Sleep(500)
+'		LogColor($"txt changed: ${Old}|${New}, hasfocus=${etCantHasFocus}"$,Colors.Magenta)
 		Dim index As Int = clv_prods_ll.GetItemFromView(Sender)
 		Dim pnl0 As B4XView = clv_prods_ll.GetPanel(index)
 		Dim pnl As B4XView = pnl0.GetView(0)
@@ -1477,19 +1546,29 @@ Private Sub et_pCantc_TextChanged (Old As String, New As String)
 		Private conversion As String = clv_prods_ll.GetValue(index).As(Map).Get("conversion")
 		Private preciocaja As String = clv_prods_ll.GetValue(index).As(Map).Get("precio_caja")
 		
-		
+		invTotal = Subs.traeinventario(id)
+		Log("inventario total "& invTotal)
 		If(New = "" Or New = Null Or New = "-") Then New = 0
 '		If New < 0 Then New = 0
-		If(New > invTotal) Then
-			Sender.As(EditText).text = invTotal
+		Log(($"new*conversion  ${New * conversion} > ${invTotal} =  ${((New * conversion)  > invTotal)}"$))
+		If((New * conversion)  > invTotal) Then
+'			Dim maximocajas As Int = invTotal / conversion
+			Sender.As(EditText).text = 0
+			New = 0
+'			LogColor("cajas maximas "& maximocajas, Colors.Red)
+			pnl.GetView(2).Visible = True
+			Log("ponemos en 0")
 		End If
+		
 		'	Log($"inventario=${inv}"$)
+		Log("inventario total despues de max "& invTotal)
 		
 		If New = "" Then New = 0
 		If laCant2.Text = "" Then laCant2.Text = 0
-		LogColor(laCant.Text,Colors.Red)
+'		LogColor("la cant2 " &laCant2.Text,Colors.Red)
 		
 		If New > 0 Then
+			Log("lo ocultamos")
 			panelpiezas.Visible = False
 		Else If New = 0 Then
 			panelpiezas.Visible = True
@@ -1501,16 +1580,21 @@ Private Sub et_pCantc_TextChanged (Old As String, New As String)
 '			totalcajasmaspiezas = laCant2.Text
 '		End If
 		Log("InvTotal: " & invTotal)
+		
 		If Not(Old = "0" And New = "") And laCant2.Text <> Null And laCant2.Text <> "" And etCantHasFocus Then
-			If invTotal - (laCant2.Text * conversion) > 0 Then
+			If invTotal - (laCant2.Text * conversion) >= 0 Then
+			LogColor("validacion inventariio " & (invTotal - (laCant2.Text * conversion)), Colors.Blue)
 				Log("actualizamos producto")
 				Subs.actualizaProducto(Subs.traeAlmacen,  preciocaja,(laCant2.Text * conversion), Subs.traeProdNombre(id), id, clienteId, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaUsuario, 0, B4XPages.MainPage.tipo_venta,laCant2.Text,1)
 				cuentaProds
 			Else
 				Private totalcajaspermi As Int = invTotal / conversion
 				laCant2.Text = totalcajaspermi
+				Log("cajas permitidas total por guerra "& totalcajaspermi)
 			End If
 		End If
+		LogColor("la cant2 " & laCant2.Text,Colors.Green)
+		
 		
 '		If New <> "" And New.SubString2(0,0) = "0" Then
 '			New.SubString(1)
@@ -1534,7 +1618,14 @@ Private Sub et_pCantc_TextChanged (Old As String, New As String)
 '			End If
 		
 			If New = "" Then New = 0
-			lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & (Subs.traeinventario(id))).Color(0xFF017F01).Append($"   $${NumberFormat2(precio, 1, 2, 2, False)}"$).Popall
+			If clv_prods_ll.GetValue(index).As(Map).Get("precio_caja").As(Float) = 0 Or clv_prods_ll.GetValue(index).As(Map).Get("conversion").As(Int) = 1 Then
+				Private maxcajas2 As Int = 0
+				Log("cajas a 0")
+			Else
+				Private maxcajas2 As Int = invActualizado/clv_prods_ll.GetValue(index).As(Map).Get("conversion")
+				Log("cajas no a 0")
+			End If
+			lProdX.Text = cs.Color(Colors.red).append(nombreX).pop.Append(CRLF).Append("Existencias: " & (Subs.traeinventario(id))).Color(0xFF017F01).Append($"   $${NumberFormat2(precio, 1, 2, 2, False)}${CRLF}Max. Cajas: ${maxcajas2}"$).Popall
 		End If
 	End If
 End Sub
\ No newline at end of file
diff --git a/B4A/C_Subs.bas b/B4A/C_Subs.bas
index 9da9ac5..1b0cc4e 100644
--- a/B4A/C_Subs.bas
+++ b/B4A/C_Subs.bas
@@ -545,15 +545,15 @@ Sub mandaPendientes 'ignore
 	If c.RowCount>0 Then
 		For i = 0 To c.RowCount - 1
 			c.Position = i
-			Dim cmd As DBCommand
-			cmd.Initialize
-			cmd.Name = "DELETE_PEDIDO_MARDS_PC"
-			cmd.Parameters = Array As Object(almacen, ruta, c.GetString("PC_CLIENTE") )
-			reqManager.ExecuteCommand(cmd , "DEL_PC")
+'			Dim cmd As DBCommand
+'			cmd.Initialize
+'			cmd.Name = "DELETE_PEDIDO_MARDS_PC"
+'			cmd.Parameters = Array As Object(almacen, ruta, c.GetString("PC_CLIENTE") )
+'			reqManager.ExecuteCommand(cmd , "DEL_PC")
 				
 			Dim cmd As DBCommand
 			cmd.Initialize
-			cmd.Name = "insert_pedidos_MARDS"
+			cmd.Name = "insert_pedidos_MARQUEZ"
 			If logger Then Log($"${c.GetString("PC_CLIENTE")}, ${almacen}"$)
 			cmd.Parameters = Array As Object(C.GetString("PC_CLIENTE"), C.GetString("PC_FECHA"), C.GetString("PC_USER"), C.GetString("PC_NOART"), C.GetString("PC_MONTO"), C.GetString("PC_LON"), C.GetString("PC_LAT"), almacen, ruta, C.GetString("PC_COSTO_SIN"), C.GetString("PC_FACTURA"))
 			reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_head_${c.GetString("PC_CLIENTE")}"$)
@@ -568,13 +568,13 @@ Sub mandaPendientes 'ignore
 			c.Position = i
 			Dim cmd As DBCommand
 			
-			cmd.Initialize
-			cmd.Name = "DELETE_PEDIDO_MARDS_PE"
-			cmd.Parameters = Array As Object(almacen, ruta,c.GetString("PE_CLIENTE") )
-			reqManager.ExecuteCommand(cmd , "DEL_PE")
+'			cmd.Initialize
+'			cmd.Name = "DELETE_PEDIDO_MARDS_PE"
+'			cmd.Parameters = Array As Object(almacen, ruta,c.GetString("PE_CLIENTE") )
+'			reqManager.ExecuteCommand(cmd , "DEL_PE")
 			
 			cmd.Initialize
-			cmd.Name = "insert_pedido_MARDS"
+			cmd.Name = "insert_pedido2_MARQUEZ"
 			cmd.Parameters = Array As Object(c.GetString("PE_CEDIS"), almacen, c.GetString("PE_COSTO_TOT"), c.GetString("PE_COSTOU"), c.GetString("PE_CANT"), c.GetString("PE_PRONOMBRE"), c.GetString("PE_PROID"), c.GetString("PE_CLIENTE"), c.GetString("PE_FECHA"), c.GetString("PE_USUARIO"), c.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"), c.GetString("PE_DESC"), c.GetString("PE_FOLIO"))
 			reqManager.ExecuteCommand(cmd , $"ins_pedidosPendientes_prods_${c.GetString("PE_CLIENTE")}"$)
 		Next
@@ -588,7 +588,7 @@ Sub mandaPendientes 'ignore
 			ab.Position = i
 			Dim cmd As DBCommand
 			cmd.Initialize
-			cmd.Name = "insert_abono_MARDS"
+			cmd.Name = "insert_abono_MARQUEZ"
 			cmd.Parameters = Array As Object( ab.GetString("a_usuario"), ab.GetString("a_ruta"), ab.GetString("a_cliente"), ab.GetString("a_abono"), ab.GetString("a_fecha") )
 			reqManager.ExecuteCommand(cmd , $"ins_abonosPendientes_${ab.GetString("a_cliente")}"$)
 			If logger Then Log($"ins_abonosPendientes_${ab.GetString("a_cliente")}"$)
diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal
index 0a1a8ddeee29961ee774e624d78697a403c4ed9a..c74da7164bbef1ac6484c8943f7734e1a79407b0 100644
GIT binary patch
delta 31
mcmZ3xhH32@rVZ*Dlh2onY_`t0!vtioP0mx`+pL|<qzwSyJPexv

delta 26
icmZ3xhH32@rVZ*DldMHHTW8#1n!G_qWV3cQlQsa9TM6_4

diff --git a/B4A/Files/login.bal b/B4A/Files/login.bal
index c0c2e8cbdf0096af520166202b62f52e95a8b7e0..5d4338fd4686ea4dd402a9cc3e61b400c31b14ea 100644
GIT binary patch
delta 2131
zcma)6eN0nV6o0q$gIASGr3DML1=>>iYJnDk7Af_EG2Ik(x(}l;WjN3k@MEGlzQoNB
zP&^<;9f(mh2E)iRE=CiEZgWOvVxlAHAcE6HjYH!y3^QZry#{z?F54f!`+o1-bI!f@
zch9-6_K~M`WQvHQsFh-hlH%7=JEc{$I=d)0yS;sw5IwXC_LO?zgb*P^Ohx!2<cLxG
zG~|8=1wzT={yZLld^$pf2;}h~<iQ9vLc`<Qab8M=jQ>!fJRXKzhtMMoh;W1vF@wh=
zcs!EFqj)@;$76Wh#PN7{QZsKN7WwFj<B*Rkfv#>ltPox(wGceh9&fa<`c)lBn}5YI
zwMt=su)OP}aL$`|-feZ>JR=dwoXy?lo|;GZKAL&slht=2_4ca%o@!;vq3^4zayo|k
zE?p@J`fkbD=6TtczVaoP>-V)px^ksft9j-0oa+bnN?etpC0+@JmgSP9<oC<0_Zozg
z&b;Tl^m=La{bOENKX{xzq*q#GkJCnONL^>2pLRLb^n$Fq-+%JWT_a7Ky?*y|qfza3
z>rb!ETizZxaxK*yJd}{x${hZ--Map-7nYazC0!Y^yIb!3GGcf&z3|`;U)wg@txXT#
zaDLM_T)gx428kl#hwO%?1wZ~Ve17(GmnbGOQhhRB^dQGJcUf#^wrx^monUB&kL>V^
z&BY4!V88n6i$R5OdF?>>vWxFrD%*Idb>Y=(*SZJZ65k9jzPHGS5m3}=CPRE%6pZ>&
zi8Kx$t}4pms#1bKi`|q_Pktm3{7ivaV}@rADU+uOA+Sc#Lo&dmiG?hu6pED{M9w7n
zFCk<rQypLx2u`{EUFJ5BX-hy8)I;Q~I};Hs6p-H-lg26_WvqqdGTE94Le@h2%xTc1
zO+i)|WFa3zfod`Nnp-2)-~g?!mE^%JT^N``X=F*EPe?xdAHbFv+cR`N4s2acX1j;Z
zgRHP#IA^e-+cQjXLAMlkgzsVw>eYm}FfvN!@(5tv>PP|ZLjh{LffPb#xK&o*;p1XN
z#)pIyp;Htr2-3-lJf`zuYN7#W3sf0!F=AoN2AoBmDS9Ig>;u47Fhy^|firJL@+oWC
zf<rO%#s!eAP^eZ(S%0>d2?d=|N<8k~$O`E;G;m=hP#c{^w&NyLaNa5hhh8Z5!AZIV
znoTO%cBFhAGGnyRW|zZuhYqx6KNt+6VScoILO#ed1(H%Q=@sL-jJPrzt&NkyCWiwq
z#>|}%Maute7v=xl1*u@3nA!-b9Fwndf)guWC4|J){D0|oU<$W%RnR|26*49r`_OWA
zQ8i(a*!W+`POg;f78+Sns0MN@`K6zuAE)mZNOmFIx3zoJ%s$9_5cFOgsuALmp6<RH
zB!msy$C4;)ru|6hS{x1_#3P@b8wS==heJI=#P%B{9LqFX7tj?S4C|~WxSSM-*BThl
zZi6d=wMdc?G`j=tNC%OOU-3@-b1%W&R-0YQ#3WP@(ttWIk~MhxawU2QGLkcxvP35V
zZ@Ut{iuH%VBpqzE`=B1|B^*YFLAa2jgB3O!9;UGNjkY>+6jQp}<4fpphQV69Tz1rB
zfg@0(PlQhUOVY?`+?zrpV>K4f>LN{C%d*$boukPkv=Mw#OZWxW86OAxgS|nUL_=@1
zA5=K~U?ep(sszJ0Wt>Pnl{w~-5%WW)N==$!ouh`Ixj)$mQE4V}9M3cDzj7XbT~4m0
zo~G49_dF%O7n7hxD~AsMXc%zH!I<uYN3GGDAtu3_vCZC1$O&9&7AVu@vJ)QZ8acgB
Y!pigvrhcxIkd`sWme)9*LdV9x0W-bkpa1{>

delta 2144
zcma)6ZA?>V6uxgu3m2h<0tH%V`REr|pi~PL3)Cvkx=gp}bPzXinFHsX-!hO{0hK8V
z(o-e^TI%MU4!?3;%x0$9Ok@UiAw~_`+%%acW^p=o^J8jv?gix5VB(MG?bCD5``q`O
z^St+lhdgQ~;UbEn>|%-v#osY4;oXN$-X=r?-v}CAQVc~PA`wDF5JHBCLPR5CcwElo
zvB={P@dyQvE0HH45)mpMSMzw%Fqcrt!+)q0=oczoI*jNMX^0`7&f}wb+{oh@Jf6wp
zSv+n+K2%yZ@}ZK=!*Qq#I^xPA6s2wq!6@63b?!4$PuL@RVr*B_uDvcu(JnMj_Ens(
zuM75VS<v=D&+^5Lvhv8G8>brXlA7pT#oaPlto+l*j|;DvZoYKIG4;znQ+oOLp(k2L
z$(6ge3bYo}uLfVQ+auil-48Bdj_!-uqsEn#)XutmA!zj8;)t1ly0*_dAnaYG2)?J4
zd#e9=w`O<v&99dl7S*WY+fEo23x#K=#E4^7q`9}vwpAPc6P9$km%MUEx(WI+L*~tb
zL)~v|_1pe^a*Hf;pUYI`J~&Rh($A)p_WgX+*FEOtlfieJyyb7^OJAKRDo(f!dy7kd
zml&QT*7i<SHoRvNo$1Y4f4FR?<K8KWwEfP?s;g@C6IH|Ydv&$@rre5ZT-leIv}5uw
z=QMc_O1^raxgWI49o^I-pr~C;x%j+@DGs|HEO<nLFWCf&aYb-heGR-Z{bW9LC1-<i
zd?*~2A17vJdF%{A+L<5YECNB#K>B6#0a%k#10@Ol#LT8M^Advu<RV8q)JVHHk%I<1
zlxZ!b99kk%p-V#}I~J*iQ<~GHf{n$o#$dfoSKwkmgt0EC%b`zu2~WbNe24)qWqv?P
z1<XyeL%Mz@c^_I-QLwqdKo-DJy#@AYBxFA0*Xs!E*Nw*)%}w*bYW)U6;I%kCWEn!3
z{ptG&S;XyIY|NJ~dPcc6Plr#hBsjsCF+FoJKE<|C^b%ayJIcC|qL<>rg_j{&&PG<?
zvJ$3Q;z%Xf6^djwpS^r&(!mlck?^a0oKYA05ym*3Dk#t@a10`7&z?Z4xzi<C<DuC^
zlPXBcQbbk<Zl@?X=u|;cp$z_VXuz9Q{5-K$gQW(O8tBr;h$SdQ4`{9$Nt1jGmmFAq
zcF}Vb;T@9_^i~<~aH~fYaxrtv2MAg7wAX6_(*S!N#>OTf#Qt0NAzPk~r9{J{92))@
zYkTqb*P_Be`|Du3jn{tmd&)Ve4hg^grz6wgSgHj2EeA<G=h1yRG&0ts7jhQ3)?z+4
znsrFlBL*hlFcfCL#-AYQ4Y+JXi2eN+e``cS*ln9wV#MihMnX5?(u@%MS08@3g^je}
z;zo!#g9JTQ8uA!8wTW;kH;cfa7g8+jK{!iQAjw0}>>0S?0LgH1_4se-C4(*rWxUop
zLOg?`h=($pM(PRN#g2ot!nZaj^LL(uK$ukt(`-5LmQ{j%VIOYAhc`(Z*R3=8w6yIR
zfvfo*7-N$|bAgVugQ+ML`U_;zZ2?(r;MZHhTzDV$<ZED>orVkf66lSTL8bjP>Ey0G
zTL4#AXTa7Da80NQG^H6z<3pg(kw~@=l;%h=R^cYDPYxu3ecB$Nhw9K5r6N1f@J)fb
zNzghmmv~=9(>szTcQN0d)CzMP(fD}^2i;g1JdDkN8AUSK=a68be!U62))1z<Xd@v$
t-e6?V;FL*y0kR!j|98SqPA4Otg2TBpNe=!@5e`VhrGGX;`sbLw<A0|Z^qT+x

diff --git a/B4A/MARQUEZ.b4a b/B4A/MARQUEZ.b4a
index 0d33e5f..d511374 100644
--- a/B4A/MARQUEZ.b4a
+++ b/B4A/MARQUEZ.b4a
@@ -194,7 +194,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: Marquez
 	#VersionCode: 1
-	#VersionName: 4.06.30
+	#VersionName: 4.07.04
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
diff --git a/B4A/MARQUEZ.b4a.meta b/B4A/MARQUEZ.b4a.meta
index 054e3d7..c2ce0bc 100644
--- a/B4A/MARQUEZ.b4a.meta
+++ b/B4A/MARQUEZ.b4a.meta
@@ -88,6 +88,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Cliente,MODS,0,0,C_Cliente,B_GUARDA_C_Click,1431,0,C_Cliente,Guardar_Click,630,0,Diseñador Visual,productos.bal,-100,2,C_Productos,lv_promos_ItemLongClick,891,0,C_Productos,Busca_TextChanged,1160,0,C_Productos,clv_prods_ll_VisibleRangeChanged,1139,0,Subs,restaFijosPromo,1010,0,B4XMainPage,b_terpc_Click,1048,0,B4XMainPage,JobDone,520,5
+NavigationStack=Diseñador Visual,clientes.bal,-100,2,Starter,ENVIA_ULTIMA_GPS,90,0,C_Cliente,GuardaVenta,749,0,C_Cliente,b_acred_Click,675,1,C_Cliente,Guardar_Click,659,5,C_Principal,cargar_Click,1069,0,C_Principal,B4XPage_Created,242,1,C_Principal,B4XPage_Appear,406,2,C_Principal,Subir_Click,822,4,C_Principal,JobDone,1261,1
 SelectedBuild=0
-VisibleModules=4,1,2,7,8,9,10,14,13,28,5
+VisibleModules=1,2,13,4,7,8,9,10,14,28,5,27
diff --git a/B4A/Subs.bas b/B4A/Subs.bas
index f1e5f27..42d2b9f 100644
--- a/B4A/Subs.bas
+++ b/B4A/Subs.bas
@@ -1406,7 +1406,7 @@ End Sub
 
 Sub traeTablaProds(tipoventa As String) As String
 	Private tablaProds As String = "cat_gunaprod2"
-	If tipoventa = "ABORDO" Or tipoventa = "PREVENTA" Then tablaProds = "cat_gunaprod"
+	If tipoventa = "ABORDO" Or tipoventa = "PREVENTA" Or tipoventa = "RECARGA" Then tablaProds = "cat_gunaprod"
 '	LogColor($"Tipo= ${tipoventa}, tabla=${tablaProds}"$, Colors.RGB(200,136,0))
 	Return tablaProds
 End Sub
@@ -1418,7 +1418,7 @@ Sub pedidoGuardado As Boolean
 	Private g As Cursor = B4XPages.MainPage.skmt.ExecQuery("select gestion from kmt_info where CAT_CL_CODIGO in (Select CUENTA from cuentaa)")
 	If g.RowCount > 0 Then
 		g.Position=0
-		If g.GetString("gestion") = "2" or g.GetString("gestion") = "3" Then guardado = True
+		If g.GetString("gestion") = "2" Or g.GetString("gestion") = "3" Then guardado = True
 	End If
 '	Log($"Guardado=${guardado}"$)
 	Return guardado