diff --git a/App_Code/ClsBancos.vb b/App_Code/ClsBancos.vb index 64e685e71..08090d2a5 100644 --- a/App_Code/ClsBancos.vb +++ b/App_Code/ClsBancos.vb @@ -696,7 +696,8 @@ Public Class ClsBancos Public Function GetBancosIE(CveIE As Integer, CveBanco As Integer, CveCuenta As Integer, TipoMovimiento As String, CveTipoTransaccion As Integer, Folio As String, PagueseA As String, Importe As Double, CveMoneda As Integer, EsAbonoEnCuenta As Integer, FueConciliado As Integer, CveEstatusIE As Integer, FechaInicio As Date, FechaFin As Date, FechaAplicacionInicio As Date, FechaAplicacionFin As Date, - FechaConciliadoInicio As Date, FechaConciliadoFin As Date, CveUsuarioConcilio As Integer, TImporte As Double, CveEmpresa As Integer, Optional CveEstatusNotificacion As Integer = -1, Optional CveCuentaTarjeta As Integer = -1) As Boolean + FechaConciliadoInicio As Date, FechaConciliadoFin As Date, CveUsuarioConcilio As Integer, TImporte As Double, CveEmpresa As Integer, + Optional CveEstatusNotificacion As Integer = -1, Optional CveCuentaTarjeta As Integer = -1, Optional TopSelect As Integer = 10000) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Banc_IEGet") @@ -725,6 +726,7 @@ Public Class ClsBancos .Add("@CveEstatusNotificacion", SqlDbType.Int).Value = CveEstatusNotificacion .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CveCuentaTarjeta", SqlDbType.Int).Value = CveCuentaTarjeta + .Add("@TopSelect", SqlDbType.Int).Value = TopSelect End With diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb index 0904a892b..ed079f13c 100644 --- a/App_Code/ClsClientes.vb +++ b/App_Code/ClsClientes.vb @@ -261,7 +261,7 @@ Public Class ClsClientes End Sub Public Function GetClientes(CveCliente As Integer, Nombre As String, Codigo As String, NombreCorto As String, RFC As String, Telefono As String, Mail As String, CveSubProyecto As Integer, CveEmpresa As Integer, Optional Estatus As Integer = 1, Optional Notificar As String = "-1", Optional CvePrecioLista As Integer = -1, Optional CveClienteClasificacion As Integer = -1, - Optional TipoCliente As Integer = -1, Optional CveVendedor As Integer = -1, Optional PermiteCreditoFiltro As Integer = -1) As Boolean + Optional TipoCliente As Integer = -1, Optional CveVendedor As Integer = -1, Optional PermiteCreditoFiltro As Integer = -1, Optional TopSelect As Integer = 10000) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_ClientesGet") @@ -282,6 +282,7 @@ Public Class ClsClientes .Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto .Add("@CveVendedor", SqlDbType.Int).Value = CveVendedor .Add("@PermiteCredito", SqlDbType.Int).Value = PermiteCreditoFiltro + .Add("@TopSelect", SqlDbType.Int).Value = TopSelect End With Try SqlAdapter.Fill(Data) diff --git a/App_Code/ClsCompProveedores.vb b/App_Code/ClsCompProveedores.vb index 813a15016..7532b38b7 100644 --- a/App_Code/ClsCompProveedores.vb +++ b/App_Code/ClsCompProveedores.vb @@ -297,7 +297,7 @@ Public Class ClsCompProveedores Public Function GetProveedores(tipoConsulta As TipoConsulta, CveProveedor As Integer, Codigo As String, RazonSocial As String, NombreComercial As String, NombreCorto As String, RFC As String, ContactoNombre As String, Telefono As String, Estatus As Integer, CveEmpresa As Integer, Optional CveTipoProveedor As Integer = -1, Optional CveUsuarioResponsable As Integer = -1, - Optional CveMonedaPreferente As Integer = -1, Optional CveProveedorClasificacion As Integer = -1) As Boolean + Optional CveMonedaPreferente As Integer = -1, Optional CveProveedorClasificacion As Integer = -1, Optional TopSelect As Integer = 10000) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Comp_ProveedoresGet") @@ -318,6 +318,7 @@ Public Class ClsCompProveedores .Add("@CveUsuarioResponsable", SqlDbType.Int).Value = CveUsuarioResponsable .Add("@CveProveedorClasificacion", SqlDbType.Int).Value = CveProveedorClasificacion .Add("@CveMonedaPreferente", SqlDbType.Int).Value = CveMonedaPreferente + .Add("@TopSelect", SqlDbType.Int).Value = TopSelect End With Try diff --git a/App_Code/ClsCompras.vb b/App_Code/ClsCompras.vb index 7f1873b42..88fb94258 100644 --- a/App_Code/ClsCompras.vb +++ b/App_Code/ClsCompras.vb @@ -143,7 +143,8 @@ Public Class ClsCompras Return Retorno End Function - Public Function GetCompras(CveEmpresa As Integer, TipoDocto As String, Folio As String, FolioFiscal As String, Codigo As String, Proveedor As String, FechaI As String, FechaF As String, Descripcion As String, Observaciones As String, Optional CveProveedor As Integer = -1) As Boolean + Public Function GetCompras(CveEmpresa As Integer, TipoDocto As String, Folio As String, FolioFiscal As String, Codigo As String, Proveedor As String, FechaI As String, + FechaF As String, Descripcion As String, Observaciones As String, Optional CveProveedor As Integer = -1, Optional TopSelect As Integer = 10000) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Comp_ComprasGetBuscar") @@ -160,6 +161,7 @@ Public Class ClsCompras .Add("@Descripcion", SqlDbType.VarChar).Value = Descripcion .Add("@Observaciones", SqlDbType.VarChar).Value = Observaciones .Add("@CveProveedor", SqlDbType.Int).Value = CveProveedor + .Add("@TopSelect", SqlDbType.Int).Value = TopSelect End With Try diff --git a/App_Code/ClsProductosServicios.vb b/App_Code/ClsProductosServicios.vb index 4160a2279..055d4bf36 100644 --- a/App_Code/ClsProductosServicios.vb +++ b/App_Code/ClsProductosServicios.vb @@ -204,9 +204,12 @@ Public Class ClsProductosServicios CveConexion = 0 End If - End Sub + End Sub #End Region - Public Function GetPS(CvePS As Integer, CveClasificacion As Integer, CveEmpresa As Integer, Optional Codigo As String = "-1", Optional Codigo2 As String = "-1", Optional CodigoBarras As String = "-1", Optional PS As String = "-1", Optional EsPaquete As Integer = -1, Optional CveSubProyecto As Integer = -1, Optional pAplicaParaVenta As Integer = -1, Optional pEstado As Integer = -1, Optional CveClasificacionCosto As Integer = -1, Optional CveTipoPS As Integer = -1, Optional CveCompuesto As Integer = -1, Optional SATClavePS As String = "-1") As Boolean + Public Function GetPS(CvePS As Integer, CveClasificacion As Integer, CveEmpresa As Integer, Optional Codigo As String = "-1", Optional Codigo2 As String = "-1", + Optional CodigoBarras As String = "-1", Optional PS As String = "-1", Optional EsPaquete As Integer = -1, Optional CveSubProyecto As Integer = -1, + Optional pAplicaParaVenta As Integer = -1, Optional pEstado As Integer = -1, Optional CveClasificacionCosto As Integer = -1, Optional CveTipoPS As Integer = -1, + Optional CveCompuesto As Integer = -1, Optional SATClavePS As String = "-1", Optional TopSelect As Integer = 10000) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_ProductosServiciosGet") @@ -227,6 +230,7 @@ Public Class ClsProductosServicios .Add("@CveTipoPS", SqlDbType.Int).Value = CveTipoPS .Add("@CveCompuesto", SqlDbType.Int).Value = CveCompuesto .Add("@SATClavePS", SqlDbType.VarChar).Value = SATClavePS + .Add("@TopSelect", SqlDbType.Int).Value = TopSelect End With Try diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index f0223a50f..998375e3e 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -1546,10 +1546,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Public Function GetPersonal2(CvePersonal As Integer, Codigo As String, Nombre As String, NSS As String, RFC As String, CveTurno As Integer, CvePuesto As Integer, - CveDepartamento As Integer, CveRuta As Integer, CveEscolaridad As Integer, CveEstadoCivil As Integer, CveGenero As Integer, - CveEstatusPersonal As Integer, CveSubProyecto As Integer, CveClienteAsignado As Integer, HorarioTrabajo As String, CveSupervisor As Integer, - CveTipoPeriodo As Integer, CveMetodoPago As Integer, CveTipoContrato As Integer, CveMotivoBaja As Integer, CveProyecto As Integer, - FechaIFinContrato As String, FechaFFinContrato As String, FechaIIngreso As String, FechaFIngreso As String, SqlStr As String, NCaracteristicas As Integer, CveEmpresa As Integer) As Boolean + CveDepartamento As Integer, CveRuta As Integer, CveEscolaridad As Integer, CveEstadoCivil As Integer, CveGenero As Integer, + CveEstatusPersonal As Integer, CveSubProyecto As Integer, CveClienteAsignado As Integer, HorarioTrabajo As String, CveSupervisor As Integer, + CveTipoPeriodo As Integer, CveMetodoPago As Integer, CveTipoContrato As Integer, CveMotivoBaja As Integer, CveProyecto As Integer, + FechaIFinContrato As String, FechaFFinContrato As String, FechaIIngreso As String, FechaFIngreso As String, SqlStr As String, NCaracteristicas As Integer, + CveEmpresa As Integer, Optional TopSelect As Integer = 10000) As Boolean Dim Retorno As Boolean = False SqlDataAdapter("PA_RH_Personal2Get") @@ -1584,6 +1585,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo .Add("@SqlStr ", SqlDbType.VarChar).Value = SqlStr .Add("@NCaracteristicas", SqlDbType.Int).Value = NCaracteristicas .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@TopSelect", SqlDbType.Int).Value = TopSelect End With Try diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index 130483e9c..f78d1e3bf 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -204,7 +204,7 @@ Public Class ClsVentas Public Function GetVentas(CveEmpresa As Integer, TipoDocto As String, Serie As String, Folio As Integer, Codigo As String, CveCliente As Integer, CveSubProyecto As Integer, CveEstatus As Integer, CveUsuario As Integer, FechaI As String, FechaF As String, FolioFiscal As String, Optional CveClienteSucursal As Integer = -1, Optional CvePS As Integer = -1, Optional PedidoContrato As String = "-1", Optional OrdenCompra As String = "-1", Optional CveUsuarioConsulta As Integer = -1, Optional ClienteRFC As String = "-1", - Optional CveEmpresaCRM As Integer = -1, Optional CveAcercamientoCRM As Integer = -1) As Boolean + Optional CveEmpresaCRM As Integer = -1, Optional CveAcercamientoCRM As Integer = -1, Optional TopSelect As Integer = 1000) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_VentasGetBuscar") @@ -229,6 +229,7 @@ Public Class ClsVentas .Add("@ClienteRFC", SqlDbType.VarChar).Value = ClienteRFC .Add("@CveEmpresaCRM", SqlDbType.Int).Value = CveEmpresaCRM .Add("@CveAcercamientoCRM", SqlDbType.Int).Value = CveAcercamientoCRM + .Add("@TopSelect", SqlDbType.Int).Value = TopSelect End With Try diff --git a/Bancos/PopUpBuscarIE.aspx.vb b/Bancos/PopUpBuscarIE.aspx.vb index 28e66b31b..d46b4d027 100644 --- a/Bancos/PopUpBuscarIE.aspx.vb +++ b/Bancos/PopUpBuscarIE.aspx.vb @@ -74,7 +74,7 @@ Partial Class Bancos_PopUpBuscarIE Dim ObjBancosIE As New ClsBancos If ObjBancosIE.GetBancosIE(-1, DdlBanco.SelectedValue.ToEntero, DdlCuenta.SelectedValue.ToEntero, "-1", -1, Folio, "-1", -1, -1, -1, -1, -1, txtFechaI.Text.ToDate, - MaxFecha.ToShortDateString.ToDate, MinFecha, MaxFecha, MinFecha, MaxFecha, -1, -1, UsuarioActual.CveEmpresa) Then + MaxFecha.ToShortDateString.ToDate, MinFecha, MaxFecha, MinFecha, MaxFecha, -1, -1, UsuarioActual.CveEmpresa, TopSelect:=100) Then DtDatos = ObjBancosIE.DtResultados 'If(TxtFolio.Text <> "", ObjBancosIE.DtResultados.FiltraParametros(String.Format("Folio Like '{0}'", TxtFolio.Text)), ObjBancosIE.DtResultados) Else Alert("Ocurrió un error al consultar los Anticipos", TipoMensaje.MsgError) diff --git a/Compras/PopUpBuscarFolioC.aspx.vb b/Compras/PopUpBuscarFolioC.aspx.vb index 62f560242..de4e0e45b 100644 --- a/Compras/PopUpBuscarFolioC.aspx.vb +++ b/Compras/PopUpBuscarFolioC.aspx.vb @@ -57,7 +57,7 @@ Partial Class Compras_PopUpBuscarFolioC If ValidarUnFiltroSeleccionado() Then Dim ObjCompras As New ClsCompras() If ObjCompras.GetCompras(UsuarioActual.CveEmpresa, DdlTipoDocto.SelectedValue, Folio, FolioFiscal, Codigo, Proveedor, FechaI, FechaF, Descripcion, Obs, - CveProveedor:=DdlProveedor.SelectedValue.ToEntero) Then + CveProveedor:=DdlProveedor.SelectedValue.ToEntero, TopSelect:=100) Then If ObjCompras.DtResultados.Rows.Count > 0 Then LtlTotalRegistros.Text = ObjCompras.DtResultados.Rows.Count.ToString.FormatoNumero(0) GV.DataSource = ObjCompras.DtResultados diff --git a/Compras/PopUpBuscarProveedor.aspx.vb b/Compras/PopUpBuscarProveedor.aspx.vb index e86761bd7..cef681977 100644 --- a/Compras/PopUpBuscarProveedor.aspx.vb +++ b/Compras/PopUpBuscarProveedor.aspx.vb @@ -61,7 +61,8 @@ Partial Class Compras_PopUpBuscarProveedor CveTipoProveedor = DdlTipoProveedor.SelectedValue.ToEntero If ValidarUnFiltroSeleccionado() Then - If ObjProveedor.GetProveedores(ClsCompProveedores.TipoConsulta.ParaUsoEnEmpresa, -1, Codigo, RazonSocial, NombreComercial, NombreCorto, RFC, Contacto, Telefono, -1, UsuarioActual.CveEmpresa, CveTipoProveedor:=CveTipoProveedor) Then + If ObjProveedor.GetProveedores(ClsCompProveedores.TipoConsulta.ParaUsoEnEmpresa, -1, Codigo, RazonSocial, NombreComercial, NombreCorto, RFC, Contacto, Telefono, -1, + UsuarioActual.CveEmpresa, CveTipoProveedor:=CveTipoProveedor, TopSelect:=100) Then If ObjProveedor.DtResultados.Rows.Count > 0 Then LtlTotalRegistros.Text = ObjProveedor.DtResultados.Rows.Count.ToString.FormatoNumero(0) GV.DataSource = ObjProveedor.DtResultados diff --git a/RH/PopUpBuscarPersonal.aspx.vb b/RH/PopUpBuscarPersonal.aspx.vb index 06a779f57..eec974cf1 100644 --- a/RH/PopUpBuscarPersonal.aspx.vb +++ b/RH/PopUpBuscarPersonal.aspx.vb @@ -396,16 +396,19 @@ Partial Class RH_PopUpBuscarPersonal If TxtRFC.Text.Trim <> String.Empty Then Return True If TxtHorarioDe.Text.Trim <> String.Empty Then Return True - If DdlTurnos.SelectedValue.ToEntero > 0 Then Return True - If DdlPuestos.SelectedValue.ToEntero > 0 Then Return True + If DdlTipoPeriodo.SelectedValue.ToEntero > 0 Then Return True + If DdlTipoContrato.SelectedValue.ToEntero > 0 Then Return True If DdlDepartamentos.SelectedValue.ToEntero > 0 Then Return True - If DdlRuta.SelectedValue.ToEntero > 0 Then Return True - If DdlEscolaridad.SelectedValue.ToEntero > 0 Then Return True - If DdlEstadoCivil.SelectedValue.ToEntero > 0 Then Return True If DdlGenero.SelectedValue.ToEntero > 0 Then Return True - If DdlEstatus.SelectedValue.ToEntero > 0 Then Return True - If DdlSubProyecto.SelectedValue.ToEntero > 0 Then Return True + If DdlEstadoCivil.SelectedValue.ToEntero > 0 Then Return True + If DdlEscolaridad.SelectedValue.ToEntero > 0 Then Return True + If DdlTurnos.SelectedValue.ToEntero > 0 Then Return True If DdlClienteAsignado.SelectedValue.ToEntero > 0 Then Return True + If DdlProyecto.SelectedValue.ToEntero > 0 Then Return True + If DdlPuestos.SelectedValue.ToEntero > 0 Then Return True + If DdlSubProyecto.SelectedValue.ToEntero > 0 Then Return True + If DdlRuta.SelectedValue.ToEntero > 0 Then Return True + If DdlEstatus.SelectedValue.ToEntero > 0 Then Return True Return False End Function diff --git a/Ventas/PopUpBuscarClientes.aspx.vb b/Ventas/PopUpBuscarClientes.aspx.vb index 96af8f67b..7a988792a 100644 --- a/Ventas/PopUpBuscarClientes.aspx.vb +++ b/Ventas/PopUpBuscarClientes.aspx.vb @@ -73,7 +73,7 @@ Partial Class PopUpBuscarClientes Dim ObjClientes As New ClsClientes() If ObjClientes.GetClientes(-1, Nombre, Codigo, NombreCorto, RFC, Telefono, Mail, DdlSubProyecto.SelectedValue.ToEntero, UsuarioActual.CveEmpresa, - DdlEstatus.SelectedValue.ToEntero, TipoCliente:=TipoCliente) Then + DdlEstatus.SelectedValue.ToEntero, TipoCliente:=TipoCliente, TopSelect:=100) Then If ObjClientes.DtResultados.Rows.Count > 0 Then LtlTotalRegistros.Text = ObjClientes.DtResultados.Rows.Count.ToString.FormatoNumero(0) GV.DataSource = ObjClientes.DtResultados diff --git a/Ventas/PopUpBuscarFolio.aspx.vb b/Ventas/PopUpBuscarFolio.aspx.vb index 7ecfa5de0..960074304 100644 --- a/Ventas/PopUpBuscarFolio.aspx.vb +++ b/Ventas/PopUpBuscarFolio.aspx.vb @@ -127,7 +127,7 @@ Partial Class PopUpBuscarFolio Dim ObjVentas As New ClsVentas() If ObjVentas.GetVentas(UsuarioActual.CveEmpresa, DdlTipoDocto.SelectedValue, Serie, Folio, Codigo, Cliente.ToEntero, DdlSubProyecto.SelectedValue.ToEntero, DdlEstatusFactura.SelectedValue.ToEntero, DdlUsuario.SelectedValue.ToEntero, FechaI, FechaF, FolioFiscal, If(DdlSucursalCliente.Visible, DdlSucursalCliente.SelectedValue.ToEntero, -1), - DdlPS.SelectedValue.ToEntero, PedidoContrato:=PeidoContrato, OrdenCompra:=OrdenCompra, CveUsuarioConsulta:=UsuarioActual.CveUsuario) Then + DdlPS.SelectedValue.ToEntero, PedidoContrato:=PeidoContrato, OrdenCompra:=OrdenCompra, CveUsuarioConsulta:=UsuarioActual.CveUsuario, TopSelect:=100) Then If ObjVentas.DtResultados.Rows.Count > 0 Then LtlTotalRegistros.Text = ObjVentas.DtResultados.Rows.Count.ToString.FormatoNumero(0) GV.DataSource = ObjVentas.DtResultados @@ -280,6 +280,7 @@ Partial Class PopUpBuscarFolio End Sub Private Function ValidarUnFiltroSeleccionado() As Boolean + If DdlClasificacion.SelectedValue.ToEntero > 0 Then Return True If DdlTipoDocto.SelectedValue <> "-1" Then Return True If DdlSubProyecto.SelectedValue.ToEntero > 0 Then Return True If DdlEstatusFactura.SelectedValue.ToEntero > 0 Then Return True diff --git a/Ventas/PopUpBuscarPs.aspx.vb b/Ventas/PopUpBuscarPs.aspx.vb index 44825d642..986ee61da 100644 --- a/Ventas/PopUpBuscarPs.aspx.vb +++ b/Ventas/PopUpBuscarPs.aspx.vb @@ -68,7 +68,7 @@ Partial Class PopUpBuscarPs Dim ObjPS As New ClsProductosServicios If ObjPS.GetPS(-1, Ddlclasificacion.SelectedValue.ToEntero, UsuarioActual.CveEmpresa, Codigo:=Codigo, CodigoBarras:=CodigoBarras, PS:=Nombre, pEstado:=DdlEstado.SelectedValue.ToEntero, CveTipoPS:=DdlCveTipoPS.SelectedValue.ToEntero, pAplicaParaVenta:=DdlAplicaVenta.SelectedValue.ToEntero, - CveCompuesto:=DdlCompuesto.SelectedValue.ToEntero) Then + CveCompuesto:=DdlCompuesto.SelectedValue.ToEntero, TopSelect:=100) Then GvDatos.DataSource = ObjPS.DtResultados dvbusqueda.Visible = True Else @@ -103,7 +103,9 @@ Partial Class PopUpBuscarPs If TxtNombre.Text.Trim <> String.Empty Then Return True If DdlCveTipoPS.SelectedValue.ToEntero > 0 Then Return True + If DdlEstado.SelectedValue.ToEntero > 0 Then Return True If DdlAplicaVenta.SelectedValue.ToEntero > 0 Then Return True + If Ddlclasificacion.SelectedValue.ToEntero > 0 Then Return True If DdlCompuesto.SelectedValue.ToEntero > 0 Then Return True Return False