Merge branch 'master' of http://oirigoyen@192.168.10.111:8383/SIG.git
This commit is contained in:
rakcsle
@@ -2149,18 +2149,8 @@ Partial Class Compras_Compras
|
||||
|
||||
Private Sub CargaRetIVAConcepto(Optional Cambio As Boolean = False)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
If TrRetIVA.Visible Then
|
||||
TdRetIVAConcepto.Visible = True
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
End If
|
||||
|
||||
If Cambio Then
|
||||
@@ -2174,15 +2164,12 @@ Partial Class Compras_Compras
|
||||
End If
|
||||
|
||||
DdlRetIVAConcepto.Items.Add(New ListItem("Arrendamiento", "4"))
|
||||
|
||||
'If UsuarioActual.Empresa.Funcionalidad(577).ToEntero = 1 Then
|
||||
DdlRetIVAConcepto.Items.Add(New ListItem("Ret IVA Servicios", "5"))
|
||||
'End If
|
||||
|
||||
''If UsuarioActual.Empresa.Funcionalidad(577).ToEntero = 1 Then
|
||||
'DdlRetIVAConcepto.Items.Add(New ListItem("Ret IVA Servicios", "5"))
|
||||
''End If
|
||||
|
||||
End If
|
||||
|
||||
|
||||
UpPS.Update()
|
||||
|
||||
End Sub
|
||||
@@ -5262,7 +5249,7 @@ Partial Class Compras_Compras
|
||||
'QUEMA SALDOS DE INV-COMPRA | MERCANCIA RECIBIDA POR ADELANTADO (OC) | PP 176
|
||||
If OCVinculada And Not DdlTipoComprobante.SelectedValue.Contiene("NC", "DEV", "Ant") And Not UsuarioActual.Empresa.Funcionalidad(126) = "1" Then
|
||||
For Each Row As DataRow In TmpDT.FiltraParametros("CveTipoPS = 2").Rows
|
||||
If Not ObjOC.OrdenesCompraDetalleSaldosInvCompraAdd(Row("CveOrdenCompraDetalle").ToString.ToEntero, -1, -1, Row("CveCompraDetalle").ToString.ToEntero, Row("Cantidad").ToString.ToDouble) Then
|
||||
If Not ObjOC.OrdenesCompraDetalleSaldosInvCompraAdd(Row("CveOrdenCompraDetalle").ToString.ToEntero, -1, -1, Row("CveCompraDetalle").ToString.ToEntero, Row("Cantidad").ToString.ToDecimal) Then
|
||||
ErrorSaldosInvComp = True
|
||||
Exit For
|
||||
End If
|
||||
|
||||
@@ -1011,14 +1011,17 @@ Partial Class PopUpVerFactura
|
||||
Dim Usuario As String = $" <b>Usuario:</b> {Nombre}"
|
||||
If DtCortesVentas.Rows.Count > 0 Or DtCortesVentasResumen.Rows.Count > 0 Then
|
||||
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)
|
||||
|
||||
|
||||
'params.Add(New ReportParameter("LogoPath", If(Imagen.Exists, ImageToBase64(Drawing.Image.FromFile(Imagen.FullName), Drawing.Imaging.ImageFormat.Png), "")))
|
||||
Dim LogoRuta As String = String.Format("file://{0}", Imagen.FullName)
|
||||
Dim params As New List(Of ReportParameter)
|
||||
params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
|
||||
params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
|
||||
params.Add(New ReportParameter("FechaImpresion", Now.ToDateTime.ToShortDateString))
|
||||
params.Add(New ReportParameter("AgrupoPor", $"{FechaCorte}{Usuario}"))
|
||||
If Imagen.Exists Then
|
||||
params.Add(New ReportParameter("LogoPath", logouri))
|
||||
params.Add(New ReportParameter("LogoPath", LogoRuta))
|
||||
Else
|
||||
params.Add(New ReportParameter("LogoPath", ""))
|
||||
End If
|
||||
@@ -1124,7 +1127,7 @@ Partial Class PopUpVerFactura
|
||||
Private Sub ImprimeGastoContrato(CveContrato As Integer, CveContratoGasto As Integer)
|
||||
|
||||
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)
|
||||
'Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
|
||||
|
||||
Dim Dr As DataRow = Nothing
|
||||
Dim ObjContratos As New ClsContratos
|
||||
@@ -1158,7 +1161,9 @@ Partial Class PopUpVerFactura
|
||||
End If
|
||||
params.Add(New ReportParameter("Utilidad", $"$ {(SumaUtilidad - SumaGasto).ToString.FormatoNumero()}"))
|
||||
If Imagen.Exists Then
|
||||
params.Add(New ReportParameter("LogoPath", logouri))
|
||||
|
||||
Dim LogoRuta As String = String.Format("file://{0}", Imagen.FullName)
|
||||
params.Add(New ReportParameter("LogoPath", LogoRuta))
|
||||
Else
|
||||
params.Add(New ReportParameter("LogoPath", ""))
|
||||
End If
|
||||
@@ -1306,14 +1311,9 @@ Partial Class PopUpVerFactura
|
||||
If Dt.Rows.Count > 0 Then
|
||||
Dim params As New List(Of ReportParameter)
|
||||
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)
|
||||
|
||||
|
||||
'params.Add(New ReportParameter("LogoPath", If(Imagen.Exists, ImageToBase64(Drawing.Image.FromFile(Imagen.FullName), Drawing.Imaging.ImageFormat.Png), "")))
|
||||
Dim LogoRuta As String = String.Format("file://{0}", Imagen.FullName)
|
||||
|
||||
|
||||
|
||||
If Imagen.Exists Then
|
||||
params.Add(New ReportParameter("LogoPath", LogoRuta))
|
||||
Else
|
||||
@@ -1733,7 +1733,7 @@ Partial Class PopUpVerFactura
|
||||
If DtConceptos.Rows.Count > 0 Then
|
||||
Dim params As New List(Of ReportParameter)
|
||||
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)
|
||||
'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
|
||||
Dim LogoRuta As String = String.Format("file://{0}", Imagen.FullName)
|
||||
@@ -3250,8 +3250,15 @@ Partial Class PopUpVerFactura
|
||||
params.Add(New ReportParameter("NombreEntrego", Personal))
|
||||
params.Add(New ReportParameter("Responsable", Personal))
|
||||
params.Add(New ReportParameter("NombreRecibio", Capturo.ToUpper))
|
||||
Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
|
||||
params.Add(New ReportParameter("LogoPath", logouri))
|
||||
'Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
|
||||
Dim Imagen As New System.IO.FileInfo(String.Format("{0}/Logo.png", UsuarioActual.Empresa.Ruta))
|
||||
If Imagen.Exists Then
|
||||
Dim LogoRuta As String = String.Format("file://{0}", Imagen.FullName)
|
||||
params.Add(New ReportParameter("LogoPath", LogoRuta))
|
||||
Else
|
||||
params.Add(New ReportParameter("LogoPath", ""))
|
||||
End If
|
||||
|
||||
If DtMovimientos.COUNT("Serie") > 0 Then
|
||||
params.Add(New ReportParameter("MostrarSerieLote", "1"))
|
||||
Else
|
||||
@@ -3336,8 +3343,14 @@ Partial Class PopUpVerFactura
|
||||
params.Add(New ReportParameter("NombreEntrego", Capturo.ToUpper))
|
||||
params.Add(New ReportParameter("Responsable", Personal))
|
||||
params.Add(New ReportParameter("NombreRecibio", Personal))
|
||||
Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
|
||||
params.Add(New ReportParameter("LogoPath", logouri))
|
||||
'Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
|
||||
Dim Imagen As New System.IO.FileInfo(String.Format("{0}/Logo.png", UsuarioActual.Empresa.Ruta))
|
||||
If Imagen.Exists Then
|
||||
Dim LogoRuta As String = String.Format("file://{0}", Imagen.FullName)
|
||||
params.Add(New ReportParameter("LogoPath", LogoRuta))
|
||||
Else
|
||||
params.Add(New ReportParameter("LogoPath", ""))
|
||||
End If
|
||||
If DtMovimientos.COUNT("Serie") > 0 Then
|
||||
params.Add(New ReportParameter("MostrarSerieLote", "1"))
|
||||
Else
|
||||
@@ -4775,7 +4788,8 @@ Partial Class PopUpVerFactura
|
||||
End If
|
||||
|
||||
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)
|
||||
'Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
|
||||
'Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
|
||||
|
||||
If Not ReporteEmpresa.Exists Then
|
||||
params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
|
||||
@@ -4783,7 +4797,8 @@ Partial Class PopUpVerFactura
|
||||
params.Add(New ReportParameter("FechaImpresion", Now.ToDateTime.ToShortDateString))
|
||||
|
||||
If Imagen.Exists Then
|
||||
params.Add(New ReportParameter("LogoPath", logouri))
|
||||
Dim LogoRuta As String = String.Format("file://{0}", Imagen.FullName)
|
||||
params.Add(New ReportParameter("LogoPath", LogoRuta))
|
||||
Else
|
||||
params.Add(New ReportParameter("LogoPath", ""))
|
||||
End If
|
||||
@@ -4979,10 +4994,9 @@ Partial Class PopUpVerFactura
|
||||
ObjAF.Dispose()
|
||||
|
||||
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))
|
||||
Dim LogoRuta As String = String.Format("file://{0}", Imagen.FullName)
|
||||
params.Add(New ReportParameter("LogoPath", LogoRuta))
|
||||
Else
|
||||
params.Add(New ReportParameter("LogoPath", ""))
|
||||
End If
|
||||
@@ -6070,7 +6084,9 @@ Partial Class PopUpVerFactura
|
||||
params.Add(New ReportParameter("CodigoTD", CodigoTD))
|
||||
|
||||
If Imagen.Exists Then
|
||||
params.Add(New ReportParameter("LogoPath", logouri))
|
||||
|
||||
Dim LogoRuta As String = String.Format("file://{0}", Imagen.FullName)
|
||||
params.Add(New ReportParameter("LogoPath", LogoRuta))
|
||||
Else
|
||||
params.Add(New ReportParameter("LogoPath", ""))
|
||||
End If
|
||||
@@ -6128,7 +6144,7 @@ Partial Class PopUpVerFactura
|
||||
ObjPS.Dispose()
|
||||
|
||||
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)
|
||||
'Dim logouri = String.Format("{0}://{1}:{2}/Empresas/{3}/Logo.png", Request.Url.Scheme, Request.Url.Host, Request.Url.Port, UsuarioActual.CveEmpresa)
|
||||
Dim DtDatos As New DataTable
|
||||
|
||||
Dim params As New List(Of ReportParameter)
|
||||
@@ -6207,7 +6223,9 @@ Partial Class PopUpVerFactura
|
||||
params.Add(New ReportParameter("CodigoTD", CodigoTD))
|
||||
|
||||
If Imagen.Exists Then
|
||||
params.Add(New ReportParameter("LogoPath", logouri))
|
||||
|
||||
Dim LogoRuta As String = String.Format("file://{0}", Imagen.FullName)
|
||||
params.Add(New ReportParameter("LogoPath", LogoRuta))
|
||||
Else
|
||||
params.Add(New ReportParameter("LogoPath", ""))
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user