AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2021-06-22 09:31:20 -07:00
parent e40c0a4668 1a8ae111e5
commit 3fe555def5
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AC/RegNomina.aspx.vb
View File

@@ -374,7 +374,7 @@ Partial Class AC_RegNomina
Dim IdCtaDevolucionISPT As Integer = 1745
Dim IdCtaMatriz As Integer
Dim IdCtaCuotaSindical As Integer = 644
Dim IdCtaInfonavit As Integer = 2018
Dim IdCtaInfonavit As Integer = 4478
Dim IdCtaFonacot As Integer = 646
Dim IdCtaServicioMedico As Integer = 643
Dim IdCtaPension As Integer = 643

3
App_Code/ClsBancos.vb
View File

@@ -3504,7 +3504,7 @@ Public Class ClsBancos
#End Region
#Region "PagosCajaChica"
Public Function GetPagosCajaChica(FechaI As String, FechaF As String, CveEmpresa As Integer, CveCuenta As Integer, Optional TipoPago As Integer = -1, Optional CveSubProyecto As Integer = -1) As Boolean
Public Function GetPagosCajaChica(FechaI As String, FechaF As String, CveEmpresa As Integer, CveCuenta As Integer, Optional TipoPago As Integer = -1, Optional CveSubProyecto As Integer = -1, Optional MSI As Integer = -1) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_BancosCajaChicaPagosGet")
@@ -3515,6 +3515,7 @@ Public Class ClsBancos
.Add("@CveCuenta", SqlDbType.Int).Value = CveCuenta
.Add("@TipoChequeEfectivo", SqlDbType.Int).Value = TipoPago
.Add("@CveSubProyecto", SqlDbType.Int).Value = CveSubProyecto
.Add("@MSI", SqlDbType.Int).Value = MSI
End With
Try

7
App_Code/ClsPaginas.vb
View File

@@ -293,7 +293,7 @@ Public Class ClsPaginas
Application("Directorio") = value
End Set
End Property
Public Shared ReadOnly Property GlobalDTPSATPS(SATClaveProductoServicio As String, Optional CveSATPS As Integer = -1) As DataTable
Public Shared ReadOnly Property GlobalDTPSATPS(SATProductoServicio As String, Optional CodigoSAT As String = "-1", Optional CveSATPS As Integer = -1) As DataTable
Get
'If Application("GlobalDTPSATPS") Is Nothing Then
' Dim ObjGrales As New ClsGenerales
@@ -304,13 +304,12 @@ Public Class ClsPaginas
'GlobalDTPSATPS = DirectCast(Application("GlobalDTPSATPS"), EnumerableRowCollection(Of DataRow)).CopyToDataTable
Dim ObjGrales As New ClsGenerales
If ObjGrales.GetSATProductosServicios(SATClaveProductoServicio, CveSATPS) Then
If ObjGrales.GetSATProductosServicios(CodigoSAT, SATProductoServicio, CveSATPS) Then
GlobalDTPSATPS = ObjGrales.DtResultados
Else
GlobalDTPSATPS = Nothing
End If
'GlobalDTPSATPS = DirectCast(Application("GlobalDTPSATPS"), EnumerableRowCollection(Of DataRow)).CopyToDataTable
ObjGrales.Dispose()
End Get
'Set(value As DataTable)
' Application("GlobalDTPSATPS") = value

6
Compras/Compras.aspx.vb
View File

@@ -15446,7 +15446,7 @@ Partial Class Compras_Compras
'SI PUEDE RECIBIR POR OC Y COMPRA
' si usa almacen, si tiene activado que reciba por OC, y que si la compra tipo Proveedor. que lo muestre
If UsuarioActual.CveEmpresa = 119 AndAlso UsuarioActual.Empresa.UsaInventarios And UsuarioActual.Empresa.Funcionalidad(131).ToEntero > 0 AndAlso CveTipoConcepto = 1 Then
If UsuarioActual.Empresa.UsaInventarios And UsuarioActual.Empresa.Funcionalidad(131).ToEntero > 0 AndAlso CveTipoConcepto = 1 Then
DivOCVinculaInv.Visible = True
End If
@@ -18235,12 +18235,12 @@ Partial Class Compras_Compras
If Version = "3.3" And CveSATPS > 0 Then
Dim DrPSSAT As DataRow = Nothing
If CargaXml Then
DrPSSAT = GlobalDTPSATPS("-1", CveSATPS).FiltroPrimero("")
DrPSSAT = GlobalDTPSATPS("-1", CveSATPS.ToString).FiltroPrimero("")
'If GlobalDTPSATPS().FiltraParametros(String.Format("SATClavePS={0}", CveSATPS)).Rows.Count > 0 Then
' DrPSSAT = GlobalDTPSATPS().FiltraParametros(String.Format("SATClavePS={0}", CveSATPS)).Rows(0)
'End If
Else
DrPSSAT = GlobalDTPSATPS("-1", CveSATPS).FiltroPrimero("") '= GlobalDTPSATPS().FiltroPrimero(String.Format("SATClavePS={0}", CveSATPS))
DrPSSAT = GlobalDTPSATPS("-1", CveSATPS.ToString).FiltroPrimero("") '= GlobalDTPSATPS().FiltroPrimero(String.Format("SATClavePS={0}", CveSATPS))
'If GlobalDTPSATPS().FiltraParametros(String.Format("CveSATPS={0}", CveSATPS)).Rows.Count > 0 Then
' DrPSSAT = GlobalDTPSATPS().FiltraParametros(String.Format("CveSATPS={0}", CveSATPS)).Rows(0)
'End If

2
General/SaldosIniciales.aspx.vb
View File

@@ -576,7 +576,7 @@ Partial Class General_SaldosIniciales
Dim CveTipoPS As Integer = If(TipoPS.ToUpper = "PRODUCTO", 2, 1)
Dim CveClasificacion As Integer = GlobalDTClasificaciones(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveClasificacion", $"Clasificacion = '{Clasificacion}'").ToString.ToEntero
Dim CveUnidadMedida As Integer = GlobalDTUnidadesMedida(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveUnidadMedida", $"UnidadMedida = '{UnidadMedida}' OR Abreviatura = '{UnidadMedida}'").ToString.ToEntero
Dim CveSATPS As Integer = GlobalDTPSATPS.FiltroPrimeroValor("CveSATPS", $"SATClavePS = '{SATClavePS}'").ToString.ToEntero
Dim CveSATPS As Integer = ClsPaginas.GlobalDTPSATPS("-1", CodigoSAT:=SATClavePS).FiltroPrimeroValor("CveSATPS", "").ToEntero
Dim CveTamaño As Integer = GlobalDTAcumTamaños.FiltroPrimeroValor("CveTamaño", $"Tamaño = '{Tamaño}' AND CveEmpresa = {UsuarioActual.CveEmpresa}").ToString.ToEntero
Dim CveClasificacion2 As Integer = GlobalDTClasificaciones2(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveClasificacion", $"Clasificacion = '{Clasificacion2}'").ToString.ToEntero
Dim CveClasificacionDetalle As Integer = GlobalDTClasificacionesDetalle(UsuarioActual.CveEmpresa, -1).FiltroPrimeroValor("CveClasificacionDetalle", $"ClasificacionDetalle = '{Linea}'").ToString.ToEntero