Merge branch 'master' of http://jperez@192.168.10.111:8383/SIG.git

Inventarios/RecepcionAlmacen.aspx.vb

@@ -935,7 +935,7 @@ Partial Class Inventarios_RecepcionAlmacen
                 End If
 
                 If CveTipoCompra = 9 Then
-                    CargaAlmacenes(-1, "21", CveTipoCompra)
+                    CargaAlmacenes(-1, "27", CveTipoCompra)
                 End If
 
                 If CveTipoCompra = 10 Then

Inventarios/RepAlmacen.aspx

@@ -171,16 +171,8 @@
                             <asp:Label ID="LtlAlmacen" runat="server" Text='<%# Eval("TipoAlmacen")%>'></asp:Label>
                         </ItemTemplate>
                     </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Existencia" ItemStyle-HorizontalAlign="Right">
-                        <ItemTemplate>
-                            <asp:Label ID="LtlExist" runat="server" Text='<%# Eval("Existencia", "{0:#,###.##}")%>'></asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Total" ItemStyle-HorizontalAlign="Right">
-                        <ItemTemplate>
-                            <asp:Label ID="LtlTotal" runat="server" Text='<%# Eval("Total", "{0:#,##0.00}")%>'></asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
+                    <asp:BoundField HeaderText="Existencia" DataField="Existencia" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
+                    <asp:BoundField HeaderText="Total" DataField="Total" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" />
                 </Columns>
             </asp:GridView>
         </ContentTemplate>

Inventarios/RepAlmacen.aspx.vb

@@ -4,6 +4,8 @@ Option Explicit On
 Imports Extensiones
 Imports System.Data
 Imports Microsoft.Reporting.WebForms
+Imports GemBox.Spreadsheet
+Imports System.IO
 
 Partial Class Inventarios_RepAlmacen
     Inherits ClsPaginas
@@ -76,10 +78,10 @@ Partial Class Inventarios_RepAlmacen
     End Sub
 
 #Region "I M P R I M I R  <i class='fa fa-print'></i>"
-    Protected Sub LnkExportar_Click(sender As Object, e As EventArgs) Handles LnkExportar.Click
-        'GVAlmacen.ExportToExcel("RepFacturas_" & Now.ToShortDateString())
-        GenerarPDF("EXCEL")
-
+    Protected Sub LnkExportar_Click(sender As Object, e As EventArgs) Handles LnkExportar.Click
+
+        GenerarPDF("EXCEL")
+
     End Sub
     Private Sub GenerarPDF(Optional Formato As String = "PDF")
         Dim Imagen As New System.IO.FileInfo(String.Format("{0}/Logo.png", UsuarioActual.Empresa.Ruta))