Merge -- Empresas

This commit is contained in:
2021-07-31 12:51:46 -07:00
69 changed files with 17032 additions and 10294 deletions

View File

@@ -445,7 +445,7 @@ Public Class E48 : Implements IHttpHandler, IRequiresSessionState
Property GlobalDTAlmacen(CveEmpresa As Integer, Optional CveTipoAlmacen As Integer = -1, Optional CveEstatus As Integer = 1, Optional CveAlmacen As Integer = -1) As DataTable
Get
Dim AppNombre As String = String.Format("GlobalDTAlmacen-{0}", CveEmpresa)
Dim dttemp As DataTable
Dim dttemp As DataTable = Nothing
'sino existe, recarga los datos
Dim ObjUsr As New ClsInventarios
If ObjUsr.GetAlmacenes(-1, -1, CveEmpresa, -1) Then dttemp = ObjUsr.DtResultados

View File

@@ -343,7 +343,7 @@ Public Class SIGFacturacionCiclica : Implements IHttpHandler, IRequiresSessionSt
Dim DtDetalle As DataTable = Nothing
Dim objContratos As New ClsContratos
If objContratos.GetContratosDetalle(DR("CveContrato").ToString.ToEntero) Then
If objContratos.GetContratosDetalle(DR("CveContrato").ToString.ToEntero, UsuarioActual.CveUsuario) Then
DtDetalle = objContratos.DtResultados.FiltraParametros("CveTipoPresupuesto=2")
Else
DtDetalle = Nothing

View File

@@ -737,7 +737,7 @@ Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState
Dim UsaGlobal As Boolean = True
'verifica existencias
If Pagina.Contiene("ventas/ventas", "oc/oc", "inv/traspaso") AndAlso CveEmpresa.Contiene(72, 80, 119, 140, 141, 152, 153, 159, 160, 161, 162, 163) Then
If Pagina.Contiene("ventas/ventas", "oc/oc", "inv/traspaso") AndAlso CveEmpresa.Contiene(72, 80, 119, 140, 141, 152, 153, 159, 160, 161, 162, 163, 166) Then
UsaGlobal = False
Dim objInv As New ClsInventarios