diff --git a/App_Code/ClsOC.vb b/App_Code/ClsOC.vb
index 622e12946..b632cf800 100644
--- a/App_Code/ClsOC.vb
+++ b/App_Code/ClsOC.vb
@@ -131,6 +131,8 @@ Public Class ClsOC
End Get
End Property
+ Public Property DiasCreditoOC As Integer = 0
+
#End Region
@@ -695,6 +697,7 @@ Public Class ClsOC
CveProveedorContacto = If(Not IsDBNull(dr("CveProveedorContacto")), dr("CveProveedorContacto").ToString.ToEntero, -1)
NumRemision = dr("NumRemision").ToString
PorcentajeProntoPago = dr("PorcentajeProntoPago").ToString.ToDecimal
+ DiasCreditoOC = dr("DiasCreditoOC").ToString.ToEntero
Retorno = True
ElseIf Data.Rows.Count > 0 Then
@@ -715,7 +718,7 @@ Public Class ClsOC
Optional PorcentajeIVA As Decimal = 0.16D, Optional IVA As Decimal = 0, Optional RetIVA As Decimal = 0, Optional RetISR As Decimal = 0, Optional FechaExpiracion As Date = Nothing, Optional CveCotizacion As Integer = -1,
Optional FolioAdicional As String = "", Optional EntregaDirecta As Integer = -1, Optional CveDireccionEnvio As Integer = -1, Optional Guia As String = "-1", Optional IEPS As Decimal = -1,
Optional CveIEAnticipo As Integer = -1, Optional ImporteAnticipo As Decimal = 0, Optional UsoCFDI As Integer = -1, Optional Promocion As String = "-1", Optional CveProveedorContacto As Integer = -1, Optional NumRemision As String = "-1",
- Optional CveColectiva As Integer = -1, Optional MetodoPago As Integer = -1, Optional CveSubProyectoEntrega As Integer = -1, Optional PorcentajeProntoPago As Decimal = 0) As Boolean
+ Optional CveColectiva As Integer = -1, Optional MetodoPago As Integer = -1, Optional CveSubProyectoEntrega As Integer = -1, Optional PorcentajeProntoPago As Decimal = 0, Optional DiasCreditoOC As Integer = -1) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_OC_OrdenesCompraAdd")
@@ -763,10 +766,13 @@ Public Class ClsOC
.Add("@MetodoPago", SqlDbType.Int).Value = MetodoPago ' 0 Contado, 1 Credito
.Add("@CveSubProyectoEntrega", SqlDbType.Int).Value = CveSubProyectoEntrega ' 0 Contado, 1 Credito
.Add("@PorcentajeProntoPago", SqlDbType.Decimal).Value = PorcentajeProntoPago
+ .Add("@DiasCreditoOC", SqlDbType.Int).Value = DiasCreditoOC
.Add("@vCveOrdenCompra", SqlDbType.Int).Direction = ParameterDirection.Output
.Add("@vFolio", SqlDbType.Int).Direction = ParameterDirection.Output
.Add("@vSerieFolio", SqlDbType.VarChar, 25).Direction = ParameterDirection.Output
+
+
End With
Try
@@ -929,7 +935,7 @@ Public Class ClsOC
Optional IVA As Decimal = 0, Optional RetIVA As Decimal = 0, Optional RetISR As Decimal = 0, Optional IDPoliza As Integer = -1, Optional FechaExpiracion As Date = Nothing, Optional FolioAdicional As String = "",
Optional EntregaDirecta As Integer = -1, Optional CveDireccionEnvio As Integer = -1, Optional Guia As String = "-1", Optional IEPS As Decimal = -1, Optional UsoCFDI As Integer = -1, Optional Promocion As String = "-1",
Optional pCveProveedorSucursal As Integer = -1, Optional CveProveedorContacto As Integer = -1, Optional PorcentajeIVA As Decimal = 0.16D, Optional NumRemision As String = "-1", Optional MetodoPago As Integer = -1,
- Optional CveSubProyectoEntrega As Integer = -1, Optional PorcentajeProntoPago As Decimal = 0) As Boolean
+ Optional CveSubProyectoEntrega As Integer = -1, Optional PorcentajeProntoPago As Decimal = 0, Optional DiasCreditoOC As Integer = -1) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_OC_OrdenesCompraUpdate")
@@ -967,6 +973,7 @@ Public Class ClsOC
.Add("@MetodoPago", SqlDbType.Int).Value = MetodoPago ' 0 Contado, 1 Credito
.Add("@CveSubProyectoEntrega", SqlDbType.Int).Value = CveSubProyectoEntrega
.Add("@PorcentajeProntoPago", SqlDbType.Decimal).Value = PorcentajeProntoPago
+ .Add("@DiasCreditoOC", SqlDbType.Int).Value = DiasCreditoOC
End With
diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb
index 9e51948cd..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"
@@ -3121,9 +3126,6 @@ Partial Class PopUpVerFactura
params.Add(New ReportParameter("FechaImpresion", NowADS().ToString("dd/MM/yyyy")))
params.Add(New ReportParameter("Folio", Folio))
params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
- 'params.Add(New ReportParameter("Descuentos", (dr("Descuentos").ToString.ToDouble).FormatoNumero(2)))
- 'params.Add(New ReportParameter("IVA", dr("IVA").ToString.FormatoNumero(2)))
- 'params.Add(New ReportParameter("Total", dr("Total").ToString.FormatoNumero(2)))
params.Add(New ReportParameter("NombreEntrego", String.Format("ENTREGÓ{0}{1}", vbCrLf, Capturo)))
params.Add(New ReportParameter("NombreRecibio", String.Format("RECIBIÓ{0}{1}", vbCrLf, Recibio)))
@@ -6039,7 +6041,12 @@ Partial Class PopUpVerFactura
Dim rdsPrePoliza As New ReportDataSource("DSPrePoliza", dtPrePoliza)
reportDataSetsList.Add(rdsPrePoliza)
+ Dim lblSubProyecto As New Label
+ CargarCentrosDeCosto(Nothing, Nothing, Nothing, lblSubProyecto)
+ paramList.Add(New ReportParameter("TipoCentroCosto", lblSubProyecto.Text))
+
ImprimirPDF("Empresas\Grales\Formatos\rptChequeMovimientosPrePoliza.rdlc", reportDataSetsList, paramList, ObjIE.Folio, "PDF")
+
Else
ImprimirPDF("Empresas\Grales\Formatos\rptChequeMovimientos.rdlc", reportDataSetsList, paramList, ObjIE.Folio, "PDF")
End If
diff --git a/Empresas/189/Formatos/OC.rdlc b/Empresas/189/Formatos/OC.rdlc
index f7dee0b2b..2fee621c5 100644
--- a/Empresas/189/Formatos/OC.rdlc
+++ b/Empresas/189/Formatos/OC.rdlc
@@ -669,7 +669,7 @@
- =Fields!Producto.Value
+ =IIF(Fields!Producto.Value=".",Fields!Obs.Value,Fields!Producto.Value)
+ true
diff --git a/Empresas/Grales/Formatos/SaldoAntNCDev.rdlc b/Empresas/189/Formatos/RepOCxSurtirPorOC.rdlc
similarity index 58%
rename from Empresas/Grales/Formatos/SaldoAntNCDev.rdlc
rename to Empresas/189/Formatos/RepOCxSurtirPorOC.rdlc
index 3ccdf0c86..70b7a5cb6 100644
--- a/Empresas/Grales/Formatos/SaldoAntNCDev.rdlc
+++ b/Empresas/189/Formatos/RepOCxSurtirPorOC.rdlc
@@ -17,20 +17,40 @@
/* Local Query */
-
- SerieFolio
+
+ CveOrdenCompra
System.String
-
- FechaAplicado
+
+ Folio
System.String
-
- Importe
+
+ FechaIng
+ System.String
+
+
+ Descripcion
+ System.String
+
+
+ CodigoPS
+ System.String
+
+
+ CantidadOC
System.Double
-
- Moneda
+
+ CantidadCompra
+ System.Double
+
+
+ Pendiente
+ System.Double
+
+
+ SubProyecto
System.String
@@ -64,7 +84,7 @@
Folio
@@ -77,13 +97,13 @@
Textbox28
- LightGrey
+ #e36c09
1pt
@@ -95,13 +115,22 @@
- 3.42604cm
+ 1.75917cm
- 3.37313cm
+ 7.90365cm
- 3.00271cm
+ 2.69875cm
+
+
+ 2.16336cm
+
+
+ 2.8203cm
+
+
+ 2.01554cm
@@ -110,17 +139,52 @@
-
+
true
true
- =Fields!FechaAplicado.Value
+ =Fields!FechaIng.Value
+
+
+
+
+
+ FechaIng
+
+
+ =IIF(CInt(Fields!CveOrdenCompra.Value) < 1, "#67809F","Transparent")
+ 0.5pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Descripcion.Value
+
@@ -129,12 +193,12 @@
- FechaAplicado
+ Descripcion
- White
+ =IIF(CInt(Fields!CveOrdenCompra.Value) < 1, "#67809F","Transparent")
0.5pt
@@ -142,17 +206,18 @@
-
+
true
true
- =Fields!Moneda.Value
+ =Fields!SubProyecto.Value
@@ -161,12 +226,12 @@
- Moneda
+ SubProyecto
- White
+ =IIF(CInt(Fields!CveOrdenCompra.Value) < 1, "#67809F","Transparent")
0.5pt
@@ -174,18 +239,19 @@
-
+
true
true
- =Fields!Importe.Value
+ =Fields!CantidadOC.Value
@@ -194,12 +260,80 @@
- Importe
+ CantidadOC
- White
+ =IIF(CInt(Fields!CveOrdenCompra.Value) < 1, "#67809F","Transparent")
+ 0.5pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!CantidadCompra.Value
+
+
+
+
+
+
+ CantidadCompra
+
+
+ =IIF(CInt(Fields!CveOrdenCompra.Value) < 1, "#67809F","Transparent")
+ 0.5pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Fields!Pendiente.Value
+
+
+
+
+
+
+ Pendiente
+
+
+ =IIF(CInt(Fields!CveOrdenCompra.Value) < 1, "#67809F","Transparent")
0.5pt
@@ -215,7 +349,7 @@
0.44125cm
-
+
true
true
@@ -225,7 +359,7 @@
Fecha
@@ -235,13 +369,13 @@
- Textbox19
+ Textbox12
- LightGrey
+ #e36c09
1pt
@@ -252,17 +386,17 @@
0.44125cm
-
+
true
true
- Moneda
+ Descripción
@@ -272,13 +406,13 @@
- Textbox21
+ Textbox44
- LightGrey
+ #e36c09
1pt
@@ -289,17 +423,17 @@
0.44125cm
-
+
true
true
- Importe
+ =Parameters!TipoCentroCosto.Value
@@ -309,13 +443,125 @@
- Textbox23
+ Textbox4
- LightGrey
+ #e36c09
+ 1pt
+
+
+ true
+
+
+
+
+
+ 0.44125cm
+
+
+ true
+ true
+
+
+
+
+ Cantidad OC
+
+
+
+
+
+
+ Textbox49
+
+
+ #e36c09
+ 1pt
+
+
+
+
+
+
+
+ 0.44125cm
+
+
+ true
+ true
+
+
+
+
+ Cantidad Compra
+
+
+
+
+
+
+ Textbox51
+
+
+ #e36c09
+ 1pt
+
+
+
+
+
+
+
+ 0.44125cm
+
+
+ true
+ true
+
+
+
+
+ Pendiente
+
+
+
+
+
+
+ Textbox47
+
+
+ #e36c09
1pt
@@ -329,33 +575,34 @@
- 2.39924cm
+ 1.24826cm
-
+
true
true
- =Fields!SerieFolio.Value
+ =Fields!Folio.Value
- SerieFolio
+ Folio1
- White
+ =IIF(CInt(Fields!CveOrdenCompra.Value) < 1, "#67809F","Transparent")
0.5pt
@@ -367,24 +614,60 @@
true
true
DataSet1
- 0.12375cm
+ 0.75875cm
0.06614cm
0.8825cm
- 12.20112cm
+ 20.60903cm
+
+ true
+ true
+
+
+
+
+ =Parameters!AgrupadoPor.Value
+ HTML
+
+
+
+
+
+
+ Textbox1
+ 0.07056cm
+ 0.06614cm
+ 0.58236cm
+ 20.60903cm
+ 1
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
- 0.39616in
+ 0.77116in