6.03.16

se agrega en la descarga el usuario para que si hay duplicados si los tome el movil

.gitattributes

@@ -0,0 +1,16 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# linguist-language
+*.b4a linguist-language=B4X
+*.b4i linguist-language=B4X
+*.b4j linguist-language=B4X
+*.b4r linguist-language=B4X
+*.bas linguist-language=B4X
+
+# linguist-detectable
+*.b4a linguist-detectable=true
+*.b4i linguist-detectable=true
+*.b4j linguist-detectable=true
+*.b4r linguist-detectable=true
+*.bas linguist-detectable=true

.gitignore

@@ -0,0 +1,2 @@
+**/Objects
+**/AutoBackups

B4A/B4XMainPage.bas

@@ -205,6 +205,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.agregaColumna("RECHAZOS", "R_PRECIO", "TEXT")
 	Subs.agregaColumna("VENTAS", "V_PRECIO", "TEXT")
 	Subs.agregaColumna("HIST_VENTAS","PLACA","TEXT")
+	Subs.agregaColumna("HIST_VENTAS","HVD_USUARIO","TEXT")
 	Subs.agregaColumna("HIST_VENTAS","HVD_BCREDITO","TEXT")
 	Subs.agregaColumna("HIST_VENTAS","HVD_RECHAZOCANT","TEXT")
 	Subs.agregaColumna("HIST_VENTAS","CONSECUTIVO","TEXT")

B4A/C_Cliente.bas

@@ -103,6 +103,7 @@ Sub Class_Globals
 	Dim tipo_abonox As String
 	Private b_cancel_pagare As Button
 	Dim NOTA As String
+	Private B_IMP2 As Button
 End Sub
 
 'You can add more parameters here.
@@ -413,6 +414,20 @@ Sub B4XPage_Appear
 		End If
 	
 
+
+	If (Subs.traeCliente = "63403" OR Subs.traeCliente = "100000") Then
+		gest.Visible = False
+		b_noEntrega.Visible = False
+		Tar.Visible = True
+		NUEVO.Visible = False
+		B_IMP2.Visible = False
+	Else
+		Tar.Visible = True
+		gest.Visible = True
+		b_noEntrega.Visible = True
+		NUEVO.Visible = True
+		B_IMP2.Visible = True
+	End If
 End Sub
 
 Sub Activity_Pause (UserClosed As Boolean)
@@ -466,8 +481,16 @@ Sub gest_Click
 			If u.GetString("SALDO_PENDIENTE") <> 0 Then
 				If y.RowCount > 0 Then
 					If u.GetString("SALDO_PENDIENTE") = y.GetString("a_abono") Then
-						B_IMP_Click
-						banderaimp = 1
+						
+						Dim cobra As Cursor = Starter.skmt.ExecQuery("SELECT * FROM HIST_VENTAS WHERE HVD_CLIENTE IN (SELECT CUENTA FROM CUENTAA)")
+						cobra.Position = 0
+						If cobra.RowCount = 1 And cobra.GetString("HVD_PRONOMBRE") = "Cobranza Pendiente" Then
+							Guardado
+						Else	
+							B_IMP_Click
+							banderaimp = 1
+						End If
+						
 					Else
 						MsgboxAsync("Para poder hacer una entrega se necesita liquidar el(los) pagare(s)","Atención")
 					End If
@@ -555,7 +578,10 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 		et_montoacredito.Text = ""
 		p_credito.Visible = False
 		Return False
-	Else If la_cuenta.Text = "63403" Then
+	Else if p_abono.Visible Then
+		p_abono.Visible = False
+		Return False
+	Else If (la_cuenta.Text = "63403" Or la_cuenta.Text = "100000") Then
 		B4XPages.ShowPage("Principal")
 		Return False
 	Else

B4A/C_DetalleVenta.bas

@@ -83,7 +83,7 @@ Sub B4XPage_Appear
 	Existe = C.GetString("EXISTE")
 	C.Close
 '	c=Starter.skmt.ExecQuery("select distinct hist_ventas.hvd_num_registro, HIST_VENTAS.HVD_CLIENTE, HIST_VENTAS.HVD_PRONOMBRE, HIST_VENTAS.HVD_PROID, HIST_VENTAS.HVD_CANT, HIST_VENTAS2.HVD_CANT as HVD_CANT2, HIST_VENTAS.HVD_COSTO_TOT, HIST_VENTAS.HVD_CODPROMO from HIST_VENTAS inner join HIST_VENTAS2 on HIST_VENTAS.HVD_PROID = HIST_VENTAS2.HVD_PROID and HIST_VENTAS.HVD_CLIENTE = HIST_VENTAS2.HVD_CLIENTE WHERE HIST_VENTAS.HVD_CLIENTE IN (Select CUENTA from cuentaa) and HIST_VENTAS.HVD_RECHAZO = 0 order by HIST_VENTAS.HVD_CODPROMO desc, HIST_VENTAS.HVD_PRONOMBRE asc")
-	c=Starter.skmt.ExecQuery("select hvd_num_registro,CONSECUTIVO, HVD_CLIENTE, HVD_PRONOMBRE, HVD_PROID, HVD_CANT, HVD_COSTO_TOT, HVD_CODPROMO, BCAJAS, CANTC, IFNULL(HVD_RECHAZOCANT,0) AS HVD_RECHAZOCANT from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) and hvd_rechazo <> 2 and hvd_cant > 0 order by HVD_CODPROMO desc, HVD_PRONOMBRE asc")
+	c=Starter.skmt.ExecQuery("select hvd_num_registro,CONSECUTIVO, HVD_CLIENTE, HVD_PRONOMBRE, HVD_PROID, HVD_CANT, HVD_COSTO_TOT, HVD_CODPROMO, BCAJAS, CANTC, IFNULL(HVD_RECHAZOCANT,0) AS HVD_RECHAZOCANT from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) and hvd_rechazo <> 2 and hvd_cant > 0 and HVD_PRONOMBRE <> 'Cobranza Pendiente' order by HVD_CODPROMO desc, HVD_PRONOMBRE asc")
 	ListView1.Clear
 	clv_pedido.Clear
 	Subs.SetDivider(ListView1, Colors.LightGray, 2)
@@ -190,7 +190,7 @@ Sub B4XPage_Appear
 	End If
 	
 	
-	Private vc As Cursor = Starter.skmt.ExecQuery($"select HVD_PROID, HVD_CANT,HVD_COSTO_TOT, IFNULL(HVD_RECHAZOCANT, 0) AS HVD_RECHAZOCANT from HIST_VENTAS where BCAJAS = 0 and HVD_CODPROMO ='${Subs.traealmacen}' and HVD_CLIENTE in (select cuenta from cuentaa)"$)
+	Private vc As Cursor = Starter.skmt.ExecQuery($"select HVD_PROID, HVD_CANT,HVD_COSTO_TOT, IFNULL(HVD_RECHAZOCANT, 0) AS HVD_RECHAZOCANT from HIST_VENTAS where BCAJAS = 0 and HVD_CODPROMO ='${Subs.traealmacen}' and HVD_CLIENTE in (select cuenta from cuentaa) and HVD_PRONOMBRE <> 'Cobranza Pendiente'"$)
 	
 	Private Cuenta As String = 0
 	Private arti As String = 0
@@ -217,7 +217,7 @@ Sub B4XPage_Appear
 	End If
 '	Log(Cuenta)
 	
-	Private vc2 As Cursor = Starter.skmt.ExecQuery("select HVD_PROID, HVD_CANT, IFNULL(HVD_RECHAZOCANT, 0) AS HVD_RECHAZOCANT, CANTC,HVD_COSTO_TOT from HIST_VENTAS where HVD_CLIENTE in (select cuenta from cuentaa) AND BCAJAS = 1")
+	Private vc2 As Cursor = Starter.skmt.ExecQuery("select HVD_PROID, HVD_CANT, IFNULL(HVD_RECHAZOCANT, 0) AS HVD_RECHAZOCANT, CANTC,HVD_COSTO_TOT from HIST_VENTAS where HVD_CLIENTE in (select cuenta from cuentaa) AND BCAJAS = 1 AND HVD_PRONOMBRE <> 'Cobranza Pendiente'")
 	Private Cuenta1 As String = 0
 	Private arti1 As String = 0
 	If vc2.RowCount > 0 Then
@@ -234,7 +234,7 @@ Sub B4XPage_Appear
 	End If
 '	Log(Cuenta1)
 	
-	Private vc4 As Cursor = Starter.skmt.ExecQuery($"select HVD_PROID, HVD_CANT, IFNULL(HVD_RECHAZOCANT, 0) AS HVD_RECHAZOCANT, CANTC,HVD_COSTO_TOT, HVD_RECHAZO, HVD_CODPROMO from HIST_VENTAS where HVD_CLIENTE in (select cuenta from cuentaa) AND BCAJAS = 0 and HVD_CODPROMO <> '${Subs.traeAlmacen}'"$)
+	Private vc4 As Cursor = Starter.skmt.ExecQuery($"select HVD_PROID, HVD_CANT, IFNULL(HVD_RECHAZOCANT, 0) AS HVD_RECHAZOCANT, CANTC,HVD_COSTO_TOT, HVD_RECHAZO, HVD_CODPROMO from HIST_VENTAS where HVD_CLIENTE in (select cuenta from cuentaa) AND BCAJAS = 0 and HVD_CODPROMO <> '${Subs.traeAlmacen}' AND HVD_PRONOMBRE <> 'Cobranza Pendiente'"$)
 	Private Cuenta2 As String = 0
 	Private arti2 As String = 0
 	If vc4.RowCount > 0 Then

B4A/C_Principal.bas

@@ -84,7 +84,7 @@ Sub Class_Globals
 	Private p_principal As Panel
 	Dim ime As IME
 	Private b_tabulador As Button
-	
+	Dim paso1 As String
 	Private l_rutasP As Label
 	Private l_rechazo As Label
 	Private Label9 As Label
@@ -135,6 +135,15 @@ Sub Class_Globals
 	Private ET_PICK_CIEGO As EditText
 	Private P_PICK_CIEGO As Panel
 	Private L_CANT_PCIK As Label
+	Private l_pagarescobrados As Label
+	Private l_pagaresnuevos As Label
+	Private l_montoaliquidar As Label
+	Private Label21 As Label
+	Private b_comodin As Button
+	Private p_validacion As Panel
+	Private b_cancelarcodigo As Button
+	Private b_aceptar As Button
+	Private et_codigo As EditText
 End Sub
 
 'You can add more parameters here.
@@ -164,7 +173,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	e=Starter.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info WHERE CAT_CL_RUTA <> 1000")
 	e.Position=0
 	If Cuantos = 0 Then
-		l_aLiquidar.Text = 0
+'		l_aLiquidar.Text = 0
 		l_cuantosc.Text = 0
 		l_cuantosn.Text = 0
 		drop = 0
@@ -280,10 +289,10 @@ Sub B4XPage_Appear
 	b=Starter.skmt.ExecQuery("Select count(*) as CUANTOS from kmt_info")
 	b.Position=0
 	If b.RowCount > 0 Then Cuantos = b.GetString("CUANTOS")
-	d=Starter.skmt.ExecQuery("select count(*) as TOTAL_VISITAR from kmt_info where gestion = 0 AND CAT_CL_RUTA <> 1000")
+	d=Starter.skmt.ExecQuery("select count(distinct(CAT_CL_CODIGO)) as TOTAL_VISITAR from kmt_info where gestion = 0 AND CAT_CL_RUTA <> 1000")
 	D.Position=0
 	b.Close
-	e=Starter.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info WHERE CAT_CL_RUTA <> 1000")
+	e=Starter.skmt.ExecQuery("select count(distinct(CAT_CL_CODIGO)) as POR_VISITAR from kmt_info WHERE CAT_CL_RUTA <> 1000")
 	e.Position=0
 '	f=Starter.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info")
 '	f.Position=0
@@ -300,7 +309,7 @@ Sub B4XPage_Appear
 	connecta.Visible = True
 
 	If Cuantos = 0 Then
-		l_aLiquidar.Text = 0
+'		l_aLiquidar.Text = 0
 		l_cuantosc.Text = 0
 		l_cuantosn.Text = 0
 		drop = 0
@@ -320,9 +329,9 @@ Sub B4XPage_Appear
 		f1=Starter.skmt.ExecQuery("select sum(hvd_costo_tot) as MONTO_TOTAL_DIA from hist_ventas2 where hvd_cliente in (select cat_cl_codigo from kmt_info ) AND HVD_RECHAZO = 0")
 		f2=Starter.skmt.ExecQuery("select sum(REP_COSTO_TOT) as MONTO_REC_DIA FROM REPARTO where REP_cliente in (Select cat_cl_codigo from kmt_info)")
 '		b=Starter.skmt.ExecQuery("select count(*) as CUANTOS from noventa where nv_cliente in (select cat_cl_codigo from kmt_info where gestion = 3)")
-		b=Starter.skmt.ExecQuery("select count(DISTINCT NV_CLIENTE) as CUANTOS from noventa where nv_motivo <> 'ENTREGA' and NV_CLIENTE <> 63403")
+		b=Starter.skmt.ExecQuery("select count(DISTINCT NV_CLIENTE) as CUANTOS from noventa where nv_motivo <> 'ENTREGA' and NV_CLIENTE NOT IN ('63403', '100000')")
 '		L=Starter.skmt.ExecQuery("select count(*) as CLIENTES_DIA from noventa where nv_cliente in (select cat_cl_codigo from kmt_info where gestion = 2)")
-		L=Starter.skmt.ExecQuery("select count(DISTINCT NV_CLIENTE) as CLIENTES_DIA from noventa where nv_motivo = 'ENTREGA' and NV_CLIENTE <> 63403")
+		L=Starter.skmt.ExecQuery("select count(DISTINCT NV_CLIENTE) as CLIENTES_DIA from noventa where nv_motivo = 'ENTREGA' and NV_CLIENTE NOT IN ('63403', '100000')")
 		f2.Position=0
 '		F4=Starter.skmt.execqUery("select count(*) as CUANTOS FROM PEDIDO")
 '		F4.Position = 0
@@ -342,8 +351,8 @@ Sub B4XPage_Appear
 		b.Position = 0
 		L.Position = 0
 		f1.Position = 0
-		l_aLiquidar.Text = 0
-		If f1.RowCount > 0 Then l_aLiquidar.Text = to_number_vb (f1.GetString("MONTO_TOTAL_DIA"))
+'		l_aLiquidar.Text = 0
+'		If f1.RowCount > 0 Then l_aLiquidar.Text = to_number_vb (f1.GetString("MONTO_TOTAL_DIA"))
 		L_MONTOE.Text = 0
 '		If C.RowCount > 0 Then L_MONTOE.Text = to_number_vb (C.GetString("MONTO_DIA"))
 		l_cuantosc.Text = 0
@@ -435,7 +444,7 @@ Sub B4XPage_Appear
 	Dim entMap As Map = Subs.traeEntregados
 	Dim rechMap As Map = Subs.traeRechazados
 	Dim vendMap As Map = Subs.traeVendidos
-	l_aLiquidar.Text = entMap.Get("monto") + vendMap.Get("monto")
+'	l_aLiquidar.Text = entMap.Get("monto") + vendMap.Get("monto")
 	
 	Dim cancelrecha As Cursor = Starter.skmt.ExecQuery("SELECT ifnull(HVD_RECHAZOCANT,0), HVD_RECHAZO, CONSECUTIVO FROM HIST_VENTAS")
 	If cancelrecha.RowCount > 0 Then
@@ -730,7 +739,8 @@ Sub B4XPage_Appear
 	If l_ctast.Text = 0 And l_porvisitar.Text <> 0 Then
 		Label9.Visible = True
 		L_MONTOE.Visible = True
-		
+		l_montoaliquidar.Visible = True
+		Label21.Visible = True
 		'' hacer validacion su hay rechazo
 '		c=Starter.skmt.ExecQuery("select * from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0 order by HVD_CODPROMO desc, HVD_PRONOMBRE asc")
 '		If c.RowCount > 0 Then
@@ -739,10 +749,14 @@ Sub B4XPage_Appear
 '			b_venta_emp.Visible = False
 '		End If
 		b_venta_emp.Visible = True
+		b_comodin.Visible = True
 	Else
-		Label9.Visible = False  '''' PRUEBAS MOVER A FALSE
+		Label21.Visible = False
+		l_montoaliquidar.Visible = False
+		Label9.Visible = False  '''' PRUEBAS MOVER A TRUE
 		L_MONTOE.Visible = False
-		b_venta_emp.Visible = False
+		b_venta_emp.Visible = False '''' PRUEBAS MOVER A TRUE
+		b_comodin.Visible = False
 	End If
 
 	If l_ruta.Text = 0 Then
@@ -773,6 +787,18 @@ Sub B4XPage_Appear
 		Log("2")
 	End If
 
+	Dim pagarescobrados As Cursor = Starter.skmt.ExecQuery("SELECT IfNULL(SUM(a_abono),0) as a_abono FROM ABONOS")
+	pagarescobrados.Position = 0
+	l_pagarescobrados.Text = NumberFormat2(pagarescobrados.GetDouble("a_abono"),0,2,2,False)
+	pagarescobrados.Close
+	
+	Dim pagaresnuevos As Cursor = Starter.skmt.ExecQuery("SELECT IfNULL(SUM(PA_MONTO),0) as PA_MONTO FROM PAGARES")
+	pagaresnuevos.Position = 0
+	l_pagaresnuevos.Text = NumberFormat2(pagaresnuevos.GetDouble("PA_MONTO"),0,2,2,False)
+	pagaresnuevos.Close
+	
+	l_montoaliquidar.Text = NumberFormat2((l_pagarescobrados.Text+ L_MONTOE.Text - l_pagaresnuevos.Text),0,2,2,False)
+
 '	checachek
 End Sub
 
@@ -823,27 +849,229 @@ Sub trabajar_Click
 End Sub
 
 Sub Subir_Click
-	If Not(IsConnectedToInternet) Then MsgboxAsync("No hay conexión a conexión a Internet", "Revisa tu conexión")
-	c=Starter.skmt.ExecQuery("select usuario from usuarioa")
-	c.Position = 0
-	usuario = c.GetString("USUARIO")
-	c.Close
 	
-	c = Starter.skmt.ExecQuery("SELECT * FROM BLOCKENVIO")
-	If c.RowCount = 0 Then
-		Starter.skmt.ExecNonQuery2("INSERT INTO BLOCKENVIO(ENVIADO) VALUES (?)", Array As Object (1))
-		envioinfo
+	Private cg As Cursor = Starter.skmt.ExecQuery("select HVD_PRONOMBRE, IFNULL(SUM(HVD_RECHAZOCANT), 0) AS HVD_RECHAZOCANT, HVD_PROID from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0 and HVD_PRONOMBRE <> 'Cobranza Pendiente' GROUP BY HVD_PROID order by HVD_PRONOMBRE asc")
+	
+	
+	If cg.RowCount > 0 Then
+		Dim banderarechazo As Int = 0
+		
+		For i = 0 To cg.RowCount - 1
+			cg.Position = i
+			
+			
+			Private c3 As Cursor=Starter.skmt.ExecQuery($"select Ifnull(sum(PE_CANT),0) AS PE_CANT from PEDIDO WHERE PE_PROID ='${cg.GetString("HVD_PROID")}' "$)
+			Private resta As String = 0
+					
+			If c3.RowCount > 0 Then
+				c3.Position = 0
+				resta =  c3.GetString("PE_CANT")
+			Else
+				resta = 0
+			End If
+			
+			If ( cg.GetInt("HVD_RECHAZOCANT") - resta) <= 0 Then
+			
+			Else
+				banderarechazo = banderarechazo + 1
+			End If		
+		Next
+		
+		If banderarechazo = 0 Then
+			If Not(IsConnectedToInternet) Then MsgboxAsync("No hay conexión a conexión a Internet", "Revisa tu conexión")
+			c=Starter.skmt.ExecQuery("select usuario from usuarioa")
+			c.Position = 0
+			usuario = c.GetString("USUARIO")
+			c.Close
+	
+			c = Starter.skmt.ExecQuery("SELECT * FROM BLOCKENVIO")
+			If c.RowCount = 0 Then
+				Starter.skmt.ExecNonQuery2("INSERT INTO BLOCKENVIO(ENVIADO) VALUES (?)", Array As Object (1))
+				envioinfo
+			Else
+				envioinfo
+			End If
+			c.Close
+		Else
+			Dim pickciego As Cursor = Starter.skmt.ExecQuery("SELECT * FROM PICK_CIEGO")
+			If pickciego.RowCount > 0 Then
+				If Not(IsConnectedToInternet) Then MsgboxAsync("No hay conexión a conexión a Internet", "Revisa tu conexión")
+				c=Starter.skmt.ExecQuery("select usuario from usuarioa")
+				c.Position = 0
+				usuario = c.GetString("USUARIO")
+				c.Close
+	
+				c = Starter.skmt.ExecQuery("SELECT * FROM BLOCKENVIO")
+				If c.RowCount = 0 Then
+					Starter.skmt.ExecNonQuery2("INSERT INTO BLOCKENVIO(ENVIADO) VALUES (?)", Array As Object (1))
+					envioinfo
+				Else
+					envioinfo
+				End If
+				c.Close
+			Else
+				MsgboxAsync("Para realizar el envio se necesita realizar la incidencia de recibo.", "Atención")
+			End If
+		End If
+		
 	Else
-		envioinfo
+			If Not(IsConnectedToInternet) Then MsgboxAsync("No hay conexión a conexión a Internet", "Revisa tu conexión")
+			c=Starter.skmt.ExecQuery("select usuario from usuarioa")
+			c.Position = 0
+			usuario = c.GetString("USUARIO")
+			c.Close
+	
+			c = Starter.skmt.ExecQuery("SELECT * FROM BLOCKENVIO")
+			If c.RowCount = 0 Then
+				Starter.skmt.ExecNonQuery2("INSERT INTO BLOCKENVIO(ENVIADO) VALUES (?)", Array As Object (1))
+				envioinfo
+			Else
+				envioinfo
+			End If
+			c.Close
 	End If
 	c.Close
 	
-'	cmd.Initialize
-'	cmd.Name = "select_estatus_MAZAPA"
-'	cmd.Parameters = Array As Object(ALMACEN,e_ruta.text)
-'	reqManager.ExecuteQuery(cmd , 0, "estatus")
+	
+
 End Sub
 
+Sub imp_LIQUIDACION
+
+	ProgressDialogShow("Imprimiendo, un momento ...")
+	Printer1.DisConnect
+	If Not(Printer1.IsConnected) Then
+'		If logger Then Log("conectando 1")
+		Printer1.Connect
+		Private cont As Int = 0
+		Do While Not(impresoraConectada)
+			Sleep(1000)
+			cont = cont + 1
+			If cont = 7 Then Printer1.Connect 'Tratamos de reconectar
+			If cont > 15 Then impresoraConectada = True
+		Loop
+		Sleep(500)
+		impresoraConectada = False
+	Else
+'		If logger Then Log("conectando 2")
+		Printer1.Connect
+		Private cont As Int = 0
+		Do While Not(impresoraConectada) Or Not(Printer1.IsConnected)
+			Sleep(1000)
+			cont = cont + 1
+			If cont = 2 Then Printer1.Connect
+			If cont > 4 Then impresoraConectada = True
+		Loop
+		Sleep(500)
+		impresoraConectada = False
+	End If
+	
+	TAMANO = 0
+	ESPACIO = 29
+	BLANCO = " "
+	Printer1.Justify = 0
+	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)
+	Printer1.WriteString("Fecha: " &sDate & CRLF)
+	Printer1.WriteString("Hora: " &sTime & CRLF)
+	Printer1.WriteString("Ruta: " & l_ruta.Text & CRLF)
+	Printer1.WriteString("Usuario: " & Subs.dameUsuarioDeDB & CRLF)
+	Printer1.WriteString("----------LIQUIDACION----------" &  CRLF)
+	Printer1.WriteString("--------------------------------" &  CRLF)
+	
+	Printer1.WriteString("Monto entregado: $" & L_MONTOE.Text &  CRLF)
+	Printer1.WriteString("Monto rechazado: $" & l_rechazo.Text &  CRLF)
+	Printer1.WriteString("Pagares cobrados: $" & l_pagarescobrados.Text &  CRLF)
+	
+	If l_pagarescobrados.Text > 0 Then
+		Printer1.WriteString("--------------------------------" &  CRLF)
+		Printer1.WriteString("   Cliente             Abono" &  CRLF)
+		Printer1.WriteString("--------------------------------" &  CRLF)
+'		Printer1.WriteString( CRLF)
+		Dim abonoscreditos As Cursor = Starter.skmt.ExecQuery("SELECT a_abono, length(a_abono) as L_abono ,  length(a_cliente) as L_cliente , a_cliente FROM ABONOS ORDER BY a_cliente")	
+		For g = 0 To abonoscreditos.RowCount -1
+			abonoscreditos.Position = g
+			
+			TAMANO = abonoscreditos.GetInt("L_abono") + TAMANO
+			ESPACIO = (ESPACIO - TAMANO)/2
+'						Log(ESPACIO)
+			For j =0 To ESPACIO -1
+				BLANCO = " " & BLANCO
+			Next
+			Printer1.Justify = 0
+			Printer1.WriteString( abonoscreditos.GetString("a_cliente") & BLANCO)
+			Printer1.Justify = 1
+			Printer1.WriteString( abonoscreditos.GetString("a_abono"))
+			Printer1.WriteString( CRLF)
+			TAMANO = 0
+			ESPACIO = 29
+			BLANCO = " "
+			Printer1.Justify = 0
+		Next
+		Printer1.WriteString("--------------------------------" &  CRLF)
+	Printer1.WriteString( CRLF)
+	End If
+	Printer1.WriteString("Pagares nuevos: $" & l_pagaresnuevos.Text &  CRLF)
+	
+	If l_pagaresnuevos.Text > 0 Then
+		Printer1.WriteString("--------------------------------" &  CRLF)
+		Printer1.WriteString("   Cliente             Pagare" &  CRLF)
+		Printer1.WriteString("--------------------------------" &  CRLF)
+'		Printer1.WriteString( CRLF)
+		Dim abonoscreditos As Cursor = Starter.skmt.ExecQuery("SELECT PA_MONTO, length(PA_MONTO) as L_PA_MONTO ,  length(PA_CLIENTE) as L_cliente , PA_CLIENTE FROM PAGARES ORDER BY PA_CLIENTE")
+		For g = 0 To abonoscreditos.RowCount -1
+			abonoscreditos.Position = g
+			
+			TAMANO = abonoscreditos.GetInt("L_PA_MONTO") + TAMANO
+			ESPACIO = (ESPACIO - TAMANO)/2
+'						Log(ESPACIO)
+			For j =0 To ESPACIO -1
+				BLANCO = " " & BLANCO
+			Next
+			Printer1.Justify = 0
+			Printer1.WriteString( abonoscreditos.GetString("PA_CLIENTE") & BLANCO)
+			Printer1.Justify = 1
+			Printer1.WriteString( abonoscreditos.GetString("PA_MONTO"))
+			Printer1.WriteString( CRLF)
+			TAMANO = 0
+			ESPACIO = 29
+			BLANCO = " "
+			Printer1.Justify = 0
+		Next
+		Printer1.WriteString("--------------------------------" &  CRLF)
+	Printer1.WriteString( CRLF)
+	End If
+	Printer1.WriteString("Monto a liquidar: $" & l_montoaliquidar.Text &  CRLF)
+	
+	
+	
+'	Dim sumainv As Cursor = Starter.skmt.ExecQuery("SELECT SUM(HVD_CANT) AS CANTIDAD FROM HIST_VENTAS WHERE HVD_CODPROMO <> HVD_PROID")
+'	sumainv.Position = 0
+'	
+'	Printer1.WriteString("------------------------------" &  CRLF)
+'	Printer1.WriteString("Total piezas: " & sumainv.GetString("CANTIDAD")&  CRLF)
+	Printer1.WriteString("------------------------------" &  CRLF)
+	Printer1.Justify = 0
+	Printer1.WriteString(" " &  CRLF)
+	Printer1.WriteString(" " &  CRLF)
+	Printer1.WriteString(" " &  CRLF)
+	Printer1.WriteString(" " &  CRLF)
+	Sleep(1000)
+	Printer1.DisConnect
+	ProgressDialogHide
+	
+	
+	Msgbox2Async("Deseas imprimir de nuevo el ticket?", "ATENCION","SI","", "NO",LoadBitmap(File.DirAssets,"alert2.png"), False)
+	Wait For Msgbox_Result (resultado As Int)
+	If resultado = DialogResponse.POSITIVE Then
+		imp_LIQUIDACION
+	Else
+		
+	End If
+End Sub
 
 
 Sub envioinfo
@@ -1101,21 +1329,21 @@ Sub envioinfo
 '	End If
 	
 	
-'	c=Starter.skmt.ExecQuery("SELECT  CLIENTE, USUARIO, FECHA_PUNTEO, LATITUD, LONGITUD, ALMACEN, RUTA_REPARTO, RUTA_PREV, FECHA_PREVENTA, MOTIVO, COMENTARIO,TIPO FROM REPARTO_GEO")
-'	Log($"REPARTO_Cliente 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_REPARTO_IZCA"
-'			cmd.Parameters = Array As Object(c.GetString("CLIENTE"), c.GetString("USUARIO"), c.GetString("FECHA_PUNTEO"), c.GetString("LATITUD"), c.GetString("LONGITUD"), c.GetString("ALMACEN"), c.GetString("RUTA_REPARTO"), c.GetString("RUTA_PREV"), c.GetString("FECHA_PREVENTA"), c.GetString("MOTIVO"), c.GetString("COMENTARIO"),c.GetString("TIPO"))
-'			reqManager.ExecuteCommand(cmd , $"ins_REPARTOPendientes_head_${c.GetString("CLIENTE")}"$)
-'			
-'		Next
-'	End If
-'	c.Close
+	c=Starter.skmt.ExecQuery("SELECT  CLIENTE, USUARIO, FECHA_PUNTEO, LATITUD, LONGITUD, ALMACEN, RUTA_REPARTO, RUTA_PREV, FECHA_PREVENTA, MOTIVO, COMENTARIO,TIPO FROM REPARTO_GEO")
+	Log($"REPARTO_Cliente 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_REPARTO_IZCA"
+			cmd.Parameters = Array As Object(c.GetString("CLIENTE"), c.GetString("USUARIO"), c.GetString("FECHA_PUNTEO"), c.GetString("LATITUD"), c.GetString("LONGITUD"), c.GetString("ALMACEN"), c.GetString("RUTA_REPARTO"), c.GetString("RUTA_PREV"), c.GetString("FECHA_PREVENTA"), c.GetString("MOTIVO"), c.GetString("COMENTARIO"),c.GetString("TIPO"))
+			reqManager.ExecuteCommand(cmd , $"ins_REPARTOPendientes_head_${c.GetString("CLIENTE")}"$)
+			
+		Next
+	End If
+	c.Close
 
 '	PCIK CIEGO
 	c = Starter.skmt.ExecQuery("SELECT PC_ID_PROD, PC_ALMACEN, PC_RUTA, PC_FECHA FROM PICK_CIEGO")
@@ -1232,6 +1460,8 @@ Sub envioinfo
 	End If
 	'FIN TABULADOR
 	
+	imp_LIQUIDACION
+	
 	Dim cmd As DBCommand
 	cmd.Initialize
 	cmd.Name = "insert_drop_rep_IZCA2"
@@ -1278,7 +1508,7 @@ Sub cargar_Click
 		Dim cmd As DBCommand
 		cmd.Initialize
 		cmd.Name = "insert_drop_rep_IZCA2"
-		cmd.Parameters = Array As Object(Subs.dameUsuarioDeDB, l_ruta.Text, ALMACEN, l_ctast.text, Subs.traeEntregados, Subs.traeRechazados, "CARGA",Application.VersionName)
+		cmd.Parameters = Array As Object(Subs.dameUsuarioDeDB, e_ruta.Text, ALMACEN, l_ctast.text, Subs.traeEntregados, Subs.traeRechazados, "CARGA",Application.VersionName)
 		reqManager.ExecuteCommand(cmd , "inst_drop")
 '	reqs.Add("inst_noventa")
 
@@ -1321,21 +1551,29 @@ Sub cargar_Click
 		Log($"Pedimos gunaprod - ${ALMACEN}, ${e_ruta.text}"$)
 		reqs.Add("gunaprod")
 
-'		cmd.Initialize
-'		cmd.Name = "select_abonosp_IZCAREP"
-'		cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, ALMACEN)
-'		reqManager.ExecuteQuery(cmd , 0, "select_abonosp")
-
 		cmd.Initialize
-		cmd.Name = "select_cliente_IZCA_re_REPG"
-		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN,e_ruta.text, ALMACEN)
+		cmd.Name = "select_abonosp_IZCAREP2"
+		cmd.Parameters = Array As Object(ALMACEN, e_ruta.text)
+		reqManager.ExecuteQuery(cmd , 0, "select_abonosp")
+
+'		cmd.Initialize
+'		cmd.Name = "select_cliente_IZCA_re_REPG"
+'		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN,e_ruta.text, ALMACEN)
+'		reqManager.ExecuteQuery(cmd , 0, "kmt_datos")
+'		Log($"Pedimos kmt_datos"$)
+'		reqs.Add("kmt_datos")
+		
+		
+		cmd.Initialize
+		cmd.Name = "select_cliente_IZCA_re_REPG4"
+		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,ALMACEN,e_ruta.text, ALMACEN,e_ruta.Text,ALMACEN,e_ruta.text, ALMACEN,ALMACEN)
 		reqManager.ExecuteQuery(cmd , 0, "kmt_datos")
 		Log($"Pedimos kmt_datos"$)
 		reqs.Add("kmt_datos")
 
 		cmd.Initialize
-		cmd.Name = "select_ventad2_IZCA_re_REPG"
-		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+		cmd.Name = "select_ventad3_IZCA_re_REPG"
+		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.text, ALMACEN)
 		reqManager.ExecuteQuery(cmd , 0, "hist_datos")
 		Log($"Pedimos hist_datos"$)
 		reqs.Add("hist_datos")
@@ -1436,7 +1674,7 @@ Sub cargar____Click
 		Dim cmd As DBCommand
 		cmd.Initialize
 		cmd.Name = "insert_drop_rep_IZCA2"
-		cmd.Parameters = Array As Object(Subs.dameUsuarioDeDB, l_ruta.Text, ALMACEN, l_ctast.text, Subs.traeEntregados, Subs.traeRechazados, "CARGA",Application.VersionName)
+		cmd.Parameters = Array As Object(Subs.dameUsuarioDeDB, e_ruta.Text, ALMACEN, l_ctast.text, Subs.traeEntregados, Subs.traeRechazados, "CARGA",Application.VersionName)
 		reqManager.ExecuteCommand(cmd , "inst_drop")
 '	reqs.Add("inst_noventa")
 
@@ -1630,6 +1868,7 @@ Sub JobDone(Job As HttpJob)
 					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_BCREDITO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0)", Array As Object (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_BCREDITO))
 				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_BCREDITO, gestion,SECUENCIA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?)", Array As Object (63403,1000, "PRODUCTO DAÑADO","","","","","","","","","","","","","","-98.8357694","19.6906052","0","1"))
+				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_BCREDITO, gestion,SECUENCIA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?)", Array As Object (100000,1000, "CLIENTE COMODIN","","","","","","","","","","","","","","-98.8357694","19.6906052","0","1"))
 '				End If
 				Starter.skmt.TransactionSuccessful
 				Starter.skmt.EndTransaction
@@ -1651,6 +1890,7 @@ Sub JobDone(Job As HttpJob)
 		If Job.JobName = "DBRequest" Then
 			Dim result As DBResult = reqManager.HandleJob(Job)
 			If result.Tag = "select_abonosp" Then 'query tag
+				Starter.skmt.ExecNonQuery("DELETE FROM ABONOSP")
 				For Each records() As Object In result.Rows
 					Dim NOTA As String = records(result.Columns.Get("NOTA"))
 					Dim CLIENTE As String = records(result.Columns.Get("CLIENTE"))
@@ -1671,10 +1911,10 @@ Sub JobDone(Job As HttpJob)
 					
 				Next
 				
-				Dim clientes As Cursor = Starter.skmt.ExecQuery("select count(*) as clientes from kmt_info WHERE CAT_CL_CODIGO <> 63403")
+				Dim clientes As Cursor = Starter.skmt.ExecQuery("select count(*) as clientes from kmt_info WHERE CAT_CL_CODIGO NOT IN ('63403','100000') ")
 				clientes.Position = 0
 	
-				Dim detalleventa As Cursor = Starter.skmt.ExecQuery("select count(*) as detalle from hist_ventas")
+				Dim detalleventa As Cursor = Starter.skmt.ExecQuery("select count(*) as detalle from hist_ventas ")
 				detalleventa.Position = 0
 				
 				Log(CONTEO_CAT)
@@ -1964,6 +2204,7 @@ Sub JobDone(Job As HttpJob)
 					Dim HVD_NUM_REGISTRO As String = records(result.Columns.Get("HVD_NUM_REGISTRO"))
 					Dim HVD_RECHAZO As String = records(result.Columns.Get("HVD_RECHAZO"))
 					Dim HVD_BCREDITO As String = records(result.Columns.Get("HVD_BCREDITO"))
+					Dim HVD_USUARIO As String = records(result.Columns.Get("HVD_USUARIO"))
 '					Dim HVD_PLACA As String = records(result.Columns.Get("HVD_PLACA"))
 					Dim bcajas As String = 0 ' records(result.Columns.Get("HVD_BCAJAS"))
 					Dim cantc As String = 0 'records(result.Columns.Get("HVD_CANTC"))
@@ -1972,14 +2213,14 @@ Sub JobDone(Job As HttpJob)
 					Log(HVD_PRONOMBRE & ", " & HVD_CANT & ", " &HVD_CLIENTE)
 					If l_ruta.Text = "0" Then 'Si no hay ruta cargada, guardamos todos los clientes
 						Log("No hay ruta, guardamos todos")
-						Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE, HVD_PRONOMBRE, HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR,HVD_BCREDITO) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, bcajas,cantc,consecutivo,bcajas,cantc,HVD_BCREDITO))
+						Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE, HVD_PRONOMBRE, HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR,HVD_BCREDITO,HVD_USUARIO) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, bcajas,cantc,consecutivo,bcajas,cantc,HVD_BCREDITO,HVD_USUARIO))
 						Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS2(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL) VALUES (?,?,?,?,?,?,?,?,?,?,0,0)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO))
 					Else 'Si ya hay ruta cargada, solo guardamos los clientes nuevos.
 '						Log("Hay ruta, guardamos los nuevos")
-						Private tc As Cursor = Starter.skmt.ExecQuery($"select HVD_CLIENTE from HIST_VENTAS where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PROID = '${HVD_PROID}' AND HVD_CANT = '${HVD_CANT}' AND HVD_CODPROMO = '${HVD_CODPROMO}' "$)
+						Private tc As Cursor = Starter.skmt.ExecQuery($"select HVD_CLIENTE from HIST_VENTAS where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PROID = '${HVD_PROID}' AND HVD_CANT = '${HVD_CANT}' AND HVD_CODPROMO = '${HVD_CODPROMO}' AND HVD_USUARIO = '${HVD_USUARIO}'"$)
 						If tc.RowCount = 0 Then
 							Log($"Guardamos ${HVD_CLIENTE}"$)
-							Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR,HVD_BCREDITO) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, bcajas,cantc,consecutivo,bcajas,cantc,HVD_BCREDITO))
+							Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR,HVD_BCREDITO,HVD_USUARIO) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, bcajas,cantc,consecutivo,bcajas,cantc,HVD_BCREDITO,HVD_USUARIO))
 							Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS2(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL) VALUES (?,?,?,?,?,?,?,?,?,?,0,0)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO))							
 						End If
 					End If
@@ -2174,6 +2415,17 @@ Sub JobDone(Job As HttpJob)
 				Next
 			End If
 		End If
+		
+		If Job.JobName = "DBRequest" Then
+			Dim result As DBResult = reqManager.HandleJob(Job)
+			If result.Tag = "contra" Then 'query tag
+				For Each records() As Object In result.Rows
+					Dim name As String = records(result.Columns.Get("CONTRA"))
+				
+				Next
+				paso1 = 1
+			End If
+		End If
 
 		If Job.JobName = "DBRequest" Then 
 			Dim result As DBResult = reqManager.HandleJob(Job)
@@ -2197,8 +2449,108 @@ Sub JobDone(Job As HttpJob)
 			End If
 		End If
 		Job.Release
+		
+		
 
 	End If
+	
+	If paso1 = 1 Then
+		
+	
+	If name = "OK"&et_codigo.Text Then
+			p_validacion.Visible = False
+			et_codigo.Text = ""
+		Starter.skmt.ExecNonQuery("delete from CUENTAA")
+		Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("63403"))
+
+		Subs.panelVisible(P_CIEGO,0,0)
+		P_CIEGO.Width = Root.Width
+		P_CIEGO.Height = Root.Height
+	
+		CLV_PICK_CIEGO.Clear
+
+		Private c As Cursor = Starter.skmt.ExecQuery("select HVD_PRONOMBRE, IFNULL(SUM(HVD_RECHAZOCANT), 0) AS HVD_RECHAZOCANT, HVD_PROID, ifnull(PC_CANT,0) AS PC_CAN from HIST_VENTAS INNER JOIN PICK_CIEGO ON PC_ID_PROD = HVD_PROID WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0 and  HVD_PRONOMBRE <> 'Cobranza Pendiente' GROUP BY HVD_PROID order by HVD_PRONOMBRE asc")
+		If c.RowCount > 0 Then
+		
+		
+			For i = 0 To c.RowCount - 1
+				c.Position = i
+			
+			
+				Private c3 As Cursor=Starter.skmt.ExecQuery($"select Ifnull(sum(PE_CANT),0) AS PE_CANT from PEDIDO WHERE PE_PROID ='${c.GetString("HVD_PROID")}' and PE_TIPO NOT IN ('DANADO','FALTANTE','SOBRANTE')"$)
+				Private resta As String = 0
+					
+				If c3.RowCount > 0 Then
+					c3.Position = 0
+					resta =  c3.GetString("PE_CANT")
+				Else
+					resta = 0
+				End If
+				If ( c.GetInt("HVD_RECHAZOCANT") - resta) <= 0 Then
+			
+				Else
+					CLV_PICK_CIEGO.Add(CreateListItem(c.GetString("HVD_PROID"), c.GetString("HVD_PRONOMBRE"), c.GetString("PC_CAN"),(c.GetInt("HVD_RECHAZOCANT") - resta)),i)
+				End If
+			
+			
+			Next
+
+			d = Starter.skmt.ExecQuery("select HVD_PRONOMBRE, IFNULL(SUM(HVD_RECHAZOCANT), 0) AS HVD_RECHAZOCANT, HVD_PROID from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0  and HVD_PROID NOT IN (SELECT PC_ID_PROD FROM PICK_CIEGO)  and HVD_PRONOMBRE <> 'Cobranza Pendiente' GROUP BY HVD_PROID order by HVD_PRONOMBRE asc")
+				
+			For i = 0 To d.RowCount - 1
+				d.Position = i
+			
+			
+				Private c3 As Cursor=Starter.skmt.ExecQuery($"select Ifnull(sum(PE_CANT),0) AS PE_CANT from PEDIDO WHERE PE_PROID ='${d.GetString("HVD_PROID")}' and PE_TIPO NOT IN ('DANADO','FALTANTE','SOBRANTE')"$)
+				Private resta As String = 0
+					
+				If c3.RowCount > 0 Then
+					c3.Position = 0
+					resta =  c3.GetString("PE_CANT")
+				Else
+					resta = 0
+				End If
+				If ( d.GetInt("HVD_RECHAZOCANT") - resta) <= 0 Then
+			
+				Else
+					CLV_PICK_CIEGO.Add(CreateListItem2(d.GetString("HVD_PROID"), d.GetString("HVD_PRONOMBRE"),(d.GetInt("HVD_RECHAZOCANT") - resta)),i)
+				End If
+			
+			
+			Next
+		
+		Else If c.RowCount = 0 Then
+			d = Starter.skmt.ExecQuery("select HVD_PRONOMBRE, IFNULL(SUM(HVD_RECHAZOCANT), 0) AS HVD_RECHAZOCANT, HVD_PROID from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0 and HVD_PRONOMBRE <> 'Cobranza Pendiente' GROUP BY HVD_PROID order by HVD_PRONOMBRE asc")
+'		d=Starter.skmt.ExecQuery($"select CAT_GP_NOMBRE, CAT_GP_ID FROM CAT_GUNAPROD3 WHERE CAT_GP_CLASIF <> 'PROMOS'"$)
+			For i = 0 To d.RowCount - 1
+				d.Position = i
+			
+			
+				Private c3 As Cursor=Starter.skmt.ExecQuery($"select Ifnull(sum(PE_CANT),0) AS PE_CANT from PEDIDO WHERE PE_PROID ='${d.GetString("HVD_PROID")}'and PE_TIPO NOT IN ('DANADO','FALTANTE','SOBRANTE')"$)
+				Private resta As String = 0
+					
+				If c3.RowCount > 0 Then
+					c3.Position = 0
+					resta =  c3.GetString("PE_CANT")
+				Else
+					resta = 0
+				End If
+				If ( d.GetInt("HVD_RECHAZOCANT") - resta) <= 0 Then
+			
+				Else
+					CLV_PICK_CIEGO.Add(CreateListItem2(d.GetString("HVD_PROID"), d.GetString("HVD_PRONOMBRE"),(d.GetInt("HVD_RECHAZOCANT") - resta)),i)
+				End If
+			
+			
+			Next
+		End If
+		paso1 = 0
+	Else
+			et_codigo.Text = ""
+		Msgbox("Password No valido","Atención") 'ignore
+	End If
+	End If
+	
 	If reqs.Size = 0 Then
 		
 		
@@ -2252,7 +2604,7 @@ Sub connecta_Click
 		cmd.Initialize
 		
 		
-		cmd.Name = "select_ruta_re_REPG_IZCA2"
+		cmd.Name = "select_ruta_re_REPG_IZCA6"
 		cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, usuario)
 		Log($"${ALMACEN}, ${e_ruta.text}, ${usuario}"$)
 		reqManager.ExecuteQuery(cmd , 0, "ruta")
@@ -2359,7 +2711,7 @@ Sub B_CLIEPROD_Click
 		l_clientes_recha.Text = ch1.GetInt("rechazo")
 		l_clientes_visitados.Text = ch1.GetInt("rechazo") + ch.GetInt("visit")
 	
-	c=Starter.skmt.ExecQuery("select * from kmt_info WHERE gestion <> 0 order by HORAENT")
+	c=Starter.skmt.ExecQuery("select distinct(CAT_CL_CODIGO), GESTION, CAT_CL_NOMBRE from kmt_info WHERE gestion <> 0 order by HORAENT")
 	Subs.SetDivider(ListView1, Colors.LightGray, 2)
 	ListView1.Clear
 	Dim label1 As Label
@@ -2464,78 +2816,78 @@ Sub B_CLIEPROD_Click
 				
 				Else If ESTATUS = "RECHAZADO" Then
 					
-					Private vc As Cursor = Starter.skmt.ExecQuery($"select HVD_PROID, HVD_CANT, IFNULL(HVD_RECHAZOCANT, 0) AS HVD_RECHAZOCANT, CAT_GP_PRECIO, HVD_COSTO_TOT from HIST_VENTAS LEFT JOIN CAT_GUNAPROD ON CAT_GP_ID = HVD_PROID where BCAJAS = 0 and HVD_CODPROMO ='${Subs.traealmacen}' and HVD_CLIENTE = '${c.GetString("CAT_CL_CODIGO")}'"$)
+					Private vc As Cursor = Starter.skmt.ExecQuery($"select SUM(HVD_COSTO_TOT) AS HVD_COSTO_TOT, SUM(HVD_CANT) AS HVD_CANT from HIST_VENTAS WHERE HVD_CLIENTE = '${c.GetString("CAT_CL_CODIGO")}' AND HVD_CODPROMO "$)
 	
 					Private cuenta0 As String = 0
 					Private arti As String = 0
 					If vc.RowCount > 0 Then
 						For hjf = 0 To vc.RowCount - 1
 							vc.Position = hjf
-							Dim preu As Float = NumberFormat2(vc.GetString("HVD_COSTO_TOT")/vc.GetString("HVD_CANT"),0,2,2,False)
+'							Dim preu As Float = NumberFormat2(vc.GetString("HVD_COSTO_TOT")/vc.GetString("HVD_CANT"),0,2,2,False)
 '			Log(vc.GetString("HVD_CANT")&","&vc.GetString("HVD_RECHAZOCANT"))
-							arti = arti + (vc.GetString("HVD_RECHAZOCANT"))
-							cuenta0 = cuenta0 + ((vc.GetString("HVD_RECHAZOCANT"))*preu)
+							arti = (vc.GetString("HVD_CANT"))
+							cuenta0 = cuenta0 + ((vc.GetString("HVD_COSTO_TOT")))
 						Next
 					End If
-'				Log(cuenta0)
+					Log(cuenta0)
 	
-					Private vc2 As Cursor = Starter.skmt.ExecQuery($"select HVD_PROID, HVD_CANT, IFNULL(HVD_RECHAZOCANT, 0) AS HVD_RECHAZOCANT, CANTC,HVD_COSTO_TOT from HIST_VENTAS where HVD_CLIENTE = '${c.GetString("CAT_CL_CODIGO")}' AND BCAJAS = 1"$)
-					Private Cuenta1 As String = 0
-					Private arti1 As String = 0
-					If vc2.RowCount > 0 Then
-						For h = 0 To vc2.RowCount - 1
-							vc2.Position = h
-							Dim preu As Float = NumberFormat2(vc2.GetString("HVD_COSTO_TOT")/vc2.GetString("CANTC"),0,2,2,False)
-							Private vc3 As Cursor = Starter.skmt.ExecQuery($"select PRECIOCONVER, CONVERSION from CAT_GUNAPROD where CAT_GP_ID = '${vc2.GetString("HVD_PROID")}'"$)
-							If vc3.RowCount > 0 Then
-								vc3.Position = 0
-								Cuenta1 = Cuenta1 + ((vc2.GetString("HVD_RECHAZOCANT")/vc3.GetString("CONVERSION"))*preu)
-								arti1 = arti1 + (vc2.GetString("HVD_RECHAZOCANT"))
-							End If
-						Next
-					End If
-'				Log(Cuenta1)
+'					Private vc2 As Cursor = Starter.skmt.ExecQuery($"select HVD_PROID, HVD_CANT, IFNULL(HVD_RECHAZOCANT, 0) AS HVD_RECHAZOCANT, CANTC,HVD_COSTO_TOT from HIST_VENTAS where HVD_CLIENTE = '${c.GetString("CAT_CL_CODIGO")}' AND BCAJAS = 1"$)
+'					Private Cuenta1 As String = 0
+'					Private arti1 As String = 0
+'					If vc2.RowCount > 0 Then
+'						For h = 0 To vc2.RowCount - 1
+'							vc2.Position = h
+'							Dim preu As Float = NumberFormat2(vc2.GetString("HVD_COSTO_TOT")/vc2.GetString("CANTC"),0,2,2,False)
+'							Private vc3 As Cursor = Starter.skmt.ExecQuery($"select PRECIOCONVER, CONVERSION from CAT_GUNAPROD where CAT_GP_ID = '${vc2.GetString("HVD_PROID")}'"$)
+'							If vc3.RowCount > 0 Then
+'								vc3.Position = 0
+'								Cuenta1 = Cuenta1 + ((vc2.GetString("HVD_RECHAZOCANT")/vc3.GetString("CONVERSION"))*preu)
+'								arti1 = arti1 + (vc2.GetString("HVD_RECHAZOCANT"))
+'							End If
+'						Next
+'					End If
+'					Log(Cuenta1)
+'	
+'					Private vc4 As Cursor = Starter.skmt.ExecQuery($"select HVD_PROID, HVD_CANT, IFNULL(HVD_RECHAZOCANT, 0) AS HVD_RECHAZOCANT, CANTC,HVD_COSTO_TOT, HVD_RECHAZO, HVD_CODPROMO from HIST_VENTAS where HVD_CLIENTE = '${c.GetString("CAT_CL_CODIGO")}' AND BCAJAS = 0 and HVD_CODPROMO <> '${Subs.traeAlmacen}'"$)
+'					Private Cuenta2 As String = 0
+'					Private arti2 As String = 0
+'					If vc4.RowCount > 0 Then
+'		
+'						For k = 0 To vc4.RowCount - 1
+'							vc4.Position = k
+'							If vc4.GetString("HVD_PROID") <> vc4.GetString("HVD_CODPROMO") Then
+'								If vc4.GetString("HVD_RECHAZO") = 0 Then
+'									Cuenta2 = Cuenta2 + vc4.GetString("HVD_COSTO_TOT")
+'									arti2 = arti2 + vc4.GetString("HVD_RECHAZOCANT")
+'								Else
+'									Private vc5 As Cursor = Starter.skmt.ExecQuery($"select CAT_GP_PRECIO from CAT_GUNAPROD where CAT_GP_ID = '${vc4.GetString("HVD_PROID")}'"$)
+'									If vc5.RowCount > 0 Then
+'										vc5.Position= 0
+''									Log(vc5.GetString("CAT_GP_PRECIO"))
+'										Cuenta2 = Cuenta2 +(( vc4.GetString("HVD_RECHAZOCANT"))*vc5.GetString("CAT_GP_PRECIO"))
+'										arti2 = arti2 +(vc4.GetString("HVD_RECHAZOCANT"))
+'									End If
+'								End If
+'							End If
+'			
+'						Next
+'					End If
+'					Log(Cuenta2)
+'	
+'					Private c4 As Cursor = Starter.skmt.ExecQuery($"SELECT IFNULL(PE_CANT,0) AS PE_CANT, iFNULL(PE_COSTO_TOT,0) AS PE_COSTO_TOT FROM PEDIDO WHERE PE_CLIENTE = '${c.GetString("CAT_CL_CODIGO")}'"$)
+'					Private Cuenta3 As String = 0
+'					Private arti3 As String = 0
+'					If c4.RowCount > 0 Then
+'						For x = 0 To c4.RowCount -1
+'							c4.Position = x
+'							arti3 = arti3 + c4.GetString("PE_CANT")
+'							Cuenta3 = Cuenta3 + c4.GetString("PE_COSTO_TOT")
+'						Next
+'					End If
+'					Log(Cuenta3)
 	
-					Private vc4 As Cursor = Starter.skmt.ExecQuery($"select HVD_PROID, HVD_CANT, IFNULL(HVD_RECHAZOCANT, 0) AS HVD_RECHAZOCANT, CANTC,HVD_COSTO_TOT, HVD_RECHAZO, HVD_CODPROMO from HIST_VENTAS where HVD_CLIENTE = '${c.GetString("CAT_CL_CODIGO")}' AND BCAJAS = 0 and HVD_CODPROMO <> '${Subs.traeAlmacen}'"$)
-					Private Cuenta2 As String = 0
-					Private arti2 As String = 0
-					If vc4.RowCount > 0 Then
-		
-						For k = 0 To vc4.RowCount - 1
-							vc4.Position = k
-							If vc4.GetString("HVD_PROID") <> vc4.GetString("HVD_CODPROMO") Then
-								If vc4.GetString("HVD_RECHAZO") = 0 Then
-									Cuenta2 = Cuenta2 + vc4.GetString("HVD_COSTO_TOT")
-									arti2 = arti2 + vc4.GetString("HVD_RECHAZOCANT")
-								Else
-									Private vc5 As Cursor = Starter.skmt.ExecQuery($"select CAT_GP_PRECIO from CAT_GUNAPROD where CAT_GP_ID = '${vc4.GetString("HVD_PROID")}'"$)
-									If vc5.RowCount > 0 Then
-										vc5.Position= 0
-'									Log(vc5.GetString("CAT_GP_PRECIO"))
-										Cuenta2 = Cuenta2 +(( vc4.GetString("HVD_RECHAZOCANT"))*vc5.GetString("CAT_GP_PRECIO"))
-										arti2 = arti2 +(vc4.GetString("HVD_RECHAZOCANT"))
-									End If
-								End If
-							End If
-			
-						Next
-					End If
-'				Log(arti2)
-	
-					Private c4 As Cursor = Starter.skmt.ExecQuery($"SELECT IFNULL(PE_CANT,0) AS PE_CANT, iFNULL(PE_COSTO_TOT,0) AS PE_COSTO_TOT FROM PEDIDO WHERE PE_CLIENTE = '${c.GetString("CAT_CL_CODIGO")}'"$)
-					Private Cuenta3 As String = 0
-					Private arti3 As String = 0
-					If c4.RowCount > 0 Then
-						For x = 0 To c4.RowCount -1
-							c4.Position = x
-							arti3 = arti3 + c4.GetString("PE_CANT")
-							Cuenta3 = Cuenta3 + c4.GetString("PE_COSTO_TOT")
-						Next
-					End If
-
-	
-					Private TOTALMONTO As String = cuenta0 + Cuenta1 + Cuenta2 + Cuenta3
-					Private TOTALcantidad As String = arti + arti1 +arti2 + arti3
+					Private TOTALMONTO As String = cuenta0
+					Private TOTALcantidad As String = arti
 					
 					Log("si entre")
 					ListView1.AddTwoLines(c.GetString("CAT_CL_CODIGO")&" - " &c.GetString("CAT_CL_NOMBRE"), "Articulos :"& TOTALcantidad &" Monto :"& NumberFormat2(TOTALMONTO,0,2,2,True) & "   " & ESTATUS )
@@ -2689,91 +3041,11 @@ Private Sub p_prod_Click
 End Sub
 
 Private Sub b_venta_emp_Click
-	Starter.skmt.ExecNonQuery("delete from CUENTAA")
-	Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("63403"))
-
-	Subs.panelVisible(P_CIEGO,0,0)
-	P_CIEGO.Width = Root.Width
-	P_CIEGO.Height = Root.Height
 	
-	CLV_PICK_CIEGO.Clear
-
-	Private c As Cursor = Starter.skmt.ExecQuery("select HVD_PRONOMBRE, IFNULL(SUM(HVD_RECHAZOCANT), 0) AS HVD_RECHAZOCANT, HVD_PROID, ifnull(PC_CANT,0) AS PC_CAN from HIST_VENTAS INNER JOIN PICK_CIEGO ON PC_ID_PROD = HVD_PROID WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0 GROUP BY HVD_PROID order by HVD_PRONOMBRE asc")
-	If c.RowCount > 0 Then
-		
-		
-		For i = 0 To c.RowCount - 1
-			c.Position = i
-			
-			
-			Private c3 As Cursor=Starter.skmt.ExecQuery($"select Ifnull(sum(PE_CANT),0) AS PE_CANT from PEDIDO WHERE PE_PROID ='${c.GetString("HVD_PROID")}' and PE_TIPO NOT IN ('DANADO','FALTANTE','SOBRANTE')"$)
-			Private resta As String = 0
-					
-			If c3.RowCount > 0 Then
-				c3.Position = 0
-				resta =  c3.GetString("PE_CANT")
-			Else
-				resta = 0
-			End If
-			If ( c.GetInt("HVD_RECHAZOCANT") - resta) <= 0 Then
-			
-			Else
-				CLV_PICK_CIEGO.Add(CreateListItem(c.GetString("HVD_PROID"), c.GetString("HVD_PRONOMBRE"), c.GetString("PC_CAN"),(c.GetInt("HVD_RECHAZOCANT") - resta)),i)
-			End If
-			
-			
-		Next
-
-		d = Starter.skmt.ExecQuery("select HVD_PRONOMBRE, IFNULL(SUM(HVD_RECHAZOCANT), 0) AS HVD_RECHAZOCANT, HVD_PROID from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0  and HVD_PROID NOT IN (SELECT PC_ID_PROD FROM PICK_CIEGO) GROUP BY HVD_PROID order by HVD_PRONOMBRE asc")
-				
-		For i = 0 To d.RowCount - 1
-			d.Position = i
-			
-			
-			Private c3 As Cursor=Starter.skmt.ExecQuery($"select Ifnull(sum(PE_CANT),0) AS PE_CANT from PEDIDO WHERE PE_PROID ='${d.GetString("HVD_PROID")}' and PE_TIPO NOT IN ('DANADO','FALTANTE','SOBRANTE')"$)
-			Private resta As String = 0
-					
-			If c3.RowCount > 0 Then
-				c3.Position = 0
-				resta =  c3.GetString("PE_CANT")
-			Else
-				resta = 0
-			End If
-			If ( d.GetInt("HVD_RECHAZOCANT") - resta) <= 0 Then
-			
-			Else
-				CLV_PICK_CIEGO.Add(CreateListItem2(d.GetString("HVD_PROID"), d.GetString("HVD_PRONOMBRE"),(d.GetInt("HVD_RECHAZOCANT") - resta)),i)
-			End If
-			
-			
-		Next
-		
-	Else If c.RowCount = 0 Then
-		d = Starter.skmt.ExecQuery("select HVD_PRONOMBRE, IFNULL(SUM(HVD_RECHAZOCANT), 0) AS HVD_RECHAZOCANT, HVD_PROID from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0  GROUP BY HVD_PROID order by HVD_PRONOMBRE asc")
-'		d=Starter.skmt.ExecQuery($"select CAT_GP_NOMBRE, CAT_GP_ID FROM CAT_GUNAPROD3 WHERE CAT_GP_CLASIF <> 'PROMOS'"$)
-		For i = 0 To d.RowCount - 1
-			d.Position = i
-			
-			
-			Private c3 As Cursor=Starter.skmt.ExecQuery($"select Ifnull(sum(PE_CANT),0) AS PE_CANT from PEDIDO WHERE PE_PROID ='${d.GetString("HVD_PROID")}'and PE_TIPO NOT IN ('DANADO','FALTANTE','SOBRANTE')"$)
-			Private resta As String = 0
-					
-			If c3.RowCount > 0 Then
-				c3.Position = 0
-				resta =  c3.GetString("PE_CANT")
-			Else
-				resta = 0
-			End If
-			If ( d.GetInt("HVD_RECHAZOCANT") - resta) <= 0 Then
-			
-			Else
-				CLV_PICK_CIEGO.Add(CreateListItem2(d.GetString("HVD_PROID"), d.GetString("HVD_PRONOMBRE"),(d.GetInt("HVD_RECHAZOCANT") - resta)),i)
-			End If
-			
-			
-		Next
-	End If
-
+	p_validacion.Visible = True
+	p_validacion.Width = Root.Width
+	p_validacion.Height = Root.Height
+	
 End Sub
 
 'Private Sub connecta_LongClick
@@ -2806,7 +3078,7 @@ End Sub
 ''para la carga --- mover a los demas clientes
 Sub t8_tick	
 	cmd.Initialize
-	cmd.Name = "select_conteo_izca"
+	cmd.Name = "select_conteo_izca2"
 	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
 	reqManager.ExecuteQuery(cmd , 0, "CONTEO_DATOS")
 	l_carga2.Text = "VALIDANDO"
@@ -3604,4 +3876,35 @@ Sub CreateListItem2(Id_prod As String, Prod As String,cantreal As String) As Pan
 	'cxc.Id_prod = mostrar3
 	'Log(pa.Width)
 	Return pa
+End Sub
+
+Private Sub connecta_LongClick
+	imp_LIQUIDACION
+End Sub
+
+Private Sub b_comodin_Click
+	Starter.skmt.ExecNonQuery("delete from CUENTAA")
+	Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("100000"))
+	B4XPages.ShowPage("Cliente")
+End Sub
+
+Private Sub b_aceptar_Click
+	If et_codigo.Text <> "" Then
+		
+		Dim cmd As DBCommand
+		cmd.Initialize
+		cmd.Name = "select_PASS_IZCA_REPG"
+		cmd.Parameters = Array As Object(ALMACEN)
+		reqManager.ExecuteQuery(cmd , 0, "contra")
+		
+	End If
+End Sub
+
+Private Sub b_cancelarcodigo_Click
+	p_validacion.Visible = False
+	et_codigo.Text = ""
+End Sub
+
+Private Sub p_validacion_Click
+	
 End Sub

B4A/C_Productos.bas

@@ -96,7 +96,7 @@ Sub B4XPage_Appear
 '	c=Starter.skmt.ExecQuery("select distinct hist_ventas.hvd_num_registro, HIST_VENTAS.HVD_CLIENTE, HIST_VENTAS.HVD_PRONOMBRE, HIST_VENTAS.HVD_PROID, HIST_VENTAS.HVD_CANT, HIST_VENTAS2.HVD_CANT as HVD_CANT2, HIST_VENTAS.HVD_COSTO_TOT, HIST_VENTAS.HVD_CODPROMO from HIST_VENTAS inner join HIST_VENTAS2 on HIST_VENTAS.HVD_PROID = HIST_VENTAS2.HVD_PROID and HIST_VENTAS.HVD_CLIENTE = HIST_VENTAS2.HVD_CLIENTE WHERE HIST_VENTAS.HVD_CLIENTE IN (Select CUENTA from cuentaa) and HIST_VENTAS.HVD_RECHAZO = 0 order by HIST_VENTAS.HVD_CODPROMO desc, HIST_VENTAS.HVD_PRONOMBRE asc")
 	
 	
-	c=Starter.skmt.ExecQuery("select * from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0 order by HVD_CODPROMO desc, HVD_PRONOMBRE asc")
+	c=Starter.skmt.ExecQuery("select * from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0 and HVD_PRONOMBRE <> 'Cobranza Pendiente' AND HVD_CLIENTE NOT IN (SELECT CUENTA FROM CUENTAA) order by HVD_CODPROMO desc, HVD_PRONOMBRE asc")
 '	Private c2 As Cursor=Starter.skmt.ExecQuery("select  from PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)")
 	
 	ListView1.Clear

B4A/EscPosPrinter.bas

@@ -524,7 +524,7 @@ Version=9.3
 '' Create the value to draw a box in a custom character
 '' The box top left start is X0,Y0 and bottom right is X1,Y1
 'Public Sub CreateBox(x0 As Int, y0 As Int, x1 As Int, y1 As Int, fill As Boolean) As Int
-'	Dim box As Int = 0x10000000
+'	Dim box As Int = 0x100000000
 '	If fill Then box = box + 0x80000000
 '	box = box + Bit.ShiftLeft(Bit.And(0xf,x0), 24)
 '	box = box + Bit.ShiftLeft(Bit.And(0x1f,y0), 16)
@@ -1668,7 +1668,7 @@ End Sub
 ' Create the value to draw a box in a custom character
 ' The box top left start is X0,Y0 and bottom right is X1,Y1
 Public Sub CreateBox(x0 As Int, y0 As Int, x1 As Int, y1 As Int, fill As Boolean) As Int
-	Dim box As Int = 0x10000000
+	Dim box As Int = 0x100000000
 	If fill Then box = box + 0x80000000
 	box = box + Bit.ShiftLeft(Bit.And(0xf,x0), 24)
 	box = box + Bit.ShiftLeft(Bit.And(0x1f,y0), 16)

B4A/Izca_Reparto.b4a

@@ -3013,12 +3013,12 @@ Module9=C_DetalleVenta
 NumberOfFiles=1476
 NumberOfLibraries=27
 NumberOfModules=30
-Version=13.4
+Version=12.8
 @EndOfDesignText@
 #Region Project Attributes 
 	#ApplicationLabel: Izca Reparto
 	#VersionCode: 1
-	#VersionName: 5.07.21
+	#VersionName: 6.03.16
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/Izca_Reparto.b4a.meta

@@ -25,7 +25,7 @@ ModuleBookmarks3=
 ModuleBookmarks30=
 ModuleBookmarks4=
 ModuleBookmarks5=
-ModuleBookmarks6=2257
+ModuleBookmarks6=2283
 ModuleBookmarks7=
 ModuleBookmarks8=
 ModuleBookmarks9=
@@ -91,6 +91,6 @@ ModuleClosedNodes6=18,19,20,21
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Cliente,b_acred_Click,1290,5,C_Principal,envioinfo,1007,2,C_Principal,cargar_Click,1315,0,C_Cliente,B_IMP2_Click,2825,0,C_DetalleVenta,B4XPage_Appear,258,0,C_Cliente,B_IMP_Click,1093,4,C_Cliente,B4XPage_Appear,155,0,Diseñador Visual,principal.bal,-100,6,C_Principal,B4XPage_Appear,723,6,C_Principal,b_terpc_Click,3262,5
+NavigationStack=C_Principal,b_terpc_Click,3535,0,C_Principal,CreateListItem,3840,0,C_Cliente,Class_Globals,0,0,C_Principal,e_ruta_EnterPressed,2626,0,B4XMainPage,B4XPage_Created,201,1,C_Principal,JobDone,2213,3,C_Principal,Subir_Click,902,0,C_Principal,envioinfo,1310,0,C_Principal,B4XPage_CloseRequest,2583,0,C_Principal,connecta_Click,2600,0
 SelectedBuild=0
 VisibleModules=1,2,3,4,5,6,7,8,9,10,16

B4A/MAPA_RUTAS.bas

@@ -127,7 +127,7 @@ Sub MapFragment1_Ready
 	Private esteAzul2 As String
 	If azul = 1 Or todos = 1  Then
 		c.IsInitialized
-		c = Starter.skmt.ExecQuery("select CAT_CL_CODIGO, IFNULL(SECUENCIA,0) AS SECUENCIA, CAT_CL_NOMBRE, CAT_CL_LAT, CAT_CL_LONG, CAT_CL_RUTA 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_CODIGO <> 63403 order by CAT_CL_RUTA")
+		c = Starter.skmt.ExecQuery("select CAT_CL_CODIGO, IFNULL(SECUENCIA,0) AS SECUENCIA, CAT_CL_NOMBRE, CAT_CL_LAT, CAT_CL_LONG, CAT_CL_RUTA 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_CODIGO NOT IN ('63403','100000') order by CAT_CL_RUTA")
 		rutaAnt = ""
 		For i = 0 To c.RowCount -1
 			c.Position = i
@@ -173,7 +173,7 @@ Sub MapFragment1_Ready
 	If verde = 1 Or todos = 1  Then
 		rutaAnt = ""
 		c2.IsInitialized
-		c2=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, IFNULL(SECUENCIA,0) AS SECUENCIA, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA 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 <> 63403 order by CAT_CL_RUTA")
+		c2=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, IFNULL(SECUENCIA,0) AS SECUENCIA, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA 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 NOT IN ('63403','100000') order by CAT_CL_RUTA")
 		For i = 0 To c2.RowCount -1
 			c2.Position = i
 			LongitudRU = c2.GetString("CAT_CL_LONG")
@@ -199,7 +199,7 @@ Sub MapFragment1_Ready
 		If verde = 1 Or todos = 1  Then
 			rutaAnt = ""
 			c2.IsInitialized
-			c2=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA 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 <> 63403 order by CAT_CL_RUTA")
+			c2=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA 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 NOT IN ('63403','100000') order by CAT_CL_RUTA")
 			For i = 0 To c2.RowCount -1
 				c2.Position = i
 				LongitudRU = c2.GetString("CAT_CL_LONG")
@@ -220,7 +220,7 @@ Sub MapFragment1_Ready
 	If rojo = 1 Or todos = 1 Then
 		rutaAnt = ""
 		c3.IsInitialized
-		c3=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, IFNULL(SECUENCIA,0) AS SECUENCIA, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA 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 <> 63403 order by CAT_CL_RUTA")
+		c3=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, IFNULL(SECUENCIA,0) AS SECUENCIA, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA 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 NOT IN ('63403','100000') order by CAT_CL_RUTA")
 		For i = 0 To c3.RowCount -1
 			c3.Position = i
 			LongitudRU = c3.GetDouble("CAT_CL_LONG")
@@ -247,7 +247,7 @@ Sub MapFragment1_Ready
 		If rojo = 1 Or  todos = 1  Then
 			rutaAnt = ""
 			c3.IsInitialized
-			c3=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA 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 <> 63403 order by CAT_CL_RUTA")
+			c3=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA 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 NOT IN ('63403','100000') order by CAT_CL_RUTA")
 			For i = 0 To c3.RowCount -1
 				c3.Position = i
 				LongitudRU = c3.GetDouble("CAT_CL_LONG")

B4A/Objects/AndroidManifest.xml

@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="reparto_izca.keymon.lat"
 	android:versionCode="1"
-	android:versionName="5.07.20"
+	android:versionName="6.03.16"
 	android:installLocation="internalOnly">
 	
 	<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="33"/>