From 28d3256b06cd8ec7e64f5bdd49d5f73488c78f38 Mon Sep 17 00:00:00 2001
From: Jonathan Alexis Perez Morales <jonathan.perez@adssistemas.mx>
Date: Tue, 10 Sep 2019 18:24:18 -0700
Subject: [PATCH] Impresion de agrupado en inventario fisico,filtro multiple
 almacen en RepAlmacen

---
 Inventarios/InventarioFisicoDetalle.aspx |  4 ++--
 Inventarios/RepAlmacen.aspx              | 19 +++++++++----------
 Inventarios/RepAlmacen.aspx.vb           |  1 +
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Inventarios/InventarioFisicoDetalle.aspx b/Inventarios/InventarioFisicoDetalle.aspx
index d92b361db..097783418 100644
--- a/Inventarios/InventarioFisicoDetalle.aspx
+++ b/Inventarios/InventarioFisicoDetalle.aspx
@@ -98,8 +98,8 @@
     <li>
         <asp:LinkButton ID="LnkPDF" runat="server"><i class="fa fa-ad-pdf"></i> Imprimir PDF</asp:LinkButton>
     </li>
-        <li>
-        <asp:LinkButton ID="LnkPDFResumido" runat="server"><i class="fa fa-ad-pdf"></i> Imprimir PDF</asp:LinkButton>
+    <li>
+        <asp:LinkButton ID="LnkPDFResumido" runat="server"><i class="fa fa-ad-pdf"></i> Imprimir PDF Resumido</asp:LinkButton>
     </li>
     <li>
         <asp:LinkButton ID="LnkExcel" runat="server"><i class="fa fa-ad-excel"></i> Imprimir EXCEL</asp:LinkButton>
diff --git a/Inventarios/RepAlmacen.aspx b/Inventarios/RepAlmacen.aspx
index 77782e614..5d4b16180 100644
--- a/Inventarios/RepAlmacen.aspx
+++ b/Inventarios/RepAlmacen.aspx
@@ -120,14 +120,16 @@
                             <div class="col-md-2 v-center">
                                 <asp:ListBox ID="DdlAlmacen" SelectionMode="Multiple" CssClass="form-control  ddlFiltros input-sm select2me Widthall" DataTextField="Almacen" DataValueField="CveAlmacen" Style="width: 100%;" runat="server"></asp:ListBox>
                             </div>
-                            <div class="col-md-1 truncate v-center" style="text-align: right!important">Tipo Almacen:</div>
-                            <div class="col-md-2 v-center">
-                                <asp:ListBox ID="DdlTipoAlmacen" SelectionMode="Multiple" CssClass="form-control  ddlFiltros input-sm select2me Widthall" DataTextField="TipoAlmacen" DataValueField="CveTipoAlmacen" Style="width: 100%;" runat="server"></asp:ListBox>
+                            <div class="col-md-1 truncate" style="text-align: right!important">Sucursal:</div>
+                            <div class="col-md-2">
+                                <asp:DropDownList ID="DdlSucursal" runat="server" CssClass="input-small input-sm select2me" Width="100%" DataTextField="SubProyecto" DataValueField="CveSubProyecto">
+                                    <asp:ListItem Text="Todas" Value="-1" Selected="True"> </asp:ListItem>
+                                </asp:DropDownList>
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="portlet-body" style="display: none;">
+                <div class="portlet-body" style=" <%= IIf(chkexpand.Checked = True, "display:block;", "display:none;")%>">
                     <div class="row">
                         <div class="col-md-1 truncate" style="text-align: right!important">Modalidad:</div>
                         <div class="col-md-1">
@@ -137,16 +139,13 @@
                                 <asp:ListItem Text="No Contable" Value="0"></asp:ListItem>
                             </asp:DropDownList>
                         </div>
-                        <div class="col-md-1 truncate" style="text-align: right!important">Sucursal:</div>
-                        <div class="col-md-1">
-                            <asp:DropDownList ID="DdlSucursal" runat="server" CssClass="input-small input-sm select2me" Width="100%" DataTextField="SubProyecto" DataValueField="CveSubProyecto">
-                                <asp:ListItem Text="Todas" Value="-1" Selected="True"> </asp:ListItem>
-                            </asp:DropDownList>
+                        <div class="col-md-1 truncate v-center" style="text-align: right!important">Tipo Almacen:</div>
+                        <div class="col-md-2 v-center">
+                            <asp:ListBox ID="DdlTipoAlmacen" SelectionMode="Multiple" CssClass="form-control  ddlFiltros input-sm select2me Widthall" DataTextField="TipoAlmacen" DataValueField="CveTipoAlmacen" Style="width: 100%;" runat="server"></asp:ListBox>
                         </div>
                         <div class="col-md-2">
                             <asp:CheckBox ID="ChkInventariable" CssClass="md-checksd" runat="server" Text="Aplica Inventario" />
                         </div>
-
                     </div>
                 </div>
             </div>
diff --git a/Inventarios/RepAlmacen.aspx.vb b/Inventarios/RepAlmacen.aspx.vb
index 027c6d4e7..6fd8c20ba 100644
--- a/Inventarios/RepAlmacen.aspx.vb
+++ b/Inventarios/RepAlmacen.aspx.vb
@@ -72,6 +72,7 @@ Partial Class Inventarios_RepAlmacen
     Private Sub BtnConsultar_Click(sender As Object, e As EventArgs) Handles BtnConsultar.Click
         CargaDatos()
         UpDatos.Update()
+        UPFiltros.Update()
     End Sub
 
 #Region "I M P R I M I R  <i class='fa fa-print'></i>"