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

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
rrene
2022-10-22 12:06:51 -07:00
parent cbff97dfee 4af6c5483a
commit d86d6ebd13
144 changed files with 348 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Inventarios/EntradasSalidas.aspx.vb
View File

@@ -3523,7 +3523,7 @@ Partial Class Inventarios_EntradasSalidas
'params.Add(New ReportParameter("FechaEstimada", FechaEstimada))
'If Imagen.Exists Then
' params.Add(New ReportParameter("LogoPath", logouri))
' params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
'Else
' params.Add(New ReportParameter("LogoPath", ""))
'End If

2
Inventarios/EntregaAlmacen.aspx.vb
View File

@@ -3907,7 +3907,7 @@ Partial Class Inventarios_EntregaAlmacen
Dim params As New List(Of ReportParameter)
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/InventarioFisicoDetalle.aspx.vb
View File

@@ -645,7 +645,7 @@ Partial Class Inventarios_InventarioFisicoDetalle
params.Add(New ReportParameter("FechaImpresion", Now.ToDateTime.ToString))
Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/Kardex.aspx.vb
View File

@@ -472,7 +472,7 @@ Partial Class Inventarios_Kardex
params.Add(New ReportParameter("AgrupadoPor", $"<b>Agrupado Por:</b>&nbsp;{SerieAgrupado}{EntradaSalida}{Almacen}{UM}{FechaIn}{FechaFn}"))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/KardexAlmacen.aspx.vb
View File

@@ -188,7 +188,7 @@ Partial Class Inventarios_KardexAlmacen
params.Add(New ReportParameter("AgrupadoPor", $"<b>Agrupado Por:</b>&nbsp;{EntradaSalida}{Almacen}{UM}{FechaIn}{FechaFn}"))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RecepcionUsados.aspx.vb
View File

@@ -3579,7 +3579,7 @@ Partial Class Inventarios_RecepcionUsados
params.Add(New ReportParameter("TelConsumidor", ""))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepAlmacen.aspx.vb
View File

@@ -107,7 +107,7 @@ Partial Class Inventarios_RepAlmacen
params.Add(New ReportParameter("FechaImpresion", Now.ToDateTime.ToShortDateString))
params.Add(New ReportParameter("Filtros", StrFiltro.ToString))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepAlmacenCompras.aspx.vb
View File

@@ -132,7 +132,7 @@ Partial Class Inventarios_RepAlmacenCompras
params.Add(New ReportParameter("Filtros", StrFiltro.ToString))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepAlmacenPeriodo.aspx.vb
View File

@@ -134,7 +134,7 @@ Partial Class Inventarios_RepAlmacenPeriodo
params.Add(New ReportParameter("FechaImpresion", Now.ToDateTime.ToShortDateString))
params.Add(New ReportParameter("Filtros", StrFiltro.ToString))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepApartados.aspx.vb
View File

@@ -231,7 +231,7 @@ Partial Class Inventarios_RepApartados
params.Add(New ReportParameter("Filtros", StrFiltro.ToString))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepApartados2.aspx.vb
View File

@@ -146,7 +146,7 @@ Partial Class Inventarios_RepApartados2
params.Add(New ReportParameter("Filtros", StrFiltro.ToString))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepConsignaciones.aspx.vb
View File

@@ -118,7 +118,7 @@ Partial Class Inventarios_RepConsignaciones
params.Add(New ReportParameter("Filtros", StrFiltro.ToString))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepConsumoInterno.aspx.cs
View File

@@ -207,7 +207,7 @@ public partial class Inventarios_RepConsumoInterno : ClsPaginas
if (Imagen.Exists)
{
@params.Add(new ReportParameter("LogoPath", logouri));
@params.Add(new ReportParameter("LogoPath", $"file://{Imagen.FullName}"));
}
else
{

2
Inventarios/RepEntregasForaneas.aspx.vb
View File

@@ -742,7 +742,7 @@ Partial Class Inventarios_RepEntregasForaneas
params.Add(New ReportParameter("Filtros", $" <b>Estado:</b>{Estatus} <b>Paqueteria:</b>{Paqueteria} <b>Tipo:</b>{Tipo}"))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepExistenciasCostos.aspx.vb
View File

@@ -298,7 +298,7 @@ Partial Class Inventarios_RepExistenciasCostos
params.Add(New ReportParameter("FechaImpresion", Now.ToDateTime.ToShortDateString))
params.Add(New ReportParameter("Filtros", $"{FechaIn} {FechaFn} {Proveedor} {Concepto} {Almacen} {Clasificacion} {PS} {Moneda}"))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepFletes.aspx.vb
View File

@@ -96,7 +96,7 @@ Partial Class Compras_RepFletes
Dim Imagen As New System.IO.FileInfo(String.Format("{0}/Logo.png", UsuarioActual.Empresa.Ruta))
Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

4
Inventarios/RepMaximoMinimo.aspx.vb
View File

@@ -285,7 +285,7 @@ Partial Class Inventarios_RepMaximoMinimo
params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
params.Add(New ReportParameter("FechaImpresion", Now.ToDateTime.ToShortDateString))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If
@@ -320,7 +320,7 @@ Partial Class Inventarios_RepMaximoMinimo
params.Add(New ReportParameter("PS", PS))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepMovimientos.aspx.vb
View File

@@ -140,7 +140,7 @@ Partial Class RepMovimientosRep
params.Add(New ReportParameter("Filtros", StrFiltro.ToString))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepNotasSinAlmacen.aspx.vb
View File

@@ -254,7 +254,7 @@ Partial Class RepNotasSinAlmacen
params.Add(New ReportParameter("FechaFin", FechaFinal))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepOcInv.aspx.vb
View File

@@ -120,7 +120,7 @@ Partial Class Inventarios_RepOcInv
params.Add(New ReportParameter("FechaImpresion", Now.ToDateTime.ToShortDateString))
params.Add(New ReportParameter("Filtros", StrFiltro.ToString))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/RepOcInvMoto.aspx.vb
View File

@@ -101,7 +101,7 @@ Partial Class Inventarios_RepOcInvMoto
params.Add(New ReportParameter("FechaImpresion", Now.ToDateTime.ToShortDateString))
params.Add(New ReportParameter("Filtros", StrFiltro.ToString))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

3
Inventarios/RepProductosPorCaducar.aspx.cs
View File

@@ -1,6 +1,7 @@
using Extensiones;
using Microsoft.Reporting.WebForms;
using System;
using System.Activities.Expressions;
using System.Collections.Generic;
using System.Data;
using System.Text;
@@ -185,7 +186,7 @@ public partial class Inventarios_RepProductosPorCaducar : ClsPaginas
System.IO.FileInfo Imagen = new System.IO.FileInfo(string.Format("{0}/Logo.png", UsuarioActual.Empresa.Ruta));
if (Imagen.Exists)
{
@params.Add(new ReportParameter("LogoPath", logouri));
@params.Add(new ReportParameter("LogoPath", $"file://{Imagen.FullName}"));
}
else
{

2
Inventarios/RepTraspasoAlmacen.aspx.vb
View File

@@ -164,7 +164,7 @@ Partial Class RepTraspasoAlmacen
params.Add(New ReportParameter("FechaImprimio", DateTime.Now.ToString))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/ReporteMaterial.aspx.vb
View File

@@ -103,7 +103,7 @@ Partial Class Inventarios_ReporteMaterial
params.Add(New ReportParameter("FechaImpresion", Now.ToDateTime.ToShortDateString))
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If

2
Inventarios/TrasladoSolicitud.aspx.vb
View File

@@ -893,7 +893,7 @@ Partial Class Inventarios_TrasladoSolicitud
If Imagen.Exists Then
params.Add(New ReportParameter("LogoPath", logouri))
params.Add(New ReportParameter("LogoPath", $"file://{Imagen.FullName}"))
Else
params.Add(New ReportParameter("LogoPath", ""))
End If