From 8b311a1a7980d9eacade3ce1549ccfcd865bfea4 Mon Sep 17 00:00:00 2001 From: JPerez Date: Tue, 24 Jun 2025 10:08:49 -0700 Subject: [PATCH 01/11] --Cambios Excel repIVA --- Contabilidad/RepIVA.aspx.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Contabilidad/RepIVA.aspx.cs b/Contabilidad/RepIVA.aspx.cs index 2ddf94156..9125c4783 100644 --- a/Contabilidad/RepIVA.aspx.cs +++ b/Contabilidad/RepIVA.aspx.cs @@ -401,6 +401,11 @@ public partial class Contabilidad_RepIVA : ClsPaginas { excelWorksheet.Columns[k + 1].Style.NumberFormat = "#,##0.00"; } + //FOLIOS + if (excelWorksheet.Columns[k + 1].Name.Contiene("C", "M")) + { + excelWorksheet.Columns[k + 1].Style.HorizontalAlignment = HorizontalAlignmentStyle.Left; + } break; case "IVA Acreditable": //FECHAS,FOLIOS, NUM CUENTA @@ -414,6 +419,11 @@ public partial class Contabilidad_RepIVA : ClsPaginas excelWorksheet.Columns[k + 1].Style.NumberFormat = "0"; excelWorksheet.Columns[k + 1].Style.HorizontalAlignment = HorizontalAlignmentStyle.Left; } + //FOLIOS + if (excelWorksheet.Columns[k + 1].Name.Contiene("E", "Z")) + { + excelWorksheet.Columns[k + 1].Style.HorizontalAlignment = HorizontalAlignmentStyle.Left; + } break; default: break; From 99274e5346d07b1dde6b1673ed2169c6d783be2f Mon Sep 17 00:00:00 2001 From: Luis Carlos Quijada Date: Tue, 24 Jun 2025 16:37:00 -0600 Subject: [PATCH 02/11] Cambios ProductosServicios --- App_Code/ClsProductosServicios.vb | 11 ++++++++--- Ventas/ProductosServicios.aspx | 11 +++++++++++ Ventas/ProductosServicios.aspx.vb | 10 +++++++--- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/App_Code/ClsProductosServicios.vb b/App_Code/ClsProductosServicios.vb index 86c935ff1..2ce03c048 100644 --- a/App_Code/ClsProductosServicios.vb +++ b/App_Code/ClsProductosServicios.vb @@ -34,6 +34,7 @@ Public Class ClsProductosServicios Public Property NumeroParte As String Public Property CodigoBarras As String Public Property PS As String + Public Property PSExtranjero As String Public Property Precio As Double Public Property PrecioMinimo As Double Public Property Oferta As Double @@ -203,7 +204,7 @@ Public Class ClsProductosServicios End Sub #End Region Public Function GetPS(CvePS As Integer, CveClasificacion As Integer, CveEmpresa As Integer, Optional Codigo As String = "-1", Optional NumeroParte As String = "-1", - Optional CodigoBarras As String = "-1", Optional PS As String = "-1", Optional EsPaquete As Integer = -1, Optional CveSubProyecto As Integer = -1, + Optional CodigoBarras As String = "-1", Optional PS As String = "-1", Optional PSExtranjero As String = "-1", Optional EsPaquete As Integer = -1, Optional CveSubProyecto As Integer = -1, Optional pAplicaParaVenta As Integer = -1, Optional pEstado As Integer = -1, Optional CveClasificacionCosto As Integer = -1, Optional CveTipoPS As Integer = -1, Optional CveCompuesto As Integer = -1, Optional SATClavePS As String = "-1", Optional TopSelect As Integer = 10000, Optional CveMarca As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -216,6 +217,7 @@ Public Class ClsProductosServicios .Add("@NumeroParte", SqlDbType.VarChar).Value = NumeroParte .Add("@CodigoBarras", SqlDbType.VarChar).Value = CodigoBarras .Add("@PS", SqlDbType.VarChar).Value = PS + .Add("@PSExtranjero", SqlDbType.VarChar).Value = PSExtranjero .Add("@CveClasificacion", SqlDbType.Int).Value = CveClasificacion .Add("@EsPaquete", SqlDbType.SmallInt).Value = EsPaquete .Add("@AplicaParaVenta", SqlDbType.Int).Value = pAplicaParaVenta @@ -245,6 +247,7 @@ Public Class ClsProductosServicios Me.NumeroParte = Data.Rows(0)("NumeroParte").ToString Me.CodigoBarras = Data.Rows(0)("CodigoBarras").ToString Me.PS = Data.Rows(0)("PS").ToString + Me.PSExtranjero = Data.Rows(0)("PSExtranjero").ToString Precio = Data.Rows(0)("Precio").ToString.ToDouble PrecioMinimo = Data.Rows(0)("PrecioMinimo").ToString.ToDouble Oferta = Data.Rows(0)("Oferta").ToString.ToDouble @@ -402,7 +405,7 @@ Public Class ClsProductosServicios Return Retorno End Function Public Function AddPS(CveClasificacion As Integer, CveClasificacionCosto As Integer, CveUnidadMedida As Integer, Codigo As String, NumeroParte As String, CodigoBarras As String, PS As String, Precio As Double, IVA As Double, RetIVA As Double, Inventariable As Boolean, CveProveedorCompra As Integer, - AplicaParaConcepto As Boolean, AplicaParaVenta As Boolean, CveUsuario As Integer, CveEmpresa As Integer, CveMetodoInventario As Integer, EsPaquete As Integer, + AplicaParaConcepto As Boolean, AplicaParaVenta As Boolean, CveUsuario As Integer, CveEmpresa As Integer, CveMetodoInventario As Integer, EsPaquete As Integer, Optional PSExtranjero As String = "-1", Optional CveTipoPS As Integer = -1, Optional FuePorXML As Boolean = True, Optional TipoServicio As Integer = -1, Optional CveClasificacion2 As Integer = -1, Optional CveMarca As Integer = -1, Optional AlmacenSeccion As String = "", Optional AplicaIEPS As Boolean = False, Optional IEPSPorcentaje As Decimal = -1, Optional CveCompuesto As Integer = -1, Optional CveSATPS As Integer = -1, Optional IEPSGrabaIVA As Boolean = False, Optional VentaMinima As Decimal = 0, @@ -438,6 +441,7 @@ Public Class ClsProductosServicios .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@EsPaquete", SqlDbType.Bit).Value = EsPaquete + .Add("@PSExtranjero", SqlDbType.VarChar).Value = If(PSExtranjero.Length > 845, PSExtranjero.Substring(0, 845), PSExtranjero) .Add("@CveMetodoInventario", SqlDbType.Int).Value = CveMetodoInventario .Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.ReturnValue .Add("@CveTipoPS", SqlDbType.Int).Value = CveTipoPS @@ -687,7 +691,7 @@ Public Class ClsProductosServicios End Function Public Function UpdatePS(CveClasificacion As Integer, CveClasificacionCosto As Integer, CveUnidadMedida As Integer, Codigo As String, NumeroParte As String, CodigoBarras As String, PS As String, Precio As Double, IVA As Double, RetIVA As Double, Inventariable As Boolean, CveProveedorCompra As Integer, - AplicaParaConcepto As Boolean, AplicaParaVenta As Boolean, Estado As Boolean, CveUsuario As Integer, CvePS As Integer, CveMetodoInventario As Integer, EsPaquete As Integer, CveSATPS As Integer, CveEmpresa As Integer, Optional CveTipoPS As Integer = -1, Optional TipoServicio As Integer = -1, + AplicaParaConcepto As Boolean, AplicaParaVenta As Boolean, Estado As Boolean, CveUsuario As Integer, CvePS As Integer, CveMetodoInventario As Integer, EsPaquete As Integer, CveSATPS As Integer, CveEmpresa As Integer, Optional PSExtranjero As String = "-1", Optional CveTipoPS As Integer = -1, Optional TipoServicio As Integer = -1, Optional CveClasificacion2 As Integer = -1, Optional CveMarca As Integer = -1, Optional AlmacenSeccion As String = "", Optional AplicaIEPS As Boolean = False, Optional IEPSPorcentaje As Decimal = -1, Optional CveCompuesto As Integer = -1, Optional IEPSGrabaIVA As Boolean = False, Optional VentaMinima As Decimal = 0, Optional CveMoneda As Integer = 1, Optional RetISR As Double = 0, Optional PrecioMinimo As Decimal = Nothing, Optional CveTipoFactor As Integer = 1, @@ -734,6 +738,7 @@ Public Class ClsProductosServicios .Add("@CveCompuesto", SqlDbType.Int).Value = CveCompuesto .Add("@CveSATPS", SqlDbType.Int).Value = CveSATPS .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@PSExtranjero", SqlDbType.VarChar).Value = PSExtranjero 'Nuevo R: 26/09/2017' .Add("@Inventariable", SqlDbType.Bit).Value = Inventariable diff --git a/Ventas/ProductosServicios.aspx b/Ventas/ProductosServicios.aspx index f9011af81..a5ad37be6 100644 --- a/Ventas/ProductosServicios.aspx +++ b/Ventas/ProductosServicios.aspx @@ -285,6 +285,17 @@ + +
+
+
+ + + +
+
+
+
diff --git a/Ventas/ProductosServicios.aspx.vb b/Ventas/ProductosServicios.aspx.vb index f46fe49a4..d57e9aae0 100644 --- a/Ventas/ProductosServicios.aspx.vb +++ b/Ventas/ProductosServicios.aspx.vb @@ -983,6 +983,7 @@ Partial Class ProductosyServicios TxtLitraje.Text = ObjProductosServicios.DtResultados.Rows(0)("Litraje").ToString TxtPS.Text = ObjProductosServicios.PS + TxtPSExtranjero.Text = ObjProductosServicios.PSExtranjero TxtPrecio.Text = ObjProductosServicios.Precio.ToString("F4") 'no usa N4, porque pone comma TxtPrecioMinimo.Text = ObjProductosServicios.PrecioMinimo.ToString("F4") @@ -1577,10 +1578,12 @@ Partial Class ProductosyServicios End If If CvePS = -1 Then Dim PSS As String = TxtPS.Text.Trim.Replace("|", "") + Dim PSSExtranjero As String = TxtPSExtranjero.Text.Trim.Replace("|", "") If UsuarioActual.CveEmpresa.Contiene(1, 72, 80) Then PSS = PSS.ToUpper + If UsuarioActual.CveEmpresa.Contiene(1, 72, 80) Then PSSExtranjero = PSSExtranjero.ToUpper If ObjProductosServicios.AddPS(DdlClasificacion.SelectedValue.ToEntero, -1, DdlUnidadMedida.SelectedValue.ToEntero, TxtCodigo.Text.Trim, TxtNumeroParte.Text.Trim, TxtCodigoBarras.Text.Trim, PSS, TxtPrecio.Text.Trim.ToDouble, DdlIVA.SelectedValue.ToDouble, (TxtRetIVA.Text.Trim.ToDouble / 100), ChkInventariable.Checked, CveProveedor, True, - ChkAplicaParaVenta.Checked, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveMetodoInv, EsPaquete, CveTipoPS:=DdlTipoPS.SelectedValue.ToEntero, + ChkAplicaParaVenta.Checked, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveMetodoInv, EsPaquete, PSSExtranjero, CveTipoPS:=DdlTipoPS.SelectedValue.ToEntero, FuePorXML:=False, TipoServicio:=-1, CveClasificacion2:=CveClasificacion2, CveMarca:=CveMarca, AlmacenSeccion:=TxtAlmacenSeccion.Text.Trim, AplicaIEPS:=ChkAplicaIeps.Checked, IEPSPorcentaje:=DdlIEPSPorcentaje.SelectedValue.ToDecimal, CveCompuesto:=DdlCompuesto.SelectedValue.ToEntero, CveSATPS:=DdlSATPS.SelectedValue.ToEntero, IEPSGrabaIVA:=ChkIepsIVA.Checked, VentaMinima:=TxtVentaMinima.Text.ToDecimal, @@ -1650,11 +1653,12 @@ Partial Class ProductosyServicios 'End If Dim PSS As String = TxtPS.Text.Trim.Replace("|", "") + Dim PSSExtranjero As String = TxtPSExtranjero.Text.Trim.Replace("|", "") If UsuarioActual.CveEmpresa.Contiene(1, 72, 80) Then PSS = PSS.ToUpper - + If UsuarioActual.CveEmpresa.Contiene(1, 72, 80) Then PSSExtranjero = PSSExtranjero.ToUpper If ObjProductosServicios.UpdatePS(DdlClasificacion.SelectedValue.ToEntero, -1, DdlUnidadMedida.SelectedValue.ToEntero, TxtCodigo.Text.Trim, TxtNumeroParte.Text.Trim, TxtCodigoBarras.Text.Trim, PSS, TxtPrecio.Text.Trim.ToDouble, DdlIVA.SelectedValue.ToDouble, (TxtRetIVA.Text.Trim.ToDouble / 100), ChkInventariable.Checked, CveProveedor, True, - ChkAplicaParaVenta.Checked, ChkEstado.Checked, UsuarioActual.CveUsuario, CvePS, CveMetodoInv, EsPaquete, DdlSATPS.SelectedValue.ToEntero, UsuarioActual.CveEmpresa, + ChkAplicaParaVenta.Checked, ChkEstado.Checked, UsuarioActual.CveUsuario, CvePS, CveMetodoInv, EsPaquete, DdlSATPS.SelectedValue.ToEntero, UsuarioActual.CveEmpresa, PSSExtranjero, CveTipoPS:=DdlTipoPS.SelectedValue.ToEntero, TipoServicio:=-1, CveClasificacion2:=CveClasificacion2, CveMarca:=CveMarca, AlmacenSeccion:=TxtAlmacenSeccion.Text.Trim, AplicaIEPS:=ChkAplicaIeps.Checked, IEPSPorcentaje:=DdlIEPSPorcentaje.SelectedValue.ToDecimal, CveCompuesto:=DdlCompuesto.SelectedValue.ToEntero, IEPSGrabaIVA:=ChkIepsIVA.Checked, VentaMinima:=TxtVentaMinima.Text.ToDecimal, From f2d73b7eeac10f1f39425c48011df69b17ccb17e Mon Sep 17 00:00:00 2001 From: JPerez Date: Tue, 24 Jun 2025 18:45:27 -0700 Subject: [PATCH 03/11] --FIX filtrar porcentaje de IVA al aplicar ant --- Ventas/PVCobranza.aspx.vb | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/Ventas/PVCobranza.aspx.vb b/Ventas/PVCobranza.aspx.vb index 5d6a9c720..67455a4b5 100644 --- a/Ventas/PVCobranza.aspx.vb +++ b/Ventas/PVCobranza.aspx.vb @@ -1358,7 +1358,6 @@ Partial Class Ventas_PVCobranza RemisionesLista.Add(VentaRemision.CveVenta) Dim DtRemisionesPS As New DataTable() - Dim DtPagosFacturaGlobal As New DataTable() If ObjClientes.GetVentasRemisionesTotales(VentaRemision.CveCliente, VentaRemision.CveVenta.ToString(), 1, UsuarioActual.CveEmpresa) Then DtRemisionesPS = ObjClientes.DtResultados.Copy() @@ -1399,6 +1398,21 @@ Partial Class Ventas_PVCobranza If GvRow.DataKey("Tipo").Contiene("NC", "IxC", "Ant") AndAlso GvRow.FCCheckBox("Chk" & GvRow.RowIndex) IsNot Nothing AndAlso GvRow.FCCheckBox("Chk" & GvRow.RowIndex).Checked Then Dim CveFormaPagoAnt = GvRow.DataKey("CveFormaPago").ToEntero() + + If GvRow.DataKey("Tipo").Contiene("Ant") Then + 'SI NO ES AMORTIZACION DE ANTICIPO + If Not CveFormaPagoAnt = 21 Then + CveFormaPagoAnt = 21 + End If + End If + + 'If GvRow.DataKey("Tipo").Contiene("NC") Then + ' 'SI NO ES AMORTIZACION DE ANTICIPO o DEVOLUCION + ' If Not CveFormaPagoAnt.Contiene(21, 11) Then + ' CveFormaPagoAnt = 21 + ' End If + 'End If + Dim Importe = GvRow.FCTextBox(String.Format("TxtAnticipo{0}", GvRow.RowIndex)).Text.ToDecimal() DtPagos.Rows.Add({CveFormaPagoAnt, Importe}) @@ -1423,17 +1437,22 @@ Partial Class Ventas_PVCobranza If TxtImporteEfectivo.Text.ToDecimal > 0 Then Dim tpag As Decimal = LtlSaldo.Text.ToDecimal - PagadoSinEfectivo If TxtImporteEfectivo.Text.ToDecimal < tpag Then tpag = TxtImporteEfectivo.Text.ToDecimal - DtPagos.Rows.Add({1, tpag}) + + If tpag > 0 Then + DtPagos.Rows.Add({1, tpag}) + End If End If Dim PagoMaximo = DtPagos.MAX("Importe") Dim CveFormaPago As Integer = DtPagos.FiltroPrimeroValor("CveFormaPago", $"Importe = {PagoMaximo}").ToEntero() + If CveFormaPago > 0 Then ObjFactura.CveFormaPago = CveFormaPago ObjFactura.CveMetodoPago = 1 ObjFactura.ClaveMetodoPagoSAT = "PUE" ObjFactura.ClaveFormaPagoSAT = GlobalDTVtaFormaPago.FiltroPrimeroValor("ClaveFormaPagoSAT", $"CveFormaPago = {ObjFactura.CveFormaPago}") End If + ObjFactura.FechaPago = Now 'venta de cantado el mismo dia Else 'venta a crédito @@ -2331,19 +2350,23 @@ Partial Class Ventas_PVCobranza DbRowVenta = ObjVentas.DtResultados.Copy().FiltroPrimero("") End If ObjVentas.Dispose() - Dim tTipoDocto As String + + Dim tTipoDocto As String = "" + Dim PorcentajeIVA As Decimal = -1 + If DbRowVenta IsNot Nothing Then CveCliente = DbRowVenta("CveCliente").ToString().ToEntero() CveVendedor = DbRowVenta("CveVendedor").ToString().ToEntero() tTipoDocto = DbRowVenta("TipoDocto").ToString() + PorcentajeIVA = DbRowVenta("PorcentajeIVA").ToString().ToDecimal() End If If CveCliente > 0 Then - CargaAnticipos(CveCliente, tTipoDocto) + CargaAnticipos(CveCliente, tTipoDocto, PorcentajeIVA) End If End Sub - Private Sub CargaAnticipos(CveCliente As Integer, TipoDocto As String) + Private Sub CargaAnticipos(CveCliente As Integer, TipoDocto As String, PorcentajeIVA As Decimal) If CveCliente > 0 Then Dim ObjMovtos As New ClsMovimientos() If ObjMovtos.GetAnticiposNCIxCCliente(CveCliente) Then @@ -2355,7 +2378,8 @@ Partial Class Ventas_PVCobranza If TipoDocto = "Ant" Then TipoAnticipo = " 'IxC' " If Me.TmpDTAnticiposNCIxCCliente IsNot Nothing Then - GVAnticipos.DataSource = Me.TmpDTAnticiposNCIxCCliente.FiltraParametros($"ISTotal = 0 AND Saldo > 0 AND Tipo IN ({TipoAnticipo}) ") + GVAnticipos.DataSource = Me.TmpDTAnticiposNCIxCCliente.FiltraParametros($"ISTotal = 0 AND Saldo > 0 AND Tipo IN ({TipoAnticipo}) AND (PorcentajeIVA = {PorcentajeIVA} OR Tipo = 'IxC')") + 'GVAnticipos.DataSource = Me.TmpDTAnticiposNCIxCCliente.FiltraParametros($"ISTotal = 0 AND Saldo > 0 AND Tipo IN ({TipoAnticipo})") Else GVAnticipos.DataSource = Nothing End If From fe01f3ef40ef1177b130966f9349b62348d6efd6 Mon Sep 17 00:00:00 2001 From: rrene Date: Tue, 24 Jun 2025 19:19:06 -0700 Subject: [PATCH 04/11] - --- Ashx/GenerarPDFFactura.ashx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ashx/GenerarPDFFactura.ashx b/Ashx/GenerarPDFFactura.ashx index c6d59baaf..bbd38daae 100644 --- a/Ashx/GenerarPDFFactura.ashx +++ b/Ashx/GenerarPDFFactura.ashx @@ -161,8 +161,8 @@ Public Class GenerarPDFFactura : Implements IHttpHandler Dim rutaReporte As String = "Empresas\Grales\Formatos\FacturaSALI.rdlc" - Dim QR As ClbNegBICFDv3_2.ClsNegCBBGenerar = New ClbNegBICFDv3_2.ClsNegCBBGenerar() - Dim cQr As Byte() = QR.GenerarCBBBytes(objxml.emisor.Rfc, objxml.receptor.Rfc, objxml.comprobante.Total, objxml.complemento.UUID) + ' Dim QR As Byte() 'ClbNegBICFDv3_2.ClsNegCBBGenerar = New ClbNegBICFDv3_2.ClsNegCBBGenerar() + Dim cQr As Byte() = Nothing ' = QR.GenerarCBBBytes(objxml.emisor.Rfc, objxml.receptor.Rfc, objxml.comprobante.Total, objxml.complemento.UUID) Dim parametros As List(Of ReportParameter) = New List(Of ReportParameter)() parametros.Add(New ReportParameter("comprobante_Certificado", objxml.comprobante.Certificado)) parametros.Add(New ReportParameter("comprobante_CondicionesDePago", objxml.comprobante.CondicionesDePago)) From 548a4fa868f9b6955c7c0b7023b7487bd303ff15 Mon Sep 17 00:00:00 2001 From: rrene Date: Tue, 24 Jun 2025 19:19:16 -0700 Subject: [PATCH 05/11] - --- App_Code/ClsPaginas.vb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 75e9ec9a6..5753a6ec5 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -1022,7 +1022,7 @@ Public Class ClsPaginas For Each file As String In files Dim fi As IO.FileInfo = New IO.FileInfo(file) - If fi.LastAccessTime Date: Tue, 24 Jun 2025 19:19:36 -0700 Subject: [PATCH 06/11] - --- App_Code/ClsNominas.vb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index b4d3bd9eb..16dfd0000 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -35,6 +35,9 @@ Public Class ClsNominas Public Property FolioSolicitud As Integer + Public Property SalarioDiario As Double + Public Property SDI As Double + Public Property SBC As Double Public Property RegistroPatronal As String Public Property SerieFolio As String @@ -1102,6 +1105,10 @@ Public Class ClsNominas Me.CveUsuario = Data.Rows(0)("CveUsuario").ToString.ToEntero Me.Usuario = Data.Rows(0)("Usuario").ToString Me.CveEmpresa = Data.Rows(0)("CveEmpresa").ToString.ToEntero + Me.SalarioDiario = Data.Rows(0)("SalarioDiario").ToString.ToDecimal() + Me.SDI = Data.Rows(0)("SDI").ToString.ToDecimal() + Me.SBC = Data.Rows(0)("SBC").ToString.ToDecimal() + End If Retorno = True Catch ex As Exception From b510c955ab13312dfb7ca2ab9a799959586d8170 Mon Sep 17 00:00:00 2001 From: rrene Date: Tue, 24 Jun 2025 19:20:39 -0700 Subject: [PATCH 07/11] - --- Contabilidad/RepBalanzaComprobacion.aspx.vb | 2 +- asmx/WS_PuntoVenta.asmx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Contabilidad/RepBalanzaComprobacion.aspx.vb b/Contabilidad/RepBalanzaComprobacion.aspx.vb index 675c620ff..59c8f5fb0 100644 --- a/Contabilidad/RepBalanzaComprobacion.aspx.vb +++ b/Contabilidad/RepBalanzaComprobacion.aspx.vb @@ -188,7 +188,7 @@ Partial Class Contabilidad2_RepBalanzaComprobacion End If 'Acomoda Deudor y Acreedor - If e.Row.DBCampo("CveTipo") = "1" Then + If e.Row.DBCampo("CveTipo") = "0" Then e.Row.FCLabel("LbSaldoInicial").Text = String.Format("{0} ", e.Row.DBCampo("SaldoInicial").FormatoNumero) e.Row.FCLabel("LbSaldoInicial").Style.Remove("padding-right") e.Row.FCLabel("LbSaldoActual").Text = " " diff --git a/asmx/WS_PuntoVenta.asmx b/asmx/WS_PuntoVenta.asmx index 9b420eaeb..1e8124359 100644 --- a/asmx/WS_PuntoVenta.asmx +++ b/asmx/WS_PuntoVenta.asmx @@ -1397,11 +1397,11 @@ Public Class WS_PuntoVenta Dim objInventario As New ClsInventarios Dim Respuesta As New RespuestaWS - If objInventario.GetConceptoSAT() Then - Respuesta.Datos = objInventario.DtResultados '.FiltraParametros(String.Format("CveVendedor={0}", CveEmpresa)) - Respuesta.Datos.TableName = "Inv_Conceptos" - Respuesta.HuboError = False - End If + 'If objInventario.GetConceptoSAT() Then + ' Respuesta.Datos = objInventario.DtResultados '.FiltraParametros(String.Format("CveVendedor={0}", CveEmpresa)) + ' Respuesta.Datos.TableName = "Inv_Conceptos" + ' Respuesta.HuboError = False + 'End If objInventario.Dispose() Return Respuesta From 23f7614d8f84341a53345079f7759fb9b7a530b1 Mon Sep 17 00:00:00 2001 From: rrene Date: Tue, 24 Jun 2025 19:21:02 -0700 Subject: [PATCH 08/11] - --- Transportes/Boletos.aspx.vb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/Transportes/Boletos.aspx.vb b/Transportes/Boletos.aspx.vb index 46bd7688c..ef72b2980 100644 --- a/Transportes/Boletos.aspx.vb +++ b/Transportes/Boletos.aspx.vb @@ -77,9 +77,6 @@ Partial Class Boletos Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load If Not IsPostBack Then - - - If Request.QueryString("CveViaje") Is Nothing And UsuarioActual.CveVendedor <> Nothing And UsuarioActual.CveVendedor <> -1 Then Response.Redirect("/Transportes/RepViajes.aspx") End If @@ -204,9 +201,7 @@ Partial Class Boletos Else ImporteR = ObjDestinos.DtResultados.FiltroPrimeroValor("Importe").ToDecimal.RoundSQL End If - ImporteR = If(edad <= 4 Or edad >= 60, ImporteR - 20, ImporteR) - End If If ImporteR > 0 Then @@ -256,8 +251,6 @@ Partial Class Boletos Try For Each dr As DataRow In DtPasajeros.Rows - - Dim CveViajePasajero As Integer = ObjTransporte.AddViajesPasajeros(CveViaje, dr("CveDestinoOrigen").ToString.ToEntero, dr("CveDestinoFinal").ToString.ToEntero, UsuarioActual.CveVendedor, dr("Importe").ToString.ToDecimal, dr("Asiento").ToString.ToEntero, dr("Nombre").ToString, dr("FechaNacimiento").ToString.ToDate, dr("CveSexo").ToString.ToBool, dr("Visa").ToString, dr("Celular").ToString, dr("Observaciones").ToString, UsuarioActual.CveUsuario) If CveViajePasajero < 1 Then @@ -265,7 +258,6 @@ Partial Class Boletos SbAlert.Append("Ocurrió un error al generar el viaje") Exit For End If - dr("CveViajePasajero") = CveViajePasajero 'dr("Numero") = dr("Importe").ToString Next @@ -490,6 +482,7 @@ Partial Class Boletos ObjFactura.CveSubProyectoEjecucion = CveSubProyecto ObjFactura.SetSubProyecto() ObjFactura.SetSubProyectoMatriz() + If ObjFactura.CveMoneda >= 2 Then ObjFactura.TipoCambio = GlobalTipoCambio(ObjFactura.Fecha).ToDecimal For Each Dr As DataRow In DtPasajeros.Rows Dim Obs As String = Dr("Observaciones").ToString @@ -501,7 +494,6 @@ Partial Class Boletos End If Dim PorcentajeIVA As Decimal = 0 - Dim DrPS As DataRow = ClsPaginas.GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=CvePSBoleto).FiltroPrimero("") ' Estado = -1 If DrPS Is Nothing Then @@ -544,7 +536,4 @@ Partial Class Boletos Return Retorno End Function - - - End Class From e4094327357e6d47797e461cda3f57353936a625 Mon Sep 17 00:00:00 2001 From: rrene Date: Wed, 25 Jun 2025 07:02:35 -0700 Subject: [PATCH 09/11] - --- App_Code/ClsProductosServicios.vb | 11 +++-------- Ventas/ProductosServicios.aspx | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/App_Code/ClsProductosServicios.vb b/App_Code/ClsProductosServicios.vb index 2ce03c048..a22fce440 100644 --- a/App_Code/ClsProductosServicios.vb +++ b/App_Code/ClsProductosServicios.vb @@ -204,7 +204,7 @@ Public Class ClsProductosServicios End Sub #End Region Public Function GetPS(CvePS As Integer, CveClasificacion As Integer, CveEmpresa As Integer, Optional Codigo As String = "-1", Optional NumeroParte As String = "-1", - Optional CodigoBarras As String = "-1", Optional PS As String = "-1", Optional PSExtranjero As String = "-1", Optional EsPaquete As Integer = -1, Optional CveSubProyecto As Integer = -1, + Optional CodigoBarras As String = "-1", Optional PS As String = "-1", Optional EsPaquete As Integer = -1, Optional CveSubProyecto As Integer = -1, Optional pAplicaParaVenta As Integer = -1, Optional pEstado As Integer = -1, Optional CveClasificacionCosto As Integer = -1, Optional CveTipoPS As Integer = -1, Optional CveCompuesto As Integer = -1, Optional SATClavePS As String = "-1", Optional TopSelect As Integer = 10000, Optional CveMarca As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -217,7 +217,6 @@ Public Class ClsProductosServicios .Add("@NumeroParte", SqlDbType.VarChar).Value = NumeroParte .Add("@CodigoBarras", SqlDbType.VarChar).Value = CodigoBarras .Add("@PS", SqlDbType.VarChar).Value = PS - .Add("@PSExtranjero", SqlDbType.VarChar).Value = PSExtranjero .Add("@CveClasificacion", SqlDbType.Int).Value = CveClasificacion .Add("@EsPaquete", SqlDbType.SmallInt).Value = EsPaquete .Add("@AplicaParaVenta", SqlDbType.Int).Value = pAplicaParaVenta @@ -333,7 +332,6 @@ Public Class ClsProductosServicios With SqlAdapter.SelectCommand.Parameters .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - End With Try @@ -424,8 +422,6 @@ Public Class ClsProductosServicios DataAdapter("PA_ProductosServiciosAdd") With SqlAdapter.SelectCommand.Parameters - - .Add("@CveClasificacion", SqlDbType.Int).Value = CveClasificacion .Add("@CveClasificacionCosto", SqlDbType.Int).Value = CveClasificacionCosto .Add("@CveUnidadMedida", SqlDbType.Int).Value = CveUnidadMedida @@ -433,6 +429,7 @@ Public Class ClsProductosServicios .Add("@NumeroParte", SqlDbType.VarChar).Value = If(NumeroParte = "", "-1", NumeroParte) .Add("@CodigoBarras", SqlDbType.VarChar).Value = If(CodigoBarras = "", "-1", CodigoBarras) .Add("@PS", SqlDbType.VarChar).Value = If(PS.Length > 845, PS.Substring(0, 845), PS) + .Add("@PSExtranjero", SqlDbType.VarChar).Value = If(PSExtranjero.Length > 845, PSExtranjero.Substring(0, 845), PSExtranjero) .Add("@Precio", SqlDbType.Float).Value = Precio .Add("@IVA", SqlDbType.Float).Value = IVA .Add("@RetIVA", SqlDbType.Float).Value = RetIVA @@ -441,7 +438,6 @@ Public Class ClsProductosServicios .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@EsPaquete", SqlDbType.Bit).Value = EsPaquete - .Add("@PSExtranjero", SqlDbType.VarChar).Value = If(PSExtranjero.Length > 845, PSExtranjero.Substring(0, 845), PSExtranjero) .Add("@CveMetodoInventario", SqlDbType.Int).Value = CveMetodoInventario .Add("@RETURN_VALUE", SqlDbType.Int).Direction = ParameterDirection.ReturnValue .Add("@CveTipoPS", SqlDbType.Int).Value = CveTipoPS @@ -717,6 +713,7 @@ Public Class ClsProductosServicios .Add("@NumeroParte", SqlDbType.VarChar).Value = If(NumeroParte = "", "-1", NumeroParte) .Add("@CodigoBarras", SqlDbType.VarChar).Value = If(CodigoBarras = "", "-1", CodigoBarras) .Add("@PS", SqlDbType.VarChar).Value = PS + .Add("@PSExtranjero", SqlDbType.VarChar).Value = PSExtranjero .Add("@Precio", SqlDbType.Float).Value = Precio .Add("@IVA", SqlDbType.Float).Value = IVA .Add("@RetIVA", SqlDbType.Float).Value = RetIVA @@ -738,8 +735,6 @@ Public Class ClsProductosServicios .Add("@CveCompuesto", SqlDbType.Int).Value = CveCompuesto .Add("@CveSATPS", SqlDbType.Int).Value = CveSATPS .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa - .Add("@PSExtranjero", SqlDbType.VarChar).Value = PSExtranjero - 'Nuevo R: 26/09/2017' .Add("@Inventariable", SqlDbType.Bit).Value = Inventariable .Add("@CveProveedorCompra", SqlDbType.Int).Value = CveProveedorCompra diff --git a/Ventas/ProductosServicios.aspx b/Ventas/ProductosServicios.aspx index a5ad37be6..5dc93ffeb 100644 --- a/Ventas/ProductosServicios.aspx +++ b/Ventas/ProductosServicios.aspx @@ -286,7 +286,7 @@
-
+
From ff6a109cde7830c32127eb4d95d195ed319232df Mon Sep 17 00:00:00 2001 From: rrene Date: Wed, 25 Jun 2025 07:12:46 -0700 Subject: [PATCH 10/11] - --- Ventas/ProductosServicios.aspx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Ventas/ProductosServicios.aspx b/Ventas/ProductosServicios.aspx index 5dc93ffeb..1ead86d18 100644 --- a/Ventas/ProductosServicios.aspx +++ b/Ventas/ProductosServicios.aspx @@ -1893,15 +1893,12 @@ - - -
+   -
+ CssClass="btn btn-circle btn-sm red" Text="" /> Date: Wed, 25 Jun 2025 11:31:24 -0600 Subject: [PATCH 11/11] Cambios Dashboard 25/06/2025 --- General/Dashboard.aspx | 38 +++++++++++++++++++------------------- General/Dashboard.aspx.vb | 16 ++++++++-------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/General/Dashboard.aspx b/General/Dashboard.aspx index 3db415956..ea5a5d5e3 100644 --- a/General/Dashboard.aspx +++ b/General/Dashboard.aspx @@ -607,7 +607,7 @@
@@ -715,7 +715,7 @@
@@ -826,7 +826,7 @@
@@ -933,7 +933,7 @@
@@ -1042,7 +1042,7 @@
@@ -1149,7 +1149,7 @@
@@ -1259,7 +1259,7 @@
@@ -1394,7 +1394,7 @@
@@ -1482,7 +1482,7 @@
@@ -1574,7 +1574,7 @@
@@ -1644,7 +1644,7 @@
@@ -1721,7 +1721,7 @@
@@ -1827,7 +1827,7 @@
@@ -1936,7 +1936,7 @@
@@ -2042,7 +2042,7 @@
@@ -2173,7 +2173,7 @@
@@ -2259,7 +2259,7 @@
@@ -2348,7 +2348,7 @@
@@ -2418,7 +2418,7 @@
diff --git a/General/Dashboard.aspx.vb b/General/Dashboard.aspx.vb index 55c28bb51..94c389821 100644 --- a/General/Dashboard.aspx.vb +++ b/General/Dashboard.aspx.vb @@ -712,9 +712,9 @@ Partial Class General_Dashboard Dim headerRow2 As New GridViewRow(1, 0, DataControlRowType.Header, DataControlRowState.Normal) ' Subheaders con checkboxes - headerRow2.Cells.Add(CreateSubHeaderCell("TotalCxC", "chkTotalCxC", "Total CxC")) + headerRow2.Cells.Add(CreateSubHeaderCell("Total CxC", "chkTotalCxC", "TotalCxC")) headerRow2.Cells.Add(CreateSubHeaderCell("Vencido", "chkVencido", "Vencido")) - headerRow2.Cells.Add(CreateSubHeaderCell("PorVencer", "chkPorVencer", "Por Vencer")) + headerRow2.Cells.Add(CreateSubHeaderCell("Por Vencer", "chkPorVencer", "PorVencer")) headerRow2.TableSection = TableRowSection.TableHeader grid.Controls(0).Controls.AddAt(1, headerRow2) @@ -749,9 +749,9 @@ Partial Class General_Dashboard Dim headerRow2 As New GridViewRow(1, 0, DataControlRowType.Header, DataControlRowState.Normal) ' Subheaders con checkboxes - headerRow2.Cells.Add(CreateSubHeaderCell("TotalCxC", "chkTotalCxC", "Total CxC")) + headerRow2.Cells.Add(CreateSubHeaderCell("Total CxC", "chkTotalCxC", "Total CxC")) headerRow2.Cells.Add(CreateSubHeaderCell("Vencido", "chkVencido", "Vencido")) - headerRow2.Cells.Add(CreateSubHeaderCell("PorVencer", "chkPorVencer", "Por Vencer")) + headerRow2.Cells.Add(CreateSubHeaderCell("Por Vencer", "chkPorVencer", "Por Vencer")) headerRow2.TableSection = TableRowSection.TableHeader grid.Controls(0).Controls.AddAt(1, headerRow2) @@ -787,7 +787,7 @@ Partial Class General_Dashboard ' Subheaders con checkboxes headerRow2.Cells.Add(CreateSubHeaderCell("Recuperado", "chkRecuperado", "Recuperado")) - headerRow2.Cells.Add(CreateSubHeaderCell("PromedioDiasRecuperacion", "chkDiasRecuperado", "Avg. Días Recuperación")) + headerRow2.Cells.Add(CreateSubHeaderCell("Avg. Días Recuperación", "chkDiasRecuperado", "PromedioDiasRecuperacion")) headerRow2.TableSection = TableRowSection.TableHeader grid.Controls(0).Controls.AddAt(1, headerRow2) @@ -823,7 +823,7 @@ Partial Class General_Dashboard ' Subheaders con checkboxes headerRow2.Cells.Add(CreateSubHeaderCell("Recuperado", "chkRecuperado", "Recuperado")) - headerRow2.Cells.Add(CreateSubHeaderCell("PromedioDiasRecuperacion", "chkDiasRecuperado", "Avg. Días Recuperación")) + headerRow2.Cells.Add(CreateSubHeaderCell("Avg. Días Recuperación", "chkDiasRecuperado", "PromedioDiasRecuperacion")) headerRow2.TableSection = TableRowSection.TableHeader grid.Controls(0).Controls.AddAt(1, headerRow2) @@ -1085,7 +1085,7 @@ Partial Class General_Dashboard ' Subheaders con checkboxes headerRow2.Cells.Add(CreateSubHeaderCell("Recuperado", "chkRecuperado", "Pagado")) - headerRow2.Cells.Add(CreateSubHeaderCell("PromedioDias", "chkDiasRecuperado", "Avg. Días")) + headerRow2.Cells.Add(CreateSubHeaderCell("Avg. Días", "chkDiasRecuperado", "PromedioDias")) headerRow2.TableSection = TableRowSection.TableHeader grid.Controls(0).Controls.AddAt(1, headerRow2) @@ -1121,7 +1121,7 @@ Partial Class General_Dashboard ' Subheaders con checkboxes headerRow2.Cells.Add(CreateSubHeaderCell("Recuperado", "chkRecuperado", "Recuperado")) - headerRow2.Cells.Add(CreateSubHeaderCell("PromedioDias", "chkDiasRecuperado", "Avg. Días")) + headerRow2.Cells.Add(CreateSubHeaderCell("Avg. Días", "chkDiasRecuperado", "PromedioDias")) headerRow2.TableSection = TableRowSection.TableHeader grid.Controls(0).Controls.AddAt(1, headerRow2)