From 03d70a2ae88f415bff5ad2c2e8ab17aa40a21d02 Mon Sep 17 00:00:00 2001 From: rrene Date: Mon, 21 Jun 2021 12:00:01 -0700 Subject: [PATCH 1/5] cambio de cuenta de infonavit --- AC/RegNomina.aspx.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AC/RegNomina.aspx.vb b/AC/RegNomina.aspx.vb index cc9ed0b49..38dda7c00 100644 --- a/AC/RegNomina.aspx.vb +++ b/AC/RegNomina.aspx.vb @@ -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 From 9066bdac16c276364b52d34c0c2d3252a0141c11 Mon Sep 17 00:00:00 2001 From: rrene Date: Tue, 22 Jun 2021 07:35:22 -0700 Subject: [PATCH 2/5] -- productos SAT --- App_Code/ClsPaginas.vb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 2e98da7cf..f8f2a6677 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -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 From df2d6b75fe80abe603c3c910f8117541228c16c4 Mon Sep 17 00:00:00 2001 From: rrene Date: Tue, 22 Jun 2021 07:35:53 -0700 Subject: [PATCH 3/5] =?UTF-8?q?filtro=20MSI=20en=20dep=C3=B3sito=20de=20ca?= =?UTF-8?q?ja?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App_Code/ClsBancos.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/App_Code/ClsBancos.vb b/App_Code/ClsBancos.vb index fff9651c8..0a78eb6fe 100644 --- a/App_Code/ClsBancos.vb +++ b/App_Code/ClsBancos.vb @@ -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 From 685e0e772daccd4587bbbbf693b92818eb72d33e Mon Sep 17 00:00:00 2001 From: rrene Date: Tue, 22 Jun 2021 07:36:27 -0700 Subject: [PATCH 4/5] productos SAT --- General/SaldosIniciales.aspx.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/General/SaldosIniciales.aspx.vb b/General/SaldosIniciales.aspx.vb index 3470619bb..96c1fc580 100644 --- a/General/SaldosIniciales.aspx.vb +++ b/General/SaldosIniciales.aspx.vb @@ -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 From 1a8ae111e58b6335dd0a244de676328f2e08420a Mon Sep 17 00:00:00 2001 From: rrene Date: Tue, 22 Jun 2021 08:01:36 -0700 Subject: [PATCH 5/5] GlobalDTPSSAT --- Compras/Compras.aspx.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb index ce5eb995c..307c6c707 100644 --- a/Compras/Compras.aspx.vb +++ b/Compras/Compras.aspx.vb @@ -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