diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb
index 29b5168dc..77c1bb16c 100644
--- a/Compras/PopUpVerFactura.aspx.vb
+++ b/Compras/PopUpVerFactura.aspx.vb
@@ -1575,23 +1575,22 @@ Partial Class PopUpVerFactura
'Boleto
If UrlParametros("OP").ToString = "AMORTIZACIONHIS" Then
- 'CveViajePasajero
+
Dim CVEIE As Integer = UrlParametros("CVEIE").ToString.ToEntero
Dim CVEVENTAAMORTIZADA As Integer = UrlParametros("CVEVENTAAMORTIZADA").ToString.ToEntero
Dim CVEVENTA As Integer = UrlParametros("CVEVENTA").ToString.ToEntero
Dim CVECLIENTE As Integer = UrlParametros("CVECLIENTE").ToString.ToEntero
Dim MONTO As Decimal = UrlParametros("MONTO").ToString.ToDecimal
- Dim SALDO As Decimal = UrlParametros("SALDO").ToString.ToDecimal
If CVECLIENTE > 0 AndAlso (CVEIE > 0 Or CVEVENTA > 0) Then
- ImprimirSaldosAmortizacion(CVEVENTAAMORTIZADA, CVEIE, CVEVENTA, CVECLIENTE, MONTO, SALDO)
+ ImprimirSaldosAmortizacion(CVEVENTAAMORTIZADA, CVEIE, CVEVENTA, CVECLIENTE, MONTO)
End If
End If
End Sub
- Private Sub ImprimirSaldosAmortizacion(CveVentaAmortizada As Integer, CveIE As Integer, CveVenta As Integer, CveCliente As Integer, Monto As Decimal, Saldo As Decimal)
+ Private Sub ImprimirSaldosAmortizacion(CveVentaAmortizada As Integer, CveIE As Integer, CveVenta As Integer, CveCliente As Integer, Monto As Decimal)
Dim ObjMovtos As New ClsMovimientos()
@@ -1599,6 +1598,7 @@ Partial Class PopUpVerFactura
Dim DatosSaldoAntNCDev As New DataTable
Dim TipoDocto As String = ""
Dim Folio As String = ""
+ Dim Saldo As Decimal = 0D
Dim DTNCVinculadas As New DataTable
@@ -1623,10 +1623,15 @@ Partial Class PopUpVerFactura
If CveIE > 0 Then
CveVenta = DatosSaldoAntNCDev.FiltroPrimeroValor("CveVenta", $"CveIE={CveIE}").ToEntero
Folio = DatosSaldoAntNCDev.FiltroPrimeroValor("Folio", $"CveIE={CveIE}")
+ Saldo = DatosSaldoAntNCDev.FiltroPrimeroValor("Saldo", $"CveIE={CveIE}").ToDecimal
Else
Folio = DatosSaldoAntNCDev.FiltroPrimeroValor("Folio", $"CveVenta={CveVenta}")
+ Saldo = DatosSaldoAntNCDev.FiltroPrimeroValor("Saldo", $"CveVenta={CveVenta}").ToDecimal
End If
+
+
+
End If
If TipoDocto.Contiene("Egs", "Dev", "Ant", "NC") Then
@@ -1669,8 +1674,8 @@ Partial Class PopUpVerFactura
params.Add(New ReportParameter("FechaImpresion", NowADS().ToString))
params.Add(New ReportParameter("LogoPath", If(Imagen.Exists, $"file://{Imagen.FullName}", "")))
- params.Add(New ReportParameter("Monto", Monto.ToString))
- params.Add(New ReportParameter("Saldo", Saldo.ToString))
+ params.Add(New ReportParameter("Monto", Monto.ToString("###,###,###.00")))
+ params.Add(New ReportParameter("Saldo", Saldo.ToString("###,###,###.00")))
params.Add(New ReportParameter("Folio", Folio))
Dim NombreArchivo As String = "SaldoAntNCDev.rdlc"
diff --git a/Empresas/189/Formatos/SaldoAntNCDev.rdlc b/Empresas/189/Formatos/SaldoAntNCDev.rdlc
index 11b0f7edc..7bca4418e 100644
--- a/Empresas/189/Formatos/SaldoAntNCDev.rdlc
+++ b/Empresas/189/Formatos/SaldoAntNCDev.rdlc
@@ -121,6 +121,7 @@
@@ -529,7 +530,7 @@
- Facura:
+ Factura:
@@ -802,9 +803,7 @@
=Parameters!FechaImpresion.Value
-
+
diff --git a/Ventas/PVCobranza.aspx.vb b/Ventas/PVCobranza.aspx.vb
index e7e2c1104..759f091e5 100644
--- a/Ventas/PVCobranza.aspx.vb
+++ b/Ventas/PVCobranza.aspx.vb
@@ -873,33 +873,34 @@ Partial Class Ventas_PVCobranza
msBuild.AppendFormat("{0}", pdfNC)
End If
+ If respNC IsNot Nothing Then
+ For Each dr As DataRow In respNC.Factura.DtAnticiposAplicados.Rows
+ msBuild.AppendLine($"
Imprimir Saldo Aplicado {dr("Folio").ToString}
")
+ Next
+ Else
+ For Each dr As DataRow In respFactura.Factura.DtAnticiposAplicados.Rows
+ msBuild.AppendLine($"
Imprimir Saldo Aplicado {dr("Folio").ToString}
")
+ Next
+ End If
+
+
If Not String.IsNullOrEmpty(MsgTimbrado) Then
msBuild.AppendFormat("
{0}
", MsgTimbrado)
End If
- If respNC IsNot Nothing Then
- For Each dr As DataRow In respNC.Factura.DtAnticiposAplicados.Rows
- msBuild.AppendLine($"
Imprimir historial {dr("Folio").ToString}
")
- Next
- Else
- For Each dr As DataRow In respFactura.Factura.DtAnticiposAplicados.Rows
- msBuild.AppendLine($"
Imprimir historial {dr("Folio").ToString}
")
- Next
- End If
+