diff --git a/App_Code/ClsContratos.vb b/App_Code/ClsContratos.vb index 02121ae13..2efbc2f65 100644 --- a/App_Code/ClsContratos.vb +++ b/App_Code/ClsContratos.vb @@ -1629,9 +1629,12 @@ Public Class ClsContratos #Region "T I P O S C O N T R A T O S" - Public Function GetContratosTipos() As Boolean + Public Function GetContratosTipos(CveEmpresa As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Con_ContratosTiposGet") + With SqlAdapter.SelectCommand.Parameters + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With Try SqlAdapter.Fill(Data) Retorno = True diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 468f9e2d7..c096aacfe 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -1673,12 +1673,27 @@ Public Class ClsPaginas Application("GlobalDTContratos") = value End Set End Property - Property GlobalDTContratosTipos() As DataTable + Property GlobalDTContratosTipos(CveEmpresa As Integer) As DataTable Get - GlobalDTContratosTipos = DirectCast(Application("GlobalDTContratosTipos"), DataTable) + Dim AppNombre As String = String.Format("GlobalDTContratosTipos{0}", CveEmpresa) + 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) End Get Set(value As DataTable) - Application("GlobalDTContratosTipos") = value + Dim AppNombre As String = String.Format("GlobalDTContratosTipos{0}", CveEmpresa) + Application(AppNombre) = value End Set End Property Property GlobalDTTipoAlmacen(CveEmpresa As Integer) As DataTable diff --git a/Contratos/CatContratosTipos.aspx b/Contratos/CatContratosTipos.aspx index 4eb20ced6..431a85ed2 100644 --- a/Contratos/CatContratosTipos.aspx +++ b/Contratos/CatContratosTipos.aspx @@ -12,110 +12,110 @@ - - - - - + +
- - - - -
- - Clave + + + + + + + + + + + + + + + +
+ + + + - + - + - - - - - - - - - - - -
+ + Clave - - - - Tipo Contrato + + + + Tipo Contrato - - - - Descripción + + + + Descripción - - Comandos
- - - - - - - - -
+ + +
Comandos
+ + + + + + + + +
- - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - -
+ + +
 
-
- - - -
+ + + + + - - - - - - - - - - - -
+ + + + + + + + +
+
+
diff --git a/Contratos/CatContratosTipos.aspx.vb b/Contratos/CatContratosTipos.aspx.vb index 254d6551d..044ce9b99 100644 --- a/Contratos/CatContratosTipos.aspx.vb +++ b/Contratos/CatContratosTipos.aspx.vb @@ -15,9 +15,9 @@ Partial Class Contratos_CatContratosTipos #Region " CARGAS " Private Sub CargaDatos() Dim Objeto As New ClsContratos - If Objeto.GetContratosTipos() Then + If Objeto.GetContratosTipos(UsuarioActual.CveEmpresa) Then GvContratos.DataSource = Objeto.DtResultados - GlobalDTContratosTipos = Objeto.DtResultados + GlobalDTContratosTipos(UsuarioActual.CveEmpresa) = Objeto.DtResultados End If GvContratos.DataBind() Objeto.Dispose() diff --git a/Empresas/146/Formatos/Factura.rdlc b/Empresas/146/Formatos/Factura.rdlc index 011fa5947..c28587a0e 100644 --- a/Empresas/146/Formatos/Factura.rdlc +++ b/Empresas/146/Formatos/Factura.rdlc @@ -229,8 +229,8 @@ FitProportional 5.8661in 0.03915in - 1.31478in - 1.58997in + 1.10236in + 1.10236in 5