Version final, se agrega modulo para pagares y correcciones menores

2026-04-17 21:06:15 +00:00 · 2024-05-21 14:00:36 -06:00
parent 1651960f88
commit 556f986084
12 changed files with 179 additions and 55 deletions
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -174,6 +174,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS ABONOS (a_usuario TEXT, a_ruta TEXT, a_cliente TEXT, a_abono TEXT, a_fecha TEXT, a_enviado TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS COORDENADAS_GPS (tienda_id TEXT, ruta TEXT, almacen TEXT, latitud TEXT, longitud TEXT, fecha TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_CUESTIONARIO (HC_CLIENTE TEXT)")
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS PAGARES (PA_ALMACEN TEXT, PA_RUTA TEXT, PA_FECHA TEXT, PA_CAPTURA TEXT, PA_MONTO TEXT, PA_USUARIO TEXT, PA_CLIENTE TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS NOVENTA (NV_CLIENTE TEXT, NV_FECHA TEXT, NV_USER TEXT, NV_MOTIVO TEXT, NV_COMM TEXT, NV_LAT TEXT, NV_LON TEXT)")
 	Subs.agregaColumna("PEDIDO", "PE_ENVIO_OK", "INT")
 	Subs.agregaColumna("NOVENTA", "NV_ENVIO_OK", "INT")
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -95,6 +95,8 @@ Sub Class_Globals
 	Private B_IMP As Button
 	Dim Toggla As Toggle
 	Dim tgl As Toggle
+	Dim pre_act As Float 
+	 
 	Private Panel1 As Panel
 	Private I_COMPRA As EditText
 	Private B_GUARDA_C As Button
@@ -394,6 +396,7 @@ Sub B4XPage_Appear
 	End If
 	
 	
+	pre_act = Subs.traeTotalClientepreventaparacredito
 	
 End Sub

@@ -482,27 +485,35 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 '	BACK key pressed
 '	Return True To close, False To cancel
 '	Log($"venimosDeTicketsDia=${venimosDeTicketsDia}"$)
-	If la_cuenta.Text <> "0" Then
-	cuest.encuestaIniciada = False
-	cuest.ocultPanelPregunta
-	If IsNumber(l_total.text) And Not(Subs.pedidoGuardado) Then
-		LogColor("Hay Venta", Colors.Red)
-		Private resultado1 As Int = Msgbox2($"Va salir sin haber guardado la venta, si continua, la venta se BORRARA.${CRLF}${CRLF}¿Esta seguro que desea continuar?"$, "SE VA A BORRAR LA VENTA", "Borrar Venta", "Guardar Venta", "", LoadBitmap(File.DirAssets,"alert2.png"))
-		If resultado1 = DialogResponse.POSITIVE Then
-			Log("Borrra venta")
-			Subs.borraPedidoClienteActual
-			ToastMessageShow("Venta Borrada", False)
+	If Starter.pre_viejo = pre_act Then
+		Log(Starter.pre_viejo)
+		Log(pre_act)
+		
+	
+		If la_cuenta.Text <> "0" Then
+			cuest.encuestaIniciada = False
+			cuest.ocultPanelPregunta
+			If IsNumber(l_total.text) And Not(Subs.pedidoGuardado) Then
+				LogColor("Hay Venta", Colors.Red)
+				Private resultado1 As Int = Msgbox2($"Va salir sin haber guardado la venta, si continua, la venta se BORRARA.${CRLF}${CRLF}¿Esta seguro que desea continuar?"$, "SE VA A BORRAR LA VENTA", "Borrar Venta", "Guardar Venta", "", LoadBitmap(File.DirAssets,"alert2.png"))
+				If resultado1 = DialogResponse.POSITIVE Then
+					Log("Borrra venta")
+					Subs.borraPedidoClienteActual
+					ToastMessageShow("Venta Borrada", False)
 '			venimosDeTicketsDia = False
-			B4XPages.ShowPage("Principal")
-		else if resultado1=DialogResponse.CANCEL Then
-			Log("Pedido guardado")
-			Guardar_Click
-			ToastMessageShow("Venta Guardada", False)
-		End If
-	End If
+					B4XPages.ShowPage("Principal")
+				else if resultado1=DialogResponse.CANCEL Then
+					Log("Pedido guardado")
+					Guardar_Click
+					ToastMessageShow("Venta Guardada", False)
+				End If
+			End If
 '	venimosDeTicketsDia = False
-	B4XPages.ShowPage("Clientes")
+			B4XPages.ShowPage("Clientes")
+		Else
+		End If
 	Else
+		
 	End If
 '	Return True
 	Return False
@@ -521,25 +532,111 @@ Sub DATOS_Click
 End Sub

 Sub Guardar_Click	
-	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)")
-		Credi.Position = 0
-		If Credi.GetString("CAT_CL_BCREDITO") = "1" Then
-			Msgbox2Async("La venta es a credito?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False)
-			Wait For Msgbox_Result (resultado As Int)
-			If resultado = DialogResponse.POSITIVE Then
-				p_credito.Visible = True
+	
+	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)")
+			If Credi.RowCount > 0 Then
+				Credi.Position = 0
+				If Credi.GetString("CAT_CL_BCREDITO") = "1" Then
+					
+					
+					
+					If pre_act <> Starter.pre_viejo Then
+						
+						
+						Msgbox2Async("La venta es a credito?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False)
+						Wait For Msgbox_Result (resultado As Int)
+						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.Position = 0
+							l_limite.Text = "Limite de credito: $" & limitcred.GetString("CAT_CL_LIMITECREDITO")
+							If Subs.traeTotalClientepreventaparacredito >=  limitcred.GetString("CAT_CL_LIMITECREDITO") Then
+								et_montoacredito.Text = limitcred.GetString("CAT_CL_LIMITECREDITO")
+							Else
+								et_montoacredito.Text = Subs.traeTotalClientepreventaparacredito
+							End If
+							limitcred.Close
+						End If
+					
+					Else If pre_act = Starter.pre_viejo Then
+						GuardaVenta
+					End If
+					
+					
+				Else If Credi.GetString("CAT_CL_BCREDITO") = "0" Then
+					GuardaVenta
+				End If
+			Else
+				GuardaVenta
+				ToastMessageShow("HOLA",True)
 			End If
-		Else If Credi.GetString("CAT_CL_BCREDITO") = "0" Then
-			
-		End If
-	Else
-'		GuardaVenta
+		Else If la_cuenta.Text = 0 Then
+			GuardaVenta
+		End If	
+	Else If c.GetString("CUANTOS") = 0 Then
+		GuardaVenta
 	End If
-	
-	
-	
+End Sub

+Private Sub b_acred_Click
+	c2=B4XPages.MainPage.skmt.ExecQuery("select USUARIO from usuarioa")
+	c2.Position=0
+	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.Position = 0
+	l_limite.Text = "Limite de credito: $" & limitcred.GetString("CAT_CL_LIMITECREDITO")
+	If Subs.traeTotalClientepreventaparacredito >=  limitcred.GetString("CAT_CL_LIMITECREDITO") Then
+							
+		If et_montoacredito.Text > limitcred.GetString("CAT_CL_LIMITECREDITO") Then
+			MsgboxAsync("El monto del pagare no puede ser mayor al limite del credito","Atención")
+			et_montoacredito.Text = limitcred.GetString("CAT_CL_LIMITECREDITO")
+		Else
+			c = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) As REGISTRADO FROM PAGARES WHERE PA_CLIENTE IN (SELECT CUENTA FROM CUENTAA)")
+			c.Position = 0
+			If c.GetString("REGISTRADO") = 0 Then
+				MsgboxAsync("SI ENTRAMOS 3","Atención")
+				B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO PAGARES (PA_ALMACEN, PA_RUTA, PA_FECHA, PA_CAPTURA, PA_MONTO, PA_USUARIO, PA_CLIENTE) VALUES(?,?,?,?,?,?,?) ", Array As Object (ALMACEN, LA_RUTA, (sDate &" "& sTime),(sDate &" "& sTime), et_montoacredito.Text, usuario, la_cuenta.Text))
+				GuardaVenta
+				p_credito.Visible = False
+			Else
+				MsgboxAsync("SI ENTRAMOS4","Atención")
+				B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE PAGARES set PA_FECHA = ?, PA_CAPTURA = ?, PA_MONTO = ? where PA_CLIENTE In (select cuenta from cuentaa)", Array As Object ((sDate &" "& sTime),(sDate &" "& sTime), et_montoacredito.Text))
+				GuardaVenta
+				p_credito.Visible = False
+			End If
+		End If
+	Else If Subs.traeTotalClientepreventaparacredito <  limitcred.GetString("CAT_CL_LIMITECREDITO") Then
+		If et_montoacredito.Text > Subs.traeTotalClientepreventaparacredito Then
+			MsgboxAsync("El monto del pagare no puede ser mayor a la preventa registrada","Atención")
+			et_montoacredito.Text = Subs.traeTotalClientepreventaparacredito
+		Else
+			c = B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) As REGISTRADO FROM PAGARES WHERE PA_CLIENTE IN (SELECT CUENTA FROM CUENTAA)")
+			c.Position = 0
+			If c.GetString("REGISTRADO") = 0 Then
+				MsgboxAsync("SI ENTRAMOS","Atención")
+				B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO PAGARES (PA_ALMACEN, PA_RUTA, PA_FECHA, PA_CAPTURA, PA_MONTO, PA_USUARIO, PA_CLIENTE) VALUES(?,?,?,?,?,?,?) ", Array As Object (ALMACEN, LA_RUTA, (sDate &" "& sTime),(sDate &" "& sTime), et_montoacredito.Text, usuario, la_cuenta.Text))
+				GuardaVenta
+				p_credito.Visible = False
+			Else
+				MsgboxAsync("SI ENTRAMOS 2","Atención")
+				B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE PAGARES set PA_FECHA = ?, PA_CAPTURA = ?, PA_MONTO = ? where PA_CLIENTE In (select cuenta from cuentaa)", Array As Object ((sDate &" "& sTime),(sDate &" "& sTime), et_montoacredito.Text))
+				GuardaVenta
+				p_credito.Visible = False
+			End If
+		End If
+	End If
+	limitcred.Close
+End Sub
+
+Private Sub b_cancred_Click
+	p_credito.Visible = False
 End Sub

 Sub GuardaVenta
@@ -1372,12 +1469,4 @@ Private Sub b_ventaabordo_Click
 	
 	End If

-End Sub
-
-Private Sub b_acred_Click
-	
-End Sub
-
-Private Sub b_cancred_Click
-	
 End Sub
--- a/B4A/C_Clientes.bas
+++ b/B4A/C_Clientes.bas
@@ -37,6 +37,7 @@ Sub Class_Globals
 	Private b_buscar As Button
 	Private CHECK As Int
 	Private l_baseodia As Label
+	
 End Sub

 'You can add more parameters here.
@@ -106,6 +107,7 @@ Sub B4XPage_Appear
 	End If
 	c.Close
 	entro = "4"
+	
 End Sub

 Sub CreateListItem(mostrar As String, mostrar1 As String, mostrar2 As String) As Panel
@@ -154,7 +156,7 @@ Sub ListView1_ItemClick (Position As Int, value As Object)
 		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(value))
 		DateTime.TimeFormat = "HHmmss"
 		STIME=DateTime.Time(DateTime.Now)
-		
+		Starter.pre_viejo = Subs.traeTotalClientepreventaparacredito
 		s=B4XPages.MainPage.skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM HIST_STAY_STORE WHERE HSS_IN = ? AND HSS_CODIGO In (select cuenta from cuentaa)", Array As String("0"))
 		s.Position = 0
 		If s.GetString("CUANTOS") = 1 Then
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -269,7 +269,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 ")
+		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 ")
 		b=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CUANTOS from noventa")
 		'where pc_fecha = ?", Array As String(fecha)
 		c.Position=0
@@ -409,9 +409,9 @@ Sub B4XPage_Appear
 '	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")
+	e=B4XPages.MainPage.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info WHERE CAT_CL_CODIGO <>0")
 	e.Position=0
-	f=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info")
+	f=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info WHERE CAT_CL_CODIGO <>0")
 	f.Position=0
 	l_ruta.Text = f.GetString("CAT_CL_RUTA")
 	f.Close
@@ -441,7 +441,7 @@ Sub B4XPage_Appear
 		l_cuantosn.Text = b.GetString("CUANTOS")
 		b.close
 	Else
-		c=B4XPages.MainPage.skmt.ExecQuery("select  SUM(PE_COSTO_TOT) as MONTO_DIA, COUNT(DISTINCT(PE_CLIENTE)) AS CLIENTES_DIA  from PEDIDO ")
+		c=B4XPages.MainPage.skmt.ExecQuery("select  SUM(PE_COSTO_TOT) as MONTO_DIA, COUNT(DISTINCT(PE_CLIENTE)) AS CLIENTES_DIA  from PEDIDO WHERE PE_CLIENTE <> 0")
 		b=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CUANTOS from noventa")
 		c.Position=0
 		b.Position=0
@@ -622,6 +622,20 @@ Sub Subir_Click
 			Next
 		End If
 		c.Close
+		
+		'Envio de Pagares
+		c=B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM PAGARES")
+		If c.RowCount>0 Then
+			For i=0 To c.RowCount -1
+				c.Position=i
+				Dim cmd As DBCommand
+				cmd.Initialize
+				cmd.Name = "insert_pagares_MARQUEZ"
+				cmd.Parameters = Array As Object(C.GetString("PA_ALMACEN"),C.GetString("PA_RUTA"),C.GetString("PA_FECHA"),C.GetString("PA_CAPTURA"),C.GetString("PA_MONTO"),C.GetString("PA_USUARIO"),C.GetString("PA_CLIENTE") )
+				reqManager.ExecuteCommand(cmd , "ins_pagares")
+			Next
+		End If
+		c.Close

 '		c=B4XPages.MainPage.skmt.ExecQuery("SELECT  HE_CLIE, HE_RES, HE_FECHA, HE_TIPO FROM HIST_ENCUESTA")
 '		If c.RowCount>0 Then
@@ -1977,6 +1991,7 @@ Sub e_ruta_EnterPressed
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from CLIENTE_NUEVO")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido")
+			B4XPages.MainPage.skmt.ExecNonQuery("delete from PAGARES")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from noventa")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from clie_act")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info")
--- a/B4A/C_TicketsDia.bas
+++ b/B4A/C_TicketsDia.bas
@@ -101,6 +101,7 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object)
 	B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(Value))
 	DateTime.TimeFormat = "HHmmss"
 	STIME=DateTime.Time(DateTime.Now)
+	Starter.pre_viejo = Subs.traeTotalClientepreventaparacredito
 	s=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) AS CUANTOS FROM HIST_STAY_STORE WHERE HSS_IN = 0 AND HSS_CODIGO In (select cuenta from cuentaa)")
 	s.Position = 0
 	If s.GetString("CUANTOS") = 1 Then
--- a/B4A/Files/cliente.bal
+++ b/B4A/Files/cliente.bal
--- a/B4A/Files/login.bal
+++ b/B4A/Files/login.bal
--- a/B4A/MAPA_RUTAS.bas
+++ b/B4A/MAPA_RUTAS.bas
@@ -156,7 +156,7 @@ Sub MapFragment1_Ready
 	'''''''----------------------------MARKER AZUL - POR VISITAR
 	If azul = 1 Or todos = 1  Then
 		c.IsInitialized
-		c=skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_NOMBRE,CAT_CL_LAT,CAT_CL_LONG from kmt_info where gestion = 0 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 and CAT_CL_LAT <> ' ' and CAT_CL_LONG <> ' ' ")
+		c=skmt.ExecQuery("select CAT_CL_CODIGO,CAT_CL_NOMBRE,CAT_CL_LAT,CAT_CL_LONG from kmt_info where gestion = 0 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 and CAT_CL_LAT <> ' ' and CAT_CL_LONG <> ' ' and CAT_CL_CODIGO <> 0 ")
 '		skmt.Initialize(ruta,"kmt.db", True)
 		Log($"============== Resultados = ${c.RowCount}"$)
 		If c.RowCount > 0 Then
@@ -182,7 +182,7 @@ Sub MapFragment1_Ready
 	'''''''----------------------------MARKER VERDE - VENTA
 	If verde = 1 Or todos = 1  Then
 		c2.IsInitialized
-		c2=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info where gestion = 2 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0")
+		c2=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info where gestion = 2 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0  and CAT_CL_CODIGO <> 0 ")
 		Log($"============== Resultados = ${c2.RowCount}"$)
 		For i = 0 To c2.RowCount -1
 			c2.Position = i
@@ -199,7 +199,7 @@ Sub MapFragment1_Ready
 	Else
 		If verde = 1 Or todos = 1  Then
 			c2.IsInitialized
-			c2=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info where gestion = 2 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0")
+			c2=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info where gestion = 2 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0  and CAT_CL_CODIGO <> 0 ")
 			Log($"============== Resultados = ${c2.RowCount}"$)
 			For i = 0 To c2.RowCount -1
 				c2.Position = i
@@ -219,7 +219,7 @@ Sub MapFragment1_Ready
 	
 	If rojo = 1 Or todos = 1 Then
 		c3.IsInitialized
-		c3=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info where gestion = 3 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0")
+		c3=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info where gestion = 3 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0  and CAT_CL_CODIGO <> 0 ")
 		Log($"============== Resultados = ${c3.RowCount}"$)
 		For i = 0 To c3.RowCount -1
 			c3.Position = i
@@ -234,7 +234,7 @@ Sub MapFragment1_Ready
 	Else
 		If rojo = 1 Or  todos = 1  Then
 			c3.IsInitialized
-			c3=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info where gestion = 3 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0")
+			c3=skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE,CAT_CL_LONG,CAT_CL_LAT from kmt_info where gestion = 3 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0  and CAT_CL_CODIGO <> 0 ")
 			Log($"============== Resultados = ${c3.RowCount}"$)
 			For i = 0 To c3.RowCount -1
 				c3.Position = i
@@ -274,6 +274,7 @@ Sub OnInfoWindowClickListener1_click(Marker1 As Marker)
 	skmt.ExecNonQuery("delete from CUENTAA")
 	skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?) ", Array As Object(Marker1.Title))
 	Activity.Finish
+	Starter.pre_viejo = Subs.traeTotalClientepreventaparacredito
 	B4XPages.ShowPage("Cliente")
 End Sub

--- a/B4A/MARQUEZ.b4a
+++ b/B4A/MARQUEZ.b4a
@@ -189,7 +189,7 @@ Version=12.5
 #Region  Project Attributes 
 	#ApplicationLabel: Marquez
 	#VersionCode: 1
-	#VersionName: 4.05.15
+	#VersionName: 4.05.19
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
--- a/B4A/MARQUEZ.b4a.meta
+++ b/B4A/MARQUEZ.b4a.meta
@@ -85,6 +85,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Principal,JobDone,1841,3,C_Cliente,mandaPendientes,896,1,C_Cliente,GuardaVenta,519,0,Diseñador Visual,login.bal,-100,4,C_Cliente,b_cancred_Click,1373,0,C_Cliente,Class_Globals,154,0,C_Cliente,Guardar_Click,523,6,C_Cliente,B4XPage_Created,224,0,Diseñador Visual,cliente.bal,-100,6,C_Cliente,B4XPage_Appear,244,1,B4XMainPage,B4XPage_Created,174,0
+NavigationStack=C_Principal,Subir_Click,628,6,C_Cliente,mandaPendientes,1022,0,Diseñador Visual,cliente.bal,-100,1,Diseñador Visual,login.bal,-100,1,C_Mapas,Class_Globals,0,0,MAPA_RUTAS,MapFragment1_Ready,231,1,MAPA_RUTAS,OnInfoWindowClickListener1_click,270,1,Starter,Timer1_Tick,61,0,Starter,ENVIA_ULTIMA_GPS,87,0,C_Principal,B4XPage_Appear,425,4
 SelectedBuild=0
-VisibleModules=1,2,3,4,5,6,7,8,9,10,17,14,13,26,20,27
+VisibleModules=1,2,3,4,5,6,7,8,9,10,13,20,27,26,18,23
--- a/B4A/Starter.bas
+++ b/B4A/Starter.bas
@@ -34,6 +34,7 @@ Sub Process_Globals
 	Dim logger As Boolean = False
 	Dim marcaCel As String = ph.manufacturer
 	Dim tabla As String
+	Dim pre_viejo As Float
 End Sub

 Sub Service_Create
--- a/B4A/Subs.bas
+++ b/B4A/Subs.bas
@@ -847,6 +847,20 @@ Sub traeTotalClientepreventa As Double
 	Return sumaTotal
 End Sub

+Sub traeTotalClientepreventaparacredito As Double
+	Private sumaTotal As Double
+	Private cursorprueba As Cursor = B4XPages.MainPage.skmt.ExecQuery2("Select  PE_COSTO_TOT from pedido where PE_FOLIO = ? AND PE_CLIENTE <> 0 AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)", Array As String ("PREVENTA"))
+	For i= 0 To cursorprueba.RowCount -1
+		cursorprueba.Position = i
+'		LogColor(cursorprueba.GetString("PE_COSTO_TOT"),Colors.Red)
+		sumaTotal =  sumaTotal +  cursorprueba.GetString("PE_COSTO_TOT")
+		sumaTotal = NumberFormat2(sumaTotal, 0, 2, 2, False)
+'		Log(NumberFormat2(sumaTotal, 0, 2, 2, False))
+	Next
+	cursorprueba.Close
+	Return sumaTotal
+End Sub
+
 Sub traeTotalClienteventa As Double
 	Private sumaTotal As Double
 	Private cursorprueba As Cursor = B4XPages.MainPage.skmt.ExecQuery2("Select  PE_COSTO_TOT from pedido where PE_FOLIO = ? AND PE_CLIENTE <> 0", Array As String ("VENTA"))