AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://jperez@192.168.10.111:8383/SIG.git

Browse Source
This commit is contained in:
Jonathan Alexis Perez Morales
2020-03-04 16:59:29 -07:00
parent b145c8ec45 2d2e8ab9dc
commit f30d232e59
4 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
App_Code/ClsPaginas.vb
View File

@@ -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 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) 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 'Imprime los parametros
'Dim ast As New StringBuilder 'Dim ast As New StringBuilder
'For Each par As ReportParameter In params 'For Each par As ReportParameter In params

1
App_Code/Modelos.vb
View File

@@ -5742,6 +5742,7 @@ Namespace Modelos
Public Property ImporteRelacion As Decimal Public Property ImporteRelacion As Decimal
Public Property EsNCAmortizacion As Boolean Public Property EsNCAmortizacion As Boolean
Public Property Kilometraje As Decimal
#End Region #End Region

7
Compras/PopUpVerFactura.aspx.vb
View File

@@ -897,9 +897,10 @@ Partial Class PopUpVerFactura
Vta.DescripcionContrato = dtVentas(0)("DescripcionContrato").ToString 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.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 = If(dtVentas(0)("PedidoContrato").ToString = "", Vta.NumeroDescripcionContrato, $"{dtVentas(0)("PedidoContrato").ToString} {If(Vta.NumeroDescripcionContrato = "", "", $" / {Vta.NumeroDescripcionContrato}") }")
'Vta.PedidoContrato = dtVentas(0)("PedidoContrato").ToString 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 = New Modelos.SucursalModel
Vta.ClienteSucursal.Direccion = dtVentas(0)("SucClienteDireccion").ToString Vta.ClienteSucursal.Direccion = dtVentas(0)("SucClienteDireccion").ToString
Vta.ClienteSucursal.NoExt = dtVentas(0)("SucClienteNoExt").ToString Vta.ClienteSucursal.NoExt = dtVentas(0)("SucClienteNoExt").ToString

25
Empresas/141/Formatos/Factura.rdlc
View File

@@ -1317,6 +1317,25 @@
<FontWeight>Bold</FontWeight> <FontWeight>Bold</FontWeight>
</Style> </Style>
</TextRun> </TextRun>
<TextRun>
<Value xml:space="preserve"> </Value>
<Style>
<FontFamily>calibri</FontFamily>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=iif(Parameters!Kilometraje.Value = "-1", "","Kilometraje: "&amp; Parameters!Kilometraje.Value)</Value>
<Style>
<FontFamily>calibri</FontFamily>
<FontWeight>Bold</FontWeight>
</Style>
</TextRun>
</TextRuns> </TextRuns>
<Style /> <Style />
</Paragraph> </Paragraph>
@@ -3835,6 +3854,12 @@
<AllowBlank>true</AllowBlank> <AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt> <Prompt>ReportParameter1</Prompt>
</ReportParameter> </ReportParameter>
<ReportParameter Name="Kilometraje">
<DataType>String</DataType>
<Nullable>true</Nullable>
<AllowBlank>true</AllowBlank>
<Prompt>ReportParameter1</Prompt>
</ReportParameter>
</ReportParameters> </ReportParameters>
<EmbeddedImages> <EmbeddedImages>
<EmbeddedImage Name="compuproveedores"> <EmbeddedImage Name="compuproveedores">