v 5.09.14

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" 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,6 +578,9 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 		et_montoacredito.Text = ""
 		p_credito.Visible = False
 		Return False
+	Else if p_abono.Visible Then
+		p_abono.Visible = False
+		Return False
 	Else If la_cuenta.Text = "63403" Then
 		B4XPages.ShowPage("Principal")
 		Return False

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

@@ -135,6 +135,10 @@ 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
 End Sub
 
 'You can add more parameters here.
@@ -164,7 +168,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 +284,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 +304,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
@@ -342,8 +346,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 +439,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 +734,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
@@ -740,9 +745,11 @@ Sub B4XPage_Appear
 '		End If
 		b_venta_emp.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
 	End If
 
 	If l_ruta.Text = 0 Then
@@ -773,6 +780,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
 
@@ -1321,21 +1340,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")
@@ -1651,6 +1678,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 +1699,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 <> 63403 ")
 				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)
@@ -2252,7 +2280,7 @@ Sub connecta_Click
 		cmd.Initialize
 		
 		
-		cmd.Name = "select_ruta_re_REPG_IZCA2"
+		cmd.Name = "select_ruta_re_REPG_IZCA4"
 		cmd.Parameters = Array As Object(ALMACEN, e_ruta.text, usuario)
 		Log($"${ALMACEN}, ${e_ruta.text}, ${usuario}"$)
 		reqManager.ExecuteQuery(cmd , 0, "ruta")
@@ -2359,7 +2387,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 +2492,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 )
@@ -2698,7 +2726,7 @@ Private Sub b_venta_emp_Click
 	
 	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")
+	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
 		
 		
@@ -2724,7 +2752,7 @@ Private Sub b_venta_emp_Click
 			
 		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")
+		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
@@ -2749,7 +2777,7 @@ Private Sub b_venta_emp_Click
 		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 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
@@ -2806,7 +2834,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"

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' 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/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: 5.09.14
 	'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_CLIEPROD_Click,2471,6,Diseñador Visual,principal.bal,-100,6,C_Cliente,Class_Globals,75,0,C_Cliente,B4XPage_Appear,409,6,C_Principal,B4XPage_Appear,207,6,Diseñador Visual,cliente.bal,-100,1,C_Principal,JobDone,1701,0,C_Principal,cargar____Click,1512,0,C_Principal,cargar_Click,1357,0,C_Principal,connecta_Click,2276,0,C_Principal,b_venta_emp_Click,2757,5
 SelectedBuild=0
 VisibleModules=1,2,3,4,5,6,7,8,9,10,16

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="5.09.14"
 	android:installLocation="internalOnly">
 	
 	<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="33"/>