From 6f6a0a5dbe257c67e41d42da246fb79dbe3c7ffa Mon Sep 17 00:00:00 2001
From: JORGE LUIS CAUDILLO ESPARZA <caudillo_90@hotmail.com>
Date: Mon, 2 May 2022 18:44:05 -0700
Subject: [PATCH]

---
 App_Code/ClsPaginas.vb              |  16 +--
 Compras/PopUpVerFactura.aspx.vb     |  15 ++-
 GPS/EmbarqueManifiestoRemision.rdlc |  12 +-
 GPS/PalletEtiqueta2.rdlc            | 186 +++-------------------------
 vwd.webinfo                         |   4 +
 5 files changed, 43 insertions(+), 190 deletions(-)

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 @@
                           </Style>
                         </Textbox>
                         <ColSpan>2</ColSpan>
-                        <rd:Selected>true</rd:Selected>
                       </CellContents>
                     </TablixCell>
                     <TablixCell />
@@ -2081,7 +2080,7 @@ Hermosillo, Sonora, Mexico
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>$1.00</Value>
+                                  <Value>$5.00</Value>
                                   <Style />
                                 </TextRun>
                               </TextRuns>
@@ -2132,7 +2131,7 @@ Hermosillo, Sonora, Mexico
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>=Parameters!BINSDECARTON.Value</Value>
+                                  <Value>=Parameters!BinsPrecio.Value</Value>
                                   <Style />
                                 </TextRun>
                               </TextRuns>
@@ -2341,6 +2340,7 @@ Hermosillo, Sonora, Mexico
                             <PaddingBottom>2pt</PaddingBottom>
                           </Style>
                         </Textbox>
+                        <rd:Selected>true</rd:Selected>
                       </CellContents>
                     </TablixCell>
                   </TablixCells>
@@ -2866,6 +2866,12 @@ Hermosillo, Sonora, Mexico
       <AllowBlank>true</AllowBlank>
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
+    <ReportParameter Name="BinsPrecio">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <AllowBlank>true</AllowBlank>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
   </ReportParameters>
   <EmbeddedImages>
     <EmbeddedImage Name="logojam">
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 @@
             <TablixBody>
               <TablixColumns>
                 <TablixColumn>
-                  <Width>2.20952cm</Width>
+                  <Width>2.81806cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.99728cm</Width>
+                  <Width>2.93411cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>1.99728cm</Width>
+                  <Width>2.28832cm</Width>
                 </TablixColumn>
                 <TablixColumn>
-                  <Width>3.44561cm</Width>
+                  <Width>2.65186cm</Width>
                 </TablixColumn>
               </TablixColumns>
               <TablixRows>
@@ -224,39 +224,11 @@
                             <PaddingBottom>2pt</PaddingBottom>
                           </Style>
                         </Textbox>
-                        <ColSpan>2</ColSpan>
+                        <ColSpan>3</ColSpan>
                       </CellContents>
                     </TablixCell>
                     <TablixCell />
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox388">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value />
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox388</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Style>None</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
+                    <TablixCell />
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
@@ -323,39 +295,11 @@
                             <PaddingBottom>2pt</PaddingBottom>
                           </Style>
                         </Textbox>
-                        <ColSpan>2</ColSpan>
+                        <ColSpan>3</ColSpan>
                       </CellContents>
                     </TablixCell>
                     <TablixCell />
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox384">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value />
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox384</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Style>None</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
+                    <TablixCell />
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
@@ -422,39 +366,11 @@
                             <PaddingBottom>2pt</PaddingBottom>
                           </Style>
                         </Textbox>
-                        <ColSpan>2</ColSpan>
+                        <ColSpan>3</ColSpan>
                       </CellContents>
                     </TablixCell>
                     <TablixCell />
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox380">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value />
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox380</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Style>None</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
+                    <TablixCell />
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
@@ -522,39 +438,11 @@
                             <PaddingBottom>2pt</PaddingBottom>
                           </Style>
                         </Textbox>
-                        <ColSpan>2</ColSpan>
+                        <ColSpan>3</ColSpan>
                       </CellContents>
                     </TablixCell>
                     <TablixCell />
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox376">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value />
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox376</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Style>None</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
+                    <TablixCell />
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
@@ -621,39 +509,11 @@
                             <PaddingBottom>2pt</PaddingBottom>
                           </Style>
                         </Textbox>
-                        <ColSpan>2</ColSpan>
+                        <ColSpan>3</ColSpan>
                       </CellContents>
                     </TablixCell>
                     <TablixCell />
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox372">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value />
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox372</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Style>None</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
+                    <TablixCell />
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
@@ -1354,12 +1214,11 @@
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
-                  <Height>0.38833cm</Height>
+                  <Height>0.45921cm</Height>
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Textbox75">
-                          <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -1390,7 +1249,6 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Textbox76">
-                          <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -2011,7 +1869,6 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Textbox95">
-                          <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -2042,7 +1899,6 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Textbox96">
-                          <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -2663,7 +2519,6 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Textbox115">
-                          <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -2694,7 +2549,6 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Textbox116">
-                          <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -3315,7 +3169,6 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Textbox17">
-                          <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -3346,7 +3199,6 @@
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Textbox18">
-                          <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
@@ -3754,8 +3606,8 @@
             </TablixRowHierarchy>
             <Top>0.0762cm</Top>
             <Left>0.10266cm</Left>
-            <Height>12.50875cm</Height>
-            <Width>9.64969cm</Width>
+            <Height>12.57959cm</Height>
+            <Width>10.69235cm</Width>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -3763,10 +3615,10 @@
             </Style>
           </Tablix>
         </ReportItems>
-        <Height>4.95471in</Height>
+        <Height>5.09718in</Height>
         <Style />
       </Body>
-      <Width>3.97917in</Width>
+      <Width>4.25in</Width>
       <Page>
         <PageHeight>29.7cm</PageHeight>
         <PageWidth>21cm</PageWidth>
diff --git a/vwd.webinfo b/vwd.webinfo
index b27ee6992..4bc095d77 100644
--- a/vwd.webinfo
+++ b/vwd.webinfo
@@ -474,6 +474,10 @@
     
   
     
+  
+    
+  
+