diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index e89ff7969..c6d4a2ed1 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -6356,20 +6356,6 @@ Public Class ClsPaginas Try bytes = bytes - - - 'Response.Clear() - 'Response.ContentType = "application/pdf" - 'Response.Cache.SetCacheability(HttpCacheability.Private) - 'Response.Expires = -1 - 'Response.Buffer = True - ''Uncomment to handle the file as attachment - 'Response.AddHeader("Content-Disposition", String.Format("inline; filename={0}.{1}", NombreArchivo, If(Formato = "PDF", "pdf", "xls"))) - ''Response.BinaryWrite(bytes) - 'bytes = Nothing - 'Response.End() - - Response.Buffer = True Response.Clear() If Formato = "PDF" Then @@ -6380,9 +6366,9 @@ Public Class ClsPaginas Response.AddHeader("content-disposition", String.Format("{0}; filename={1}.{2}", Content_Disposition, NombreArchivo, If(Formato = "PDF", "pdf", "xls"))) Response.BinaryWrite(bytes) ' create the file Response.Flush() ' send it to the client to download + bytes = Nothing HttpContext.Current.Response.SuppressContent = True HttpContext.Current.ApplicationInstance.CompleteRequest() - bytes = Nothing 'HttpContext.Current.Response.End() Catch ex As Exception diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb index 27a2772a3..e0bb52ba3 100644 --- a/Compras/PopUpVerFactura.aspx.vb +++ b/Compras/PopUpVerFactura.aspx.vb @@ -343,7 +343,7 @@ Partial Class PopUpVerFactura lrds.Add(rds) '"Empresas/Grales/Formatos/EquiposGPS.rdlc" '"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc" - ImprimirPDF("GPS/EmbarqueManifiesto.rdlc", lrds, params, "Manifesto") + ImprimirPDF("GPS/EmbarqueManifiesto.rdlc", lrds, params, "Manifesto", Content_Disposition:="Inline") End Sub Private Sub imprimirManifiestoRemision(cveEmbarqueManifiesto As Integer) @@ -373,6 +373,7 @@ Partial Class PopUpVerFactura Dim TotalDlls As String = "" Dim Cliente As String = "" Dim Direccion As String = "" + Dim BinsPrecio As String = "" @@ -403,6 +404,7 @@ Partial Class PopUpVerFactura CAJASDECARTON = String.Format("{0:N0}", row("CAJASDECARTON")) RPC = String.Format("{0:N0}", row("RPC")) BINSDECARTON = String.Format("{0:N0}", row("BINSDECARTON")) + BinsPrecio = String.Format("{0:N0}", row("BINSDECARTON").ToString().ToDecimal() * 5) TotalDlls = String.Format("{0:N0}", row("TotalDlls")) @@ -482,6 +484,8 @@ Partial Class PopUpVerFactura params.Add(New ReportParameter("CAJASDECARTON", CAJASDECARTON)) params.Add(New ReportParameter("RPC", RPC)) params.Add(New ReportParameter("BINSDECARTON", BINSDECARTON)) + params.Add(New ReportParameter("BinsPrecio", BinsPrecio)) + params.Add(New ReportParameter("TotalDlls", TotalDlls)) @@ -493,7 +497,7 @@ Partial Class PopUpVerFactura lrds.Add(rds) '"Empresas/Grales/Formatos/EquiposGPS.rdlc" '"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc" - ImprimirPDF("GPS/EmbarqueManifiestoRemision.rdlc", lrds, params, "Remisión") + ImprimirPDF("GPS/EmbarqueManifiestoRemision.rdlc", lrds, params, "Remisión", Content_Disposition:="Inline") End Sub @@ -521,6 +525,7 @@ Partial Class PopUpVerFactura Dim CAJASDECARTON As String = "" Dim RPC As String = "" Dim BINSDECARTON As String = "" + Dim BinsPrecio As String = "" Dim TotalDlls As String = "" Dim Cliente As String = "" Dim Direccion As String = "" @@ -659,7 +664,7 @@ Partial Class PopUpVerFactura 'GuardaLogFacturacion($"Ruta XML {ArchivoXML}") 'ResultadoMail = 3 End If - ImprimirPDF("GPS/EmbarqueManifiestoCartaPorte.rdlc", lrds, params, "DatosCartaPorte", Content_Disposition:="inline") + ImprimirPDF("GPS/EmbarqueManifiestoCartaPorte.rdlc", lrds, params, "DatosCartaPorte", Content_Disposition:="Inline") End Sub @@ -728,7 +733,7 @@ Partial Class PopUpVerFactura 'endimg '"Empresas/Grales/Formatos/EquiposGPS.rdlc" '"D:\\ADSistemas\\Proyectos\\SIG\\SIGIT\\GPS\\PalletEtiqueta.rdlc" - ImprimirPDF("GPS/PalletEtiqueta2.rdlc", lrds, params, "Pallet") + ImprimirPDF("GPS/PalletEtiqueta2.rdlc", lrds, params, "Pallet", Content_Disposition:="Inline") End Sub Private Sub imprimirpallet(cvePallet As Integer) Dim Envase As String = "" @@ -825,7 +830,7 @@ Partial Class PopUpVerFactura 'If CvetypeImpresion = 2 Then ' ruta = "GPS/PalletEtiqueta_2.rdlc" 'End If - ImprimirPDF(ruta, lrds, params, "Pallet Caja") + ImprimirPDF(ruta, lrds, params, "Pallet Caja", Content_Disposition:="Inline") End Sub #Region "U S U A R I O - T O K E N" diff --git a/GPS/EmbarqueManifiestoRemision.rdlc b/GPS/EmbarqueManifiestoRemision.rdlc index eccfa2163..188610262 100644 --- a/GPS/EmbarqueManifiestoRemision.rdlc +++ b/GPS/EmbarqueManifiestoRemision.rdlc @@ -541,7 +541,6 @@ 2 - true @@ -2081,7 +2080,7 @@ Hermosillo, Sonora, Mexico - $1.00 + $5.00 + true @@ -2866,6 +2866,12 @@ Hermosillo, Sonora, Mexico true ReportParameter1 + + String + true + true + ReportParameter1 + diff --git a/GPS/PalletEtiqueta2.rdlc b/GPS/PalletEtiqueta2.rdlc index e75b2bc6e..656ddb873 100644 --- a/GPS/PalletEtiqueta2.rdlc +++ b/GPS/PalletEtiqueta2.rdlc @@ -40,16 +40,16 @@ - 2.20952cm + 2.81806cm - 1.99728cm + 2.93411cm - 1.99728cm + 2.28832cm - 3.44561cm + 2.65186cm @@ -224,39 +224,11 @@ 2pt - 2 + 3 - - - - true - true - - - - - - - - 2pt - 2pt - 2pt - 2pt - - - - + @@ -323,39 +295,11 @@ 2pt - 2 + 3 - - - - true - true - - - - - - - - 2pt - 2pt - 2pt - 2pt - - - - + @@ -422,39 +366,11 @@ 2pt - 2 + 3 - - - - true - true - - - - - - - - 2pt - 2pt - 2pt - 2pt - - - - + @@ -522,39 +438,11 @@ 2pt - 2 + 3 - - - - true - true - - - - - - - - 2pt - 2pt - 2pt - 2pt - - - - + @@ -621,39 +509,11 @@ 2pt - 2 + 3 - - - - true - true - - - - - - - - 2pt - 2pt - 2pt - 2pt - - - - + @@ -1354,12 +1214,11 @@ - 0.38833cm + 0.45921cm - true true @@ -1390,7 +1249,6 @@ - true true @@ -2011,7 +1869,6 @@ - true true @@ -2042,7 +1899,6 @@ - true true @@ -2663,7 +2519,6 @@ - true true @@ -2694,7 +2549,6 @@ - true true @@ -3315,7 +3169,6 @@ - true true @@ -3346,7 +3199,6 @@ - true true @@ -3754,8 +3606,8 @@ 0.0762cm 0.10266cm - 12.50875cm - 9.64969cm + 12.57959cm + 10.69235cm @@ -3763,10 +3615,10 @@ - 4.95471in + 5.09718in