diff --git a/Compras/PopUpVerFactura.aspx.vb b/Compras/PopUpVerFactura.aspx.vb
index 409b4be64..482e6026a 100644
--- a/Compras/PopUpVerFactura.aspx.vb
+++ b/Compras/PopUpVerFactura.aspx.vb
@@ -2703,6 +2703,9 @@ Partial Class PopUpVerFactura
                         params.Add(New ReportParameter("LogoPath", ""))
                     End If
 
+                    Dim DepartamentoRecibe As String = GlobalDTRHPersonal(UsuarioActual.CveEmpresa).FiltroPrimeroValor("Departamento", String.Format("NombreCompleto = '{0}'", Recibio))
+                    Dim DepartamentoEntrego As String = GlobalDTRHPersonal(UsuarioActual.CveEmpresa).FiltroPrimeroValor("Departamento", String.Format("NombreCompleto = '{0}'", Capturo))
+
                     params.Add(New ReportParameter("Empresa", UsuarioActual.Empresa.Empresa))
                     params.Add(New ReportParameter("Concepto", "Salida por resguardo"))
                     params.Add(New ReportParameter("Almacen", Almacen))
@@ -2712,12 +2715,17 @@ Partial Class PopUpVerFactura
                     params.Add(New ReportParameter("Descuentos", ""))
                     params.Add(New ReportParameter("IVA", ""))
                     params.Add(New ReportParameter("Total", ""))
-                    'params.Add(New ReportParameter("NombreEntrego", String.Format("ENTREGÓ{0}{1}", vbCrLf, Capturo)))
+                    params.Add(New ReportParameter("NombreEntrego", String.Format("ENTREGÓ{0}{1}", vbCrLf, Capturo)))
                     params.Add(New ReportParameter("NombreRecibio", Recibio))
                     params.Add(New ReportParameter("PuestoRecibio", PuestoEntrego))
                     params.Add(New ReportParameter("PuestoEntrego", PuestoRecibio))
 
+                    If UsuarioActual.CveEmpresa = 72 Then
+                        params.Add(New ReportParameter("Sucursal", SubProyecto))
+                        params.Add(New ReportParameter("DepartamenteRecibio", DepartamentoRecibe))
+                        params.Add(New ReportParameter("DepartamentoEntrego", DepartamentoEntrego))
 
+                    End If
                     params.Add(New ReportParameter("FechaMovimiento", FechaMovimiento.ToString("dd/MM/yyyy")))
                     params.Add(New ReportParameter("UsuarioImprimio", NombreCapturo))
                     params.Add(New ReportParameter("Observaciones", Observaciones))
diff --git a/Empresas/72/Formatos/Factura.rdlc b/Empresas/72/Formatos/Factura.rdlc
index f55ce53db..fef85c978 100644
--- a/Empresas/72/Formatos/Factura.rdlc
+++ b/Empresas/72/Formatos/Factura.rdlc
@@ -787,7 +787,7 @@
               <BreakLocation>Start</BreakLocation>
             </PageBreak>
             <KeepTogether>true</KeepTogether>
-            <Top>9.87049in</Top>
+            <Top>9.18657in</Top>
             <Left>0.06548in</Left>
             <Height>1.67778in</Height>
             <Width>8.23221in</Width>
@@ -1367,7 +1367,7 @@
               </Image>
             </ReportItems>
             <KeepTogether>true</KeepTogether>
-            <Top>7.30179in</Top>
+            <Top>6.61787in</Top>
             <Left>0.05817in</Left>
             <Height>1.3508in</Height>
             <Width>8.23035in</Width>
@@ -3408,7 +3408,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox54</rd:DefaultName>
-            <Top>6.7921in</Top>
+            <Top>6.10818in</Top>
             <Left>0.16632cm</Left>
             <Height>0.36385in</Height>
             <Width>4.94037in</Width>
@@ -3444,7 +3444,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox33</rd:DefaultName>
-            <Top>17.25192cm</Top>
+            <Top>15.51477cm</Top>
             <Left>12.71485cm</Left>
             <Height>0.44794cm</Height>
             <Width>8.33799cm</Width>
@@ -3474,7 +3474,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox5</rd:DefaultName>
-            <Top>18.31722cm</Top>
+            <Top>16.58007cm</Top>
             <Left>0.16632cm</Left>
             <Height>0.0882cm</Height>
             <Width>20.88652cm</Width>
@@ -3732,7 +3732,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox5</rd:DefaultName>
-            <Top>14.71903cm</Top>
+            <Top>12.98188cm</Top>
             <Left>0.14775cm</Left>
             <Height>0.0882cm</Height>
             <Width>20.90509cm</Width>
@@ -4038,7 +4038,7 @@
               </TablixMembers>
             </TablixRowHierarchy>
             <DataSetName>DsOC</DataSetName>
-            <Top>15.01537cm</Top>
+            <Top>13.27822cm</Top>
             <Left>3.16661cm</Left>
             <Height>1.61479cm</Height>
             <Width>15.04148cm</Width>
@@ -4067,7 +4067,7 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox5</rd:DefaultName>
-            <Top>16.9459cm</Top>
+            <Top>15.20875cm</Top>
             <Left>0.22358cm</Left>
             <Height>0.0882cm</Height>
             <Width>20.90509cm</Width>
@@ -4097,24 +4097,6 @@
               </Border>
             </Style>
           </Image>
-          <Image Name="Image2">
-            <Source>Embedded</Source>
-            <Value>BannerFacturaSIG</Value>
-            <Sizing>Fit</Sizing>
-            <Top>12.35498cm</Top>
-            <Left>0.14775cm</Left>
-            <Height>2.18766cm</Height>
-            <Width>10.48062cm</Width>
-            <ZIndex>25</ZIndex>
-            <Visibility>
-              <Hidden>=iif(len(Parameters!Observaciones.Value) &gt; 100, true,false)</Hidden>
-            </Visibility>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-            </Style>
-          </Image>
           <Textbox Name="ImporteLetra">
             <CanGrow>true</CanGrow>
             <KeepTogether>true</KeepTogether>
@@ -4140,7 +4122,7 @@
             <Left>2.22035in</Left>
             <Height>0.18861in</Height>
             <Width>6.06817in</Width>
-            <ZIndex>26</ZIndex>
+            <ZIndex>25</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -4416,7 +4398,7 @@
             <Left>0.06548in</Left>
             <Height>0.34081in</Height>
             <Width>2.08542in</Width>
-            <ZIndex>27</ZIndex>
+            <ZIndex>26</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -4910,11 +4892,11 @@
               </Textbox>
             </ReportItems>
             <KeepTogether>true</KeepTogether>
-            <Top>22.07352cm</Top>
+            <Top>20.33637cm</Top>
             <Left>0.14775cm</Left>
             <Height>2.97096cm</Height>
             <Width>20.69254cm</Width>
-            <ZIndex>28</ZIndex>
+            <ZIndex>27</ZIndex>
             <Visibility>
               <Hidden>=Microsoft.VisualBasic.Interaction.IIF(First(Fields!SerieFolio.Value, "DataSet4") &lt;&gt; "", False, True)</Hidden>
             </Visibility>
@@ -4925,7 +4907,7 @@
             </Style>
           </Rectangle>
         </ReportItems>
-        <Height>29.49675cm</Height>
+        <Height>27.72404cm</Height>
         <Style />
       </Body>
       <Width>21.12867cm</Width>
diff --git a/Empresas/72/Formatos/NotaCredito.rdlc b/Empresas/72/Formatos/NotaCredito.rdlc
index 40e59cdce..135529fc6 100644
--- a/Empresas/72/Formatos/NotaCredito.rdlc
+++ b/Empresas/72/Formatos/NotaCredito.rdlc
@@ -254,7 +254,7 @@
           </Textbox>
         </ReportItems>
         <KeepTogether>true</KeepTogether>
-        <Top>6.98284in</Top>
+        <Top>6.54534in</Top>
         <Left>0.17798in</Left>
         <Height>0.98611in</Height>
         <Width>8.09734in</Width>
@@ -1186,7 +1186,7 @@
           </Textbox>
         </ReportItems>
         <KeepTogether>true</KeepTogether>
-        <Top>4.34222in</Top>
+        <Top>3.90472in</Top>
         <Left>0.14966in</Left>
         <Height>2.61856in</Height>
         <Width>8.22763in</Width>
@@ -1494,7 +1494,7 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox5</rd:DefaultName>
-        <Top>10.74498cm</Top>
+        <Top>9.63373cm</Top>
         <Left>0.48382cm</Left>
         <Height>0.14316cm</Height>
         <Width>20.56724cm</Width>
@@ -1583,7 +1583,7 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value xml:space="preserve">     </Value>
+                <Value xml:space="preserve">             </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>7pt</FontSize>
@@ -1591,7 +1591,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value>                     Culiacán, Sin.   </Value>
+                <Value>Culiacán, Sin.                  Tijuana, B.C</Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>6.37pt</FontSize>
@@ -1599,7 +1599,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value xml:space="preserve"> </Value>
+                <Value>.               </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>7pt</FontSize>
@@ -1607,15 +1607,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value xml:space="preserve">                          </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>Tijuana, B.C</Value>
+                <Value>Aguascalientes, Ags.  </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>6.37pt</FontSize>
@@ -1623,7 +1615,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value>.</Value>
+                <Value xml:space="preserve">       </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>7pt</FontSize>
@@ -1631,33 +1623,10 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value xml:space="preserve">                     </Value>
+                <Value xml:space="preserve">                 </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>Aguascalientes, Ags.</Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>6.37pt</FontSize>
-                  <FontWeight>SemiBold</FontWeight>
-                </Style>
-              </TextRun>
-            </TextRuns>
-            <Style>
-              <TextAlign>Left</TextAlign>
-            </Style>
-          </Paragraph>
-          <Paragraph>
-            <TextRuns>
-              <TextRun>
-                <Value xml:space="preserve">                     </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>7pt</FontSize>
+                  <FontSize>11pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
@@ -1678,21 +1647,13 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value xml:space="preserve">  </Value>
+                <Value xml:space="preserve">       </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
-              <TextRun>
-                <Value xml:space="preserve">          </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>11pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
               <TextRun>
                 <Value>(664)</Value>
                 <Style>
@@ -1702,29 +1663,13 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value>645 1814</Value>
+                <Value>645 1814         </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>9.1pt</FontSize>
                   <FontWeight>SemiBold</FontWeight>
                 </Style>
               </TextRun>
-              <TextRun>
-                <Value xml:space="preserve"> </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value xml:space="preserve">         </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>11pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
               <TextRun>
                 <Value>(449)</Value>
                 <Style>
@@ -1821,30 +1766,6 @@
           <PaddingBottom>2pt</PaddingBottom>
         </Style>
       </Textbox>
-      <Line Name="Line5">
-        <Top>1.69533cm</Top>
-        <Left>6.74703cm</Left>
-        <Height>0.38833cm</Height>
-        <Width>0cm</Width>
-        <ZIndex>10</ZIndex>
-        <Style>
-          <Border>
-            <Style>Solid</Style>
-          </Border>
-        </Style>
-      </Line>
-      <Line Name="Line7">
-        <Top>1.72708cm</Top>
-        <Left>9.41258cm</Left>
-        <Height>0.38833cm</Height>
-        <Width>0cm</Width>
-        <ZIndex>11</ZIndex>
-        <Style>
-          <Border>
-            <Style>Solid</Style>
-          </Border>
-        </Style>
-      </Line>
       <Textbox Name="Textbox32">
         <CanGrow>true</CanGrow>
         <KeepTogether>true</KeepTogether>
@@ -1907,7 +1828,7 @@
         <Left>0.48382cm</Left>
         <Height>1.14285cm</Height>
         <Width>4.08234cm</Width>
-        <ZIndex>12</ZIndex>
+        <ZIndex>10</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -2169,7 +2090,7 @@
         <Left>5.29091in</Left>
         <Height>1.51932in</Height>
         <Width>2.9844in</Width>
-        <ZIndex>13</ZIndex>
+        <ZIndex>11</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -2748,7 +2669,7 @@
         <Left>0.17067in</Left>
         <Height>0.37206in</Height>
         <Width>8.10465in</Width>
-        <ZIndex>14</ZIndex>
+        <ZIndex>12</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -2777,7 +2698,7 @@
         <Left>0.4335cm</Left>
         <Height>0.43419cm</Height>
         <Width>20.41027cm</Width>
-        <ZIndex>15</ZIndex>
+        <ZIndex>13</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -2788,21 +2709,6 @@
           <PaddingBottom>2pt</PaddingBottom>
         </Style>
       </Textbox>
-      <Image Name="Image2">
-        <Source>Embedded</Source>
-        <Value>Microsoft</Value>
-        <Sizing>Fit</Sizing>
-        <Top>8.23074cm</Top>
-        <Left>0.5393cm</Left>
-        <Height>2.37313cm</Height>
-        <Width>11.6363cm</Width>
-        <ZIndex>16</ZIndex>
-        <Style>
-          <Border>
-            <Style>None</Style>
-          </Border>
-        </Style>
-      </Image>
       <Textbox Name="Textbox9">
         <CanGrow>true</CanGrow>
         <KeepTogether>true</KeepTogether>
@@ -2822,7 +2728,7 @@
         <Left>14.3522cm</Left>
         <Height>0.14316cm</Height>
         <Width>6.66711cm</Width>
-        <ZIndex>17</ZIndex>
+        <ZIndex>14</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -2859,7 +2765,7 @@
         <Left>3.58384in</Left>
         <Height>0.18861in</Height>
         <Width>4.69148in</Width>
-        <ZIndex>18</ZIndex>
+        <ZIndex>15</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -2977,15 +2883,39 @@
         <Left>14.3787cm</Left>
         <Height>0.48004cm</Height>
         <Width>6.64061cm</Width>
-        <ZIndex>19</ZIndex>
+        <ZIndex>16</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
           </Border>
         </Style>
       </Tablix>
+      <Line Name="Line5">
+        <Top>1.53874cm</Top>
+        <Left>6.09322cm</Left>
+        <Height>0.38617cm</Height>
+        <Width>0cm</Width>
+        <ZIndex>17</ZIndex>
+        <Style>
+          <Border>
+            <Style>Solid</Style>
+          </Border>
+        </Style>
+      </Line>
+      <Line Name="Line6">
+        <Top>1.53874cm</Top>
+        <Left>8.82941cm</Left>
+        <Height>0.38617cm</Height>
+        <Width>0cm</Width>
+        <ZIndex>18</ZIndex>
+        <Style>
+          <Border>
+            <Style>Solid</Style>
+          </Border>
+        </Style>
+      </Line>
     </ReportItems>
-    <Height>20.24114cm</Height>
+    <Height>19.3151cm</Height>
     <Style />
   </Body>
   <Width>21.27832cm</Width>
diff --git a/Empresas/72/Formatos/NotaDevolucion.rdlc b/Empresas/72/Formatos/NotaDevolucion.rdlc
index a7f567352..0a93c35ca 100644
--- a/Empresas/72/Formatos/NotaDevolucion.rdlc
+++ b/Empresas/72/Formatos/NotaDevolucion.rdlc
@@ -254,7 +254,7 @@
           </Textbox>
         </ReportItems>
         <KeepTogether>true</KeepTogether>
-        <Top>5.71563in</Top>
+        <Top>5.21563in</Top>
         <Left>0.05298in</Left>
         <Height>0.98611in</Height>
         <Width>8.29986in</Width>
@@ -655,7 +655,7 @@
           </Image>
         </ReportItems>
         <KeepTogether>true</KeepTogether>
-        <Top>4.19067in</Top>
+        <Top>3.69067in</Top>
         <Left>0.04839in</Left>
         <Height>1.39013in</Height>
         <Width>8.30445in</Width>
@@ -963,7 +963,7 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox5</rd:DefaultName>
-        <Top>10.41499cm</Top>
+        <Top>9.14499cm</Top>
         <Left>0.13457cm</Left>
         <Height>0.14316cm</Height>
         <Width>21.08165cm</Width>
@@ -994,7 +994,7 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox5</rd:DefaultName>
-        <Top>14.28108cm</Top>
+        <Top>13.01108cm</Top>
         <Left>0.16632cm</Left>
         <Height>0.14316cm</Height>
         <Width>21.0499cm</Width>
@@ -1083,7 +1083,7 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value xml:space="preserve">     </Value>
+                <Value xml:space="preserve">             </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>7pt</FontSize>
@@ -1091,7 +1091,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value>                     Culiacán, Sin.   </Value>
+                <Value>Culiacán, Sin.                  Tijuana, B.C</Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>6.37pt</FontSize>
@@ -1099,7 +1099,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value xml:space="preserve"> </Value>
+                <Value>.               </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>7pt</FontSize>
@@ -1107,15 +1107,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value xml:space="preserve">                          </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>Tijuana, B.C</Value>
+                <Value>Aguascalientes, Ags.  </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>6.37pt</FontSize>
@@ -1123,7 +1115,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value>.</Value>
+                <Value xml:space="preserve">       </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>7pt</FontSize>
@@ -1131,33 +1123,10 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value xml:space="preserve">                     </Value>
+                <Value xml:space="preserve">                 </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>Aguascalientes, Ags.</Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>6.37pt</FontSize>
-                  <FontWeight>SemiBold</FontWeight>
-                </Style>
-              </TextRun>
-            </TextRuns>
-            <Style>
-              <TextAlign>Left</TextAlign>
-            </Style>
-          </Paragraph>
-          <Paragraph>
-            <TextRuns>
-              <TextRun>
-                <Value xml:space="preserve">                     </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>7pt</FontSize>
+                  <FontSize>11pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
@@ -1178,21 +1147,13 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value xml:space="preserve">  </Value>
+                <Value xml:space="preserve">       </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
-              <TextRun>
-                <Value xml:space="preserve">          </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>11pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
               <TextRun>
                 <Value>(664)</Value>
                 <Style>
@@ -1202,29 +1163,13 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value>645 1814</Value>
+                <Value>645 1814         </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>9.1pt</FontSize>
                   <FontWeight>SemiBold</FontWeight>
                 </Style>
               </TextRun>
-              <TextRun>
-                <Value xml:space="preserve"> </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value xml:space="preserve">         </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>11pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
               <TextRun>
                 <Value>(449)</Value>
                 <Style>
@@ -1323,7 +1268,7 @@
       </Textbox>
       <Line Name="Line5">
         <Top>1.69533cm</Top>
-        <Left>6.42953cm</Left>
+        <Left>5.79453cm</Left>
         <Height>0.38833cm</Height>
         <Width>0cm</Width>
         <ZIndex>11</ZIndex>
@@ -1335,7 +1280,7 @@
       </Line>
       <Line Name="Line7">
         <Top>1.72708cm</Top>
-        <Left>9.09508cm</Left>
+        <Left>8.46008cm</Left>
         <Height>0.38833cm</Height>
         <Width>0cm</Width>
         <ZIndex>12</ZIndex>
@@ -2274,21 +2219,6 @@
           <PaddingBottom>2pt</PaddingBottom>
         </Style>
       </Textbox>
-      <Image Name="Image2">
-        <Source>Embedded</Source>
-        <Value>Microsoft</Value>
-        <Sizing>Fit</Sizing>
-        <Top>8.19546cm</Top>
-        <Left>0.116cm</Left>
-        <Height>2.03729cm</Height>
-        <Width>11.6363cm</Width>
-        <ZIndex>17</ZIndex>
-        <Style>
-          <Border>
-            <Style>None</Style>
-          </Border>
-        </Style>
-      </Image>
       <Textbox Name="Textbox9">
         <CanGrow>true</CanGrow>
         <KeepTogether>true</KeepTogether>
@@ -2308,7 +2238,7 @@
         <Left>14.54911cm</Left>
         <Height>0.14316cm</Height>
         <Width>6.66711cm</Width>
-        <ZIndex>18</ZIndex>
+        <ZIndex>17</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -2345,7 +2275,7 @@
         <Left>3.1938in</Left>
         <Height>0.18861in</Height>
         <Width>5.15904in</Width>
-        <ZIndex>19</ZIndex>
+        <ZIndex>18</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -2463,7 +2393,7 @@
         <Left>14.57561cm</Left>
         <Height>0.48004cm</Height>
         <Width>6.64061cm</Width>
-        <ZIndex>20</ZIndex>
+        <ZIndex>19</ZIndex>
         <Style>
           <Border>
             <Style>None</Style>
@@ -2471,7 +2401,7 @@
         </Style>
       </Tablix>
     </ReportItems>
-    <Height>17.08592cm</Height>
+    <Height>15.763cm</Height>
     <Style />
   </Body>
   <Width>21.25578cm</Width>
diff --git a/Empresas/72/Formatos/Pedido.rdlc b/Empresas/72/Formatos/Pedido.rdlc
index 8c8079fad..10b86cda2 100644
--- a/Empresas/72/Formatos/Pedido.rdlc
+++ b/Empresas/72/Formatos/Pedido.rdlc
@@ -285,7 +285,7 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value xml:space="preserve">     </Value>
+                <Value xml:space="preserve">             </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>7pt</FontSize>
@@ -293,7 +293,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value>                     Culiacán, Sin.   </Value>
+                <Value>Culiacán, Sin.                  Tijuana, B.C</Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>6.37pt</FontSize>
@@ -301,7 +301,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value xml:space="preserve"> </Value>
+                <Value>.               </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>7pt</FontSize>
@@ -309,15 +309,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value xml:space="preserve">                          </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>Tijuana, B.C</Value>
+                <Value>Aguascalientes, Ags.  </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>6.37pt</FontSize>
@@ -325,7 +317,7 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value>.</Value>
+                <Value xml:space="preserve">       </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>7pt</FontSize>
@@ -333,33 +325,10 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value xml:space="preserve">                     </Value>
+                <Value xml:space="preserve">                 </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value>Aguascalientes, Ags.</Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>6.37pt</FontSize>
-                  <FontWeight>SemiBold</FontWeight>
-                </Style>
-              </TextRun>
-            </TextRuns>
-            <Style>
-              <TextAlign>Left</TextAlign>
-            </Style>
-          </Paragraph>
-          <Paragraph>
-            <TextRuns>
-              <TextRun>
-                <Value xml:space="preserve">                     </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>7pt</FontSize>
+                  <FontSize>11pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
@@ -380,21 +349,13 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value xml:space="preserve">  </Value>
+                <Value xml:space="preserve">       </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>8pt</FontSize>
                   <FontWeight>Bold</FontWeight>
                 </Style>
               </TextRun>
-              <TextRun>
-                <Value xml:space="preserve">          </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>11pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
               <TextRun>
                 <Value>(664)</Value>
                 <Style>
@@ -404,29 +365,13 @@
                 </Style>
               </TextRun>
               <TextRun>
-                <Value>645 1814</Value>
+                <Value>645 1814         </Value>
                 <Style>
                   <FontFamily>Myriad Pro</FontFamily>
                   <FontSize>9.1pt</FontSize>
                   <FontWeight>SemiBold</FontWeight>
                 </Style>
               </TextRun>
-              <TextRun>
-                <Value xml:space="preserve"> </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>8pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
-              <TextRun>
-                <Value xml:space="preserve">         </Value>
-                <Style>
-                  <FontFamily>Myriad Pro</FontFamily>
-                  <FontSize>11pt</FontSize>
-                  <FontWeight>Bold</FontWeight>
-                </Style>
-              </TextRun>
               <TextRun>
                 <Value>(449)</Value>
                 <Style>
@@ -671,7 +616,7 @@
       </Textbox>
       <Line Name="Line5">
         <Top>1.69533cm</Top>
-        <Left>6.87784cm</Left>
+        <Left>6.24284cm</Left>
         <Height>0.38833cm</Height>
         <Width>0cm</Width>
         <ZIndex>6</ZIndex>
@@ -683,7 +628,7 @@
       </Line>
       <Line Name="Line7">
         <Top>1.72708cm</Top>
-        <Left>9.54339cm</Left>
+        <Left>8.90839cm</Left>
         <Height>0.38833cm</Height>
         <Width>0cm</Width>
         <ZIndex>7</ZIndex>
diff --git a/Empresas/72/Formatos/Remision.rdlc b/Empresas/72/Formatos/Remision.rdlc
index aa470696d..61742e9bc 100644
--- a/Empresas/72/Formatos/Remision.rdlc
+++ b/Empresas/72/Formatos/Remision.rdlc
@@ -629,7 +629,7 @@
               </Textbox>
             </ReportItems>
             <KeepTogether>true</KeepTogether>
-            <Top>5.80313in</Top>
+            <Top>4.96563in</Top>
             <Left>0.04506in</Left>
             <Height>1.52153in</Height>
             <Width>8.22304in</Width>
@@ -1076,7 +1076,7 @@
                     </Style>
                   </TextRun>
                   <TextRun>
-                    <Value>=Microsoft.VisualBasic.Interaction.IIF(Parameters!Sucursal.Value = "MATRIZ", "(662) 214 2200", Microsoft.VisualBasic.Interaction.IIF(Parameters!Sucursal.Value = "Tijuana", "(664) 645 1814", Microsoft.VisualBasic.Interaction.IIF(Parameters!Sucursal.Value = "Culiacán", "(667) 715 8533", Microsoft.VisualBasic.Interaction.IIF(Parameters!Sucursal.Value = "Aguascalientes", "(449) 913 4418", ""))))</Value>
+                    <Value>=Microsoft.VisualBasic.Interaction.IIF(Parameters!Sucursal.Value = "MATRIZ" or Parameters!Sucursal.Value = "Hermosillo", "(662) 214 2200", Microsoft.VisualBasic.Interaction.IIF(Parameters!Sucursal.Value = "Tijuana", "(664) 645 1814", Microsoft.VisualBasic.Interaction.IIF(Parameters!Sucursal.Value = "Culiacán", "(667) 715 8533", Microsoft.VisualBasic.Interaction.IIF(Parameters!Sucursal.Value = "Aguascalientes", "(449) 913 4418", ""))))</Value>
                     <Style>
                       <FontFamily>Myriad Pro</FontFamily>
                       <FontSize>11.78pt</FontSize>
@@ -1116,7 +1116,7 @@
                     </Style>
                   </TextRun>
                   <TextRun>
-                    <Value>                     Culiacán, Sin.   </Value>
+                    <Value>       Culiacán, Sin.  </Value>
                     <Style>
                       <FontFamily>Myriad Pro</FontFamily>
                       <FontSize>6.37pt</FontSize>
@@ -1124,15 +1124,7 @@
                     </Style>
                   </TextRun>
                   <TextRun>
-                    <Value xml:space="preserve"> </Value>
-                    <Style>
-                      <FontFamily>Myriad Pro</FontFamily>
-                      <FontSize>7pt</FontSize>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                  <TextRun>
-                    <Value xml:space="preserve">                          </Value>
+                    <Value xml:space="preserve">                  </Value>
                     <Style>
                       <FontFamily>Myriad Pro</FontFamily>
                       <FontSize>8pt</FontSize>
@@ -1156,7 +1148,7 @@
                     </Style>
                   </TextRun>
                   <TextRun>
-                    <Value xml:space="preserve">                     </Value>
+                    <Value xml:space="preserve">                  </Value>
                     <Style>
                       <FontFamily>Myriad Pro</FontFamily>
                       <FontSize>8pt</FontSize>
@@ -1173,13 +1165,13 @@
                   </TextRun>
                 </TextRuns>
                 <Style>
-                  <TextAlign>Left</TextAlign>
+                  <TextAlign>Center</TextAlign>
                 </Style>
               </Paragraph>
               <Paragraph>
                 <TextRuns>
                   <TextRun>
-                    <Value xml:space="preserve">                     </Value>
+                    <Value xml:space="preserve">        </Value>
                     <Style>
                       <FontFamily>Myriad Pro</FontFamily>
                       <FontSize>7pt</FontSize>
@@ -1211,7 +1203,7 @@
                     </Style>
                   </TextRun>
                   <TextRun>
-                    <Value xml:space="preserve">          </Value>
+                    <Value>   |     </Value>
                     <Style>
                       <FontFamily>Myriad Pro</FontFamily>
                       <FontSize>11pt</FontSize>
@@ -1243,7 +1235,7 @@
                     </Style>
                   </TextRun>
                   <TextRun>
-                    <Value xml:space="preserve">         </Value>
+                    <Value>     |     </Value>
                     <Style>
                       <FontFamily>Myriad Pro</FontFamily>
                       <FontSize>11pt</FontSize>
@@ -1268,15 +1260,15 @@
                   </TextRun>
                 </TextRuns>
                 <Style>
-                  <TextAlign>Left</TextAlign>
+                  <TextAlign>Center</TextAlign>
                 </Style>
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox10</rd:DefaultName>
             <Top>0.13104cm</Top>
-            <Left>3.45239cm</Left>
+            <Left>3.23917cm</Left>
             <Height>2.14312cm</Height>
-            <Width>9.51761cm</Width>
+            <Width>10.69394cm</Width>
             <ZIndex>4</ZIndex>
             <Style>
               <Border>
@@ -1524,30 +1516,6 @@
               <PaddingBottom>2pt</PaddingBottom>
             </Style>
           </Textbox>
-          <Line Name="Line5">
-            <Top>1.69533cm</Top>
-            <Left>6.87784cm</Left>
-            <Height>0.38833cm</Height>
-            <Width>0cm</Width>
-            <ZIndex>7</ZIndex>
-            <Style>
-              <Border>
-                <Style>Solid</Style>
-              </Border>
-            </Style>
-          </Line>
-          <Line Name="Line7">
-            <Top>1.72708cm</Top>
-            <Left>9.54339cm</Left>
-            <Height>0.38833cm</Height>
-            <Width>0cm</Width>
-            <ZIndex>8</ZIndex>
-            <Style>
-              <Border>
-                <Style>Solid</Style>
-              </Border>
-            </Style>
-          </Line>
           <Textbox Name="Textbox36">
             <CanGrow>true</CanGrow>
             <KeepTogether>true</KeepTogether>
@@ -1874,7 +1842,7 @@
             <Left>9.54339cm</Left>
             <Height>5.00803cm</Height>
             <Width>6.98968cm</Width>
-            <ZIndex>9</ZIndex>
+            <ZIndex>7</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -1986,7 +1954,7 @@
             <Left>16.60715cm</Left>
             <Height>4.98157cm</Height>
             <Width>4.44569cm</Width>
-            <ZIndex>10</ZIndex>
+            <ZIndex>8</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2569,7 +2537,7 @@
             <Left>0.06548in</Left>
             <Height>0.37206in</Height>
             <Width>8.22304in</Width>
-            <ZIndex>11</ZIndex>
+            <ZIndex>9</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2595,7 +2563,7 @@
             <Left>0.16632cm</Left>
             <Height>0.14316cm</Height>
             <Width>20.88652cm</Width>
-            <ZIndex>12</ZIndex>
+            <ZIndex>10</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2607,24 +2575,6 @@
               <PaddingBottom>2pt</PaddingBottom>
             </Style>
           </Textbox>
-          <Image Name="Image2">
-            <Source>Embedded</Source>
-            <Value>BannerFacturaSIG</Value>
-            <Sizing>Fit</Sizing>
-            <Top>11.12025cm</Top>
-            <Left>0.22358cm</Left>
-            <Height>2.18766cm</Height>
-            <Width>10.48062cm</Width>
-            <ZIndex>13</ZIndex>
-            <Visibility>
-              <Hidden>=iif(len(Parameters!Observaciones.Value) &gt; 100, true,false)</Hidden>
-            </Visibility>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-            </Style>
-          </Image>
           <Textbox Name="Textbox9">
             <CanGrow>true</CanGrow>
             <KeepTogether>true</KeepTogether>
@@ -2644,7 +2594,7 @@
             <Left>15.11602cm</Left>
             <Height>0.14316cm</Height>
             <Width>5.93682cm</Width>
-            <ZIndex>14</ZIndex>
+            <ZIndex>11</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2681,7 +2631,7 @@
             <Left>1.063in</Left>
             <Height>0.18861in</Height>
             <Width>7.22552in</Width>
-            <ZIndex>15</ZIndex>
+            <ZIndex>12</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2707,11 +2657,11 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox5</rd:DefaultName>
-            <Top>14.44724cm</Top>
+            <Top>12.31999cm</Top>
             <Left>0.16632cm</Left>
             <Height>0.0882cm</Height>
             <Width>20.66427cm</Width>
-            <ZIndex>16</ZIndex>
+            <ZIndex>13</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2745,7 +2695,7 @@
             <Left>0.19807cm</Left>
             <Height>0.34219cm</Height>
             <Width>14.74156cm</Width>
-            <ZIndex>17</ZIndex>
+            <ZIndex>14</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2863,7 +2813,7 @@
             <Left>15.11602cm</Left>
             <Height>0.48004cm</Height>
             <Width>5.93682cm</Width>
-            <ZIndex>18</ZIndex>
+            <ZIndex>15</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2895,7 +2845,7 @@
             <Left>5.58063cm</Left>
             <Height>0.6cm</Height>
             <Width>5.12357cm</Width>
-            <ZIndex>19</ZIndex>
+            <ZIndex>16</ZIndex>
             <Visibility>
               <Hidden>=iif(Parameters!EstatusFactura.Value&lt;&gt;"",False,True)</Hidden>
             </Visibility>
@@ -2935,7 +2885,7 @@
             <Left>5.58063cm</Left>
             <Height>0.6cm</Height>
             <Width>5.12357cm</Width>
-            <ZIndex>20</ZIndex>
+            <ZIndex>17</ZIndex>
             <Visibility>
               <Hidden>=iif(Parameters!EstatusEntrega.Value&lt;&gt;"",False,True)</Hidden>
             </Visibility>
@@ -2951,7 +2901,7 @@
             </Style>
           </Textbox>
         </ReportItems>
-        <Height>18.76339cm</Height>
+        <Height>16.69964cm</Height>
         <Style />
       </Body>
       <Width>21.15868cm</Width>
diff --git a/General/RepPaqueteriasGuias.aspx.cs b/General/RepPaqueteriasGuias.aspx.cs
index ebb868210..51a8138da 100644
--- a/General/RepPaqueteriasGuias.aspx.cs
+++ b/General/RepPaqueteriasGuias.aspx.cs
@@ -264,7 +264,7 @@ public partial class General_RepPaqueteriasGuias : ClsPaginas
             DdlEstatus.Items.Insert(3, new ListItem("Entregado ", "3"));
             DdlEstatus.Items.Insert(4, new ListItem("Reasignar Nueva Entrega ", "4"));
             DdlEstatus.Items.Insert(5, new ListItem("Directo a Clientes ", "5"));
-            DdlEstatus.SelectedValue = "-1";
+            DdlEstatus.SelectedValue = "2";
         }
 
         DdlEstatusEditar.Items.Insert(0, new ListItem("Seleccione ", "-1"));
diff --git a/Inventarios/RepFletes.aspx b/Inventarios/RepFletes.aspx
index f3cd9cdf1..217c49c07 100644
--- a/Inventarios/RepFletes.aspx
+++ b/Inventarios/RepFletes.aspx
@@ -20,7 +20,17 @@
             <%--<li>
                 <asp:LinkButton ID="ImgAdd" PostBackUrl="/Inventarios/Fletes.aspx" CommandArgument="-1" runat="server"><i class="fa fa-plus-circle"></i> Registrar Nuevo Flete</asp:LinkButton>
             </li>--%>
+            <li>
+                <asp:LinkButton ID="LkbPDF" CommandArgument="-1" OnClick="LkbPDF_Click" runat="server"><i style="font-weight:bold" class="fa fa-file-pdf-o"></i> PDF</asp:LinkButton>
+            </li>
+            <li>
+                <asp:LinkButton ID="LkbExcel" CommandArgument="-1" OnClick="LkbExcel_Click" runat="server"><i style="font-weight:bold" class="fa fa-file-excel-o"></i> Excel</asp:LinkButton>
+            </li>
         </ContentTemplate>
+        <Triggers>
+            <asp:PostBackTrigger ControlID="LkbPDF" />
+            <asp:PostBackTrigger ControlID="LkbExcel" />
+        </Triggers>
     </asp:UpdatePanel>
 </asp:Content>
 <asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server">
diff --git a/Inventarios/RepFletes.aspx.vb b/Inventarios/RepFletes.aspx.vb
index 418cb8a08..abdee8011 100644
--- a/Inventarios/RepFletes.aspx.vb
+++ b/Inventarios/RepFletes.aspx.vb
@@ -3,6 +3,8 @@ Option Strict On
 
 Imports System.Data
 Imports Extensiones
+Imports Microsoft.Reporting.WebForms
+
 Partial Class Compras_RepFletes
     Inherits ClsPaginas
 
@@ -62,22 +64,57 @@ Partial Class Compras_RepFletes
     Protected Sub GvDatos_RowDataBound(sender As Object, e As GridViewRowEventArgs)
         If e.Row.RowType = DataControlRowType.DataRow Then
 
+            Dim Folio As String = e.Row.DBCampo("Folio").ToString
             Dim TipoCon As Integer = e.Row.DBCampo("TipoCon").ToString.ToEntero
             Dim CveFlete As Integer = e.Row.DBCampo("CveFlete").ToEntero()
             Dim Url As String = If(TipoCon = -1, String.Format("/Compras/Compras.aspx?CveCompra={0}", CveFlete), String.Format("/Inventarios/Fletes.aspx?CveFlete={0}", CveFlete))
             e.Row.FCHyperLink("HlkFolio").NavigateUrl = Url
             e.Row.FCHyperLink("HlkFecha").NavigateUrl = Url
             e.Row.FCHyperLink("HlkDescripcion").NavigateUrl = Url
-            'Dim Modalidad = e.Row.DBCampo("Modalidad").ToString.ToEntero
-            'Dim Liga = If(Modalidad = 1, "/OC/OC.aspx?OC", "/Compras/Compras.aspx?CveCompra")
-
-            'e.Row.Cells(4).Text = $"<a target='_blank' href='{Liga}={e.Row.DBCampo("CveDocumento")}'>{If(Modalidad = 1, "OC: ", "Compra: ")}{e.Row.DBCampo("FolioDocumento")}</a>"
-            'e.Row.Cells(5).Text = $"<a target='_blank' href='{Liga}={e.Row.DBCampo("CveDocumento")}'>{e.Row.DBCampo("FechaDocumento").ToDate.ToShortDateString}</a>"
-            'e.Row.Cells(6).Text = $"<a target='_blank' href='{Liga}={e.Row.DBCampo("CveDocumento")}'>{e.Row.DBCampo("DescripcionDocumento")}</a>"
-            'e.Row.Cells(7).Text = $"<a target='_blank' href='{Liga}={e.Row.DBCampo("CveDocumento")}'>{e.Row.DBCampo("TotalDocumento")}</a>"
+            If Folio = "Total" Then
+                e.Row.FCHyperLink("HlkFolio").Font.Underline = False
+                e.Row.CssClass = "Totales"
+            End If
 
         End If
     End Sub
+
+    Private Sub Imprimir(formato As String)
+        Dim Filtros As New StringBuilder("")
+        Filtros.AppendFormat(If(TxtFolio.Text.Length > 0, String.Format("<b>Folio: </b>{0}&nbsp;&nbsp;&nbsp;", TxtFolio.Text), ""))
+        Filtros.AppendFormat(If(DdlProveedores.SelectedValue.ToEntero() > 0, String.Format("<b>Proveedor: </b>{0}&nbsp;&nbsp;&nbsp;", DdlProveedores.SelectedText), ""))
+        Filtros.AppendFormat(If(TxtFechaI.Text.Length > 0, String.Format("<b>Fecha Inicio: </b>{0}&nbsp;&nbsp;&nbsp;", TxtFechaI.Text), ""))
+        Filtros.AppendFormat(If(TxtFechaF.Text.Length > 0, String.Format("<b>Fecha Final: </b>{0}&nbsp;&nbsp;&nbsp;", TxtFechaF.Text), ""))
+        Filtros.AppendFormat(If(DdlTipoGasto.SelectedValue.ToEntero > 0, String.Format("<b>Opción: </b>{0}&nbsp;&nbsp;&nbsp;", DdlTipoGasto.SelectedItem.Text), ""))
+        Dim params As New List(Of ReportParameter)
+
+        params.Add(New ReportParameter("Filtros", Filtros.ToString))
+        params.Add(New ReportParameter("NombreEmpresa", UsuarioActual.Empresa.Empresa))
+        params.Add(New ReportParameter("UsuarioImprimio", UsuarioActual.Nombre))
+        params.Add(New ReportParameter("FechaImpresion", Now.ToString))
+
+        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))
+        Else
+            params.Add(New ReportParameter("LogoPath", ""))
+        End If
+        Dim ArchivoRuta As New System.IO.FileInfo(String.Format("{0}Formatos/Entradas.rdlc", UsuarioActual.Empresa.Ruta))
+        If Not ArchivoRuta.Exists Then
+            ImprimirPDF(String.Format("{0}Formatos/Entradas.rdlc", UsuarioActual.Empresa.Ruta), DtFletes, params, "Reporte de fletes", formato)
+        Else
+            ImprimirPDF("Empresas/Grales/Formatos/RepFletes.rdlc", DtFletes, params, "Reporte de fletes", formato)
+        End If
+    End Sub
+
+    Protected Sub LkbPDF_Click(sender As Object, e As EventArgs)
+        Imprimir("PDF")
+    End Sub
+
+    Protected Sub LkbExcel_Click(sender As Object, e As EventArgs)
+        Imprimir("Excel")
+    End Sub
 #End Region
 
 End Class
diff --git a/Ventas/CatPS.aspx b/Ventas/CatPS.aspx
index 932dcc77c..5e8d4df70 100644
--- a/Ventas/CatPS.aspx
+++ b/Ventas/CatPS.aspx
@@ -101,15 +101,19 @@
 
 
     <li>
-        <asp:HyperLink NavigateUrl="#" data-toggle="modal" data-target="#DivReportes" ID="ImgReportes" runat="server"> <i class="fa fa-print"></i>  Productos sin SAT</asp:HyperLink>
+        <asp:HyperLink NavigateUrl="#" data-toggle="modal" data-target="#DivReportes" ID="ImgReportes" runat="server"><i style="font-weight:bold" class="fa fa-file-pdf-o"></i> Exportar productos sin SAT</asp:HyperLink>
     </li>
 
     <li>
-        <asp:LinkButton ID="LBImprimir" runat="server"><i class="fa fa-print"></i> Imprimir</asp:LinkButton>
+        <asp:LinkButton ID="LBImprimir" runat="server"><i style="font-weight:bold" class="fa fa-file-pdf-o"></i> Exportar PDF</asp:LinkButton>
     </li>
 
     <li>
-        <asp:LinkButton ID="LBExcel" runat="server"><i class="fa fa-ad-excel"></i> Exporta Excel</asp:LinkButton>
+        <asp:LinkButton ID="LBExcel" runat="server"><i style="font-weight:bold" class="fa fa-file-excel-o"></i> Exporta Excel</asp:LinkButton>
+    </li>
+
+    <li>
+        <asp:LinkButton ID="LBExcelPersonalizado" runat="server"><i style="font-weight:bold" class="fa fa-file-excel-o"></i> Excel Personalizado</asp:LinkButton>
     </li>
 
 
@@ -216,6 +220,10 @@
                             </asp:TemplateField>
                             <asp:BoundField DataField="Fecha" HeaderText="Fecha" DataFormatString="{0:d}" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center" HeaderStyle-HorizontalAlign="Center" />
                             <asp:BoundField DataField="Usuario" HeaderText="Usuario" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center" HeaderStyle-HorizontalAlign="Center" />
+                            <asp:BoundField DataField="SatPSDescripcion" HeaderText="Producto Servicio SAT" Visible="false" ItemStyle-Width="20px" />
+                            <asp:BoundField DataField="Clasificacion2" HeaderText="Clasificacion 2" Visible="false" ItemStyle-Width="20px" />
+                            <asp:BoundField DataField="Marca" HeaderText="Marca" Visible="false" ItemStyle-Width="20px" />
+                            <asp:BoundField DataField="VentaMinima" HeaderText="Venta Mínima" Visible="false" ItemStyle-Width="20px" ItemStyle-HorizontalAlign="Right" DataFormatString="{0:N2}" />
                         </Columns>
                     </asp:GridView>
                 </ContentTemplate>
@@ -277,11 +285,21 @@
                                 <asp:Label ID="Label1" runat="server" ClientIDMode="Static" Text="Personalizar Columnas"></asp:Label></h4>
                         </div>
                         <div class="modal-body">
-                            <table style="width: 335px;" class="table table-striped table-advance table-hover">
+                            <table style="width: 100%;" class="table table-striped table-advance table-hover">
                                 <tbody>
                                     <tr>
                                         <td style="text-align: left;">
                                             <asp:CheckBox ID="ChkAplicaVenta" runat="server" Text="Aplica para Venta" /></td>
+                                        <td style="text-align: left;">
+                                            <asp:CheckBox ID="ChkProductosServiciosSAT" runat="server" Text="Productos Servicios SAT" /></td>
+                                        <td style="text-align: left;">
+                                            <asp:CheckBox ID="ChkClasificacion2" runat="server" Text="Clasificación 2" /></td>
+                                        <td style="text-align: left;">
+                                            <asp:CheckBox ID="ChkMarca" runat="server" Text="Marca" /></td>
+                                    </tr>
+                                    <tr>
+                                        <td style="text-align: left;">
+                                            <asp:CheckBox ID="ChkVentaMinima" runat="server" Text="Venta Mínima" /></td>
                                     </tr>
                                 </tbody>
                             </table>
diff --git a/Ventas/CatPS.aspx.vb b/Ventas/CatPS.aspx.vb
index 584354d9e..9462aa72a 100644
--- a/Ventas/CatPS.aspx.vb
+++ b/Ventas/CatPS.aspx.vb
@@ -113,6 +113,11 @@ Partial Class CatPS
             AplicaVenta = False
         End If
 
+        GvDatos.Columns(10).Visible = ChkProductosServiciosSAT.Checked
+        GvDatos.Columns(11).Visible = ChkClasificacion2.Checked
+        GvDatos.Columns(12).Visible = ChkMarca.Checked
+        GvDatos.Columns(13).Visible = ChkVentaMinima.Checked
+
         CargaDatos()
         OrdenaDatos()
         UPDatos.Update()
@@ -255,6 +260,13 @@ Partial Class CatPS
         ImprimirbytesPDF(ImprimirPDFCrystal(Server.MapPath("~/Empresas/Grales/Formatos/CatPS.rpt"), DtDatos, lista, "Productos y Servicios", Formato), "Productos y Servicios", Formato)
 
     End Sub
+
+    Protected Sub LBExcelPersonalizado_Click(Sender As Object, e As EventArgs) Handles LBExcelPersonalizado.Click
+        ExportToExcelGembox(GvDatos, "Catálogo de Productos y Servicios", UsuarioActual, "", "", "Catálogo de Productos y Servicios", "", -1)
+    End Sub
+
+    Public Overrides Sub VerifyRenderingInServerForm(control As Control)
+    End Sub
 #End Region
 
 End Class