From 0093cd82dad8cbe7336ab06732df6bc84389caec Mon Sep 17 00:00:00 2001
From: Rene Molina <Rene.Molina@adssistemas.mx>
Date: Thu, 23 Jan 2020 20:03:13 -0700
Subject: [PATCH] -contratos tipos

---
 App_Code/ClsPaginas.vb      | 22 +++++++++-------------
 Contratos/Contratos.aspx.vb |  2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index c096aacfe..fbafc00cb 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -1675,21 +1675,17 @@ Public Class ClsPaginas
     End Property
     Property GlobalDTContratosTipos(CveEmpresa As Integer) As DataTable
         Get
-            Dim AppNombre As String = String.Format("GlobalDTContratosTipos{0}", CveEmpresa)
+            Dim AppNombre As String = String.Format("GlobalDTContratosTipos{0}", CveEmpresa)
+
+            'sino existe, recarga los datos
             If Application(AppNombre) Is Nothing Then
                 Dim ObjContratos As New ClsContratos
-                If ObjContratos.GetContratosTipos(CveEmpresa) Then
-                    Application(AppNombre) = ObjContratos.DtResultados
-                    If CveEmpresa <> -1 Then
-                        Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), String.Format("CveEmpresa = {0}", CveEmpresa), "", DataViewRowState.CurrentRows)
-                        GlobalDTContratosTipos = Dv.ToTable
-                        Dv.Dispose()
-                    Else
-                        GlobalDTContratosTipos = DirectCast(Application(AppNombre), DataTable)
-                    End If
-                End If
-                End If
-                GlobalDTContratosTipos = DirectCast(Application("GlobalDTContratosTipos"), DataTable)
+                If ObjContratos.GetContratosTipos(CveEmpresa) Then Application(AppNombre) = ObjContratos.DtResultados
+                ObjContratos.Dispose()
+            End If
+
+            GlobalDTContratosTipos = DirectCast(Application(AppNombre), DataTable)
+
         End Get
         Set(value As DataTable)
             Dim AppNombre As String = String.Format("GlobalDTContratosTipos{0}", CveEmpresa)
diff --git a/Contratos/Contratos.aspx.vb b/Contratos/Contratos.aspx.vb
index 976a3d90c..58229e426 100644
--- a/Contratos/Contratos.aspx.vb
+++ b/Contratos/Contratos.aspx.vb
@@ -22,7 +22,7 @@ Partial Class Contratos_Contratos
         DdlClientes.Items.Insert(0, New ListItem("Todos", "-1"))
         DdlClientes.DataBind()
 
-        DdlTipo.DataSource = GlobalDTContratosTipos().FiltraParametros($"CveEmpresa={UsuarioActual.CveEmpresa}")
+        DdlTipo.DataSource = GlobalDTContratosTipos(UsuarioActual.CveEmpresa)
         DdlTipo.Items.Insert(0, New ListItem("Todos", "-1"))
         DdlTipo.DataBind()