From ebd1cd77ad8d0c2596aded2e3098024b4869d13d Mon Sep 17 00:00:00 2001 From: Antonio Gonzalez Date: Wed, 4 Mar 2020 16:49:15 -0700 Subject: [PATCH] Agregando campo de kilometraje --- App_Code/ClsPaginas.vb | 3 +++ App_Code/Modelos.vb | 1 + Compras/PopUpVerFactura.aspx.vb | 7 ++++--- Empresas/141/Formatos/Factura.rdlc | 25 +++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 368d96e14..1e6327d03 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -6606,6 +6606,9 @@ Public Class ClsPaginas Dim rds5 As New ReportDataSource With {.Name = "DataSet5", .Value = If(Vta.DtNCVinculadas IsNot Nothing, Vta.DtNCVinculadas, New DataTable)} ' sino esta creado el objeto, lo creamos, para que no truene el reporte lrds.Add(rds5) + If UsuarioActual.CveEmpresa = 141 AndAlso RutaFormato.Contains("Factura") Then + params.Add(New ReportParameter("Kilometraje", Vta.Kilometraje.ToString)) + End If 'Imprime los parametros 'Dim ast As New StringBuilder 'For Each par As ReportParameter In params diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb index c23e6aa8a..b5fc67326 100644 --- a/App_Code/Modelos.vb +++ b/App_Code/Modelos.vb @@ -5742,6 +5742,7 @@ Namespace Modelos Public Property ImporteRelacion As Decimal Public Property EsNCAmortizacion As Boolean + Public Property Kilometraje As Decimal #End Region diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb index 5338a9c4d..8c0308a63 100644 --- a/Compras/PopUpVerFactura.aspx.vb +++ b/Compras/PopUpVerFactura.aspx.vb @@ -897,9 +897,10 @@ Partial Class PopUpVerFactura Vta.DescripcionContrato = dtVentas(0)("DescripcionContrato").ToString Vta.NumeroDescripcionContrato = If($"{dtVentas(0)("NumeroContrato").ToString} - {dtVentas(0)("NumeroLicitacion").ToString}" = " - ", "", $"{dtVentas(0)("NumeroContrato").ToString} {If(dtVentas(0)("NumeroLicitacion").ToString = "", "", $" - Licitación: {dtVentas(0)("NumeroLicitacion").ToString}")}") - Vta.PedidoContrato = If(dtVentas(0)("PedidoContrato").ToString = "", Vta.NumeroDescripcionContrato, $"{dtVentas(0)("PedidoContrato").ToString} {If(Vta.NumeroDescripcionContrato = "", "", $" / {Vta.NumeroDescripcionContrato}") }") - 'Vta.PedidoContrato = dtVentas(0)("PedidoContrato").ToString - + Vta.PedidoContrato = If(dtVentas(0)("PedidoContrato").ToString = "", Vta.NumeroDescripcionContrato, $"{dtVentas(0)("PedidoContrato").ToString} {If(Vta.NumeroDescripcionContrato = "", "", $" / {Vta.NumeroDescripcionContrato}") }") + Vta.Kilometraje = If(dtVentas(0)("Kilometraje").ToString = "", -1, dtVentas(0)("Kilometraje").ToString.ToDecimal) + 'Vta.PedidoContrato = dtVentas(0)("PedidoContrato").ToString + Vta.ClienteSucursal = New Modelos.SucursalModel Vta.ClienteSucursal.Direccion = dtVentas(0)("SucClienteDireccion").ToString Vta.ClienteSucursal.NoExt = dtVentas(0)("SucClienteNoExt").ToString diff --git a/Empresas/141/Formatos/Factura.rdlc b/Empresas/141/Formatos/Factura.rdlc index 5a4bb3a2e..14d01b097 100644 --- a/Empresas/141/Formatos/Factura.rdlc +++ b/Empresas/141/Formatos/Factura.rdlc @@ -1317,6 +1317,25 @@ Bold + + + + + + +