diff --git a/App_Code/modExtensiones.vb b/App_Code/modExtensiones.vb
index ed867167f..c9901fe10 100644
--- a/App_Code/modExtensiones.vb
+++ b/App_Code/modExtensiones.vb
@@ -2405,21 +2405,35 @@ Namespace Extensiones
                 Dim indexRowGV As Integer = 0
                 Dim cssClassRow As String = ""
 
+                Dim CountRowFiltros As Integer = -1
+                If DatosFiltros.Trim.Length > 0 Then
+                    CountRowFiltros = 0
+                End If
+
                 For indexRow = 8 To worksheet.Rows.Count - 4
 
                     Try
                         cssClassRow = GridView.Rows(indexRowGV).CssClass.Trim()
 
                         Select Case cssClassRow
+
+                            Case "Totales"
+                                worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.FillPattern.SetSolid(System.Drawing.ColorTranslator.FromHtml("#67809f"))
+                                worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Weight = 1000
+                                worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Color = System.Drawing.ColorTranslator.FromHtml("#ddd")
+                                Exit Select
                             Case "SubTotales2"
-                                worksheet.Cells.GetSubrangeRelative(indexRow - 1, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.FillPattern.SetSolid(System.Drawing.ColorTranslator.FromHtml("#c0c0c0"))
-                                worksheet.Cells.GetSubrangeRelative(indexRow - 1, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Weight = 1000
-                                worksheet.Cells.GetSubrangeRelative(indexRow - 1, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Color = System.Drawing.ColorTranslator.FromHtml("#000077")
+                                worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.FillPattern.SetSolid(System.Drawing.ColorTranslator.FromHtml("#c0c0c0"))
+                                worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Weight = 1000
+                                worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Color = System.Drawing.ColorTranslator.FromHtml("#000077")
+                                Exit Select
                             Case "SubTotales"
-                                worksheet.Cells.GetSubrangeRelative(indexRow - 1, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.FillPattern.SetSolid(System.Drawing.ColorTranslator.FromHtml("#dddddd"))
-                                worksheet.Cells.GetSubrangeRelative(indexRow - 1, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Weight = 1000
-                                worksheet.Cells.GetSubrangeRelative(indexRow - 1, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Color = System.Drawing.ColorTranslator.FromHtml("#67809F")
+                                worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.FillPattern.SetSolid(System.Drawing.ColorTranslator.FromHtml("#dddddd"))
+                                worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Weight = 1000
+                                worksheet.Cells.GetSubrangeRelative(indexRow + CountRowFiltros, 0, celdasConTexto.LastColumnIndex + 1, 1).Style.Font.Color = System.Drawing.ColorTranslator.FromHtml("#67809F")
+                                Exit Select
                             Case Else
+                                Exit Select
                         End Select
 
                     Catch ex As Exception
diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb
index f2d3ddd4d..05fcb23df 100644
--- a/Compras/Compras.aspx.vb
+++ b/Compras/Compras.aspx.vb
@@ -5472,7 +5472,7 @@ Partial Class Compras_Compras
                                             ' If DdlMoneda.SelectedValue.ToEntero = 1 Or (DdlMoneda.SelectedValue.ToEntero > 1 AndAlso GlobalTipoCambio(TxtFecha.Text.ToDate) > 0) Then
 
                                             ''ALMACEN CONSIGNACION
-                                            If CveConsignacion > 0 Then
+                                            If CveConsignacion > 0 AndAlso CveCompraRefacturacion <= 0 Then
 
                                                 'actualizamos cvecompraconsignacion
                                                 For Each gvr As GridViewRow In GvInv.Rows
@@ -5595,7 +5595,7 @@ Partial Class Compras_Compras
                                                 Dim indice = 0
                                                 Dim ImporteConcepto As Decimal = 0
 
-                                                If DdlTipoComprobante.SelectedValue = "Fac" Then
+                                                If DdlTipoComprobante.SelectedValue = "Fac" AndAlso CveCompraRefacturacion <= 0 Then
 
                                                     For Each tCveAlmacen As Integer In ListAlmacenes
                                                         If GvInv.Rows(indice).FCDropDownList("DdlRecibirInv").SelectedValue = "1" Then
diff --git a/Compras/eFacturas.aspx.vb b/Compras/eFacturas.aspx.vb
index 8aa6f6ece..6f4633835 100644
--- a/Compras/eFacturas.aspx.vb
+++ b/Compras/eFacturas.aspx.vb
@@ -4276,11 +4276,12 @@ Partial Class Compras_eFacturas
                 Alert($"PDF  Error se genero nulo", TipoMensaje.MsgAdvertencia)
             End If
 
+            CargaDatos()
+
         Catch ex As Exception
             Alert($"PDF  Error {ex.Message} -- > {ex.StackTrace}", TipoMensaje.MsgAdvertencia)
         End Try
 
-        Alert("PDF  Finaliza", TipoMensaje.MsgAdvertencia)
 
 
 
diff --git a/CxC/RepCxCDetalle.aspx.vb b/CxC/RepCxCDetalle.aspx.vb
index a62db7b56..c598ec10f 100644
--- a/CxC/RepCxCDetalle.aspx.vb
+++ b/CxC/RepCxCDetalle.aspx.vb
@@ -922,7 +922,7 @@ Partial Class RepCxCDetalle
 
         Dim Filtro As String = $"{Cliente}{Sucursal}{Grupo}{Vendedor}{FechaIn}{FechaFn}{Registro}{Responsable}{TipoDocto}{EstatusCob}{FVI}{FVF}{ClasificacionCli}{CorteA}"
 
-        ExportToExcelGembox(GvDatos, "ReporteCxCDetalle", UsuarioActual, "REPORTE DE CUENTAS POR COBRAR DEL CLIENTE CON DETALLE", DatoTituloExtra:=$"", DatosFiltros:=Filtro)
+        GvDatos.ExportToExcelGembox("ReporteCxCDetalle", UsuarioActual, "REPORTE DE CUENTAS POR COBRAR DEL CLIENTE CON DETALLE", DatoTituloExtra:=$"", DatosFiltros:=Filtro)
         'GvDatos.ExportToExcelG("ReporteCxCDetalle", "REPORTE DE CUENTAS POR COBRAR DEL CLIENTE CON DETALLE", UsuarioActual, Filtro)
 
         'SpreadsheetInfo.SetLicense(SerialGemBoxSpreadsheet())
diff --git a/Inventarios/RecepcionAlmacen.aspx b/Inventarios/RecepcionAlmacen.aspx
index 7bdbdd133..d66ae6da0 100644
--- a/Inventarios/RecepcionAlmacen.aspx
+++ b/Inventarios/RecepcionAlmacen.aspx
@@ -3,6 +3,11 @@
 <asp:Content ID="Content1" ContentPlaceHolderID="CP" runat="Server">
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="Css" runat="Server">
+    <style>
+        #aDivCodigoSeriePS:hover{
+            color:black;
+        }
+    </style>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="HB" runat="Server">
     <li>
@@ -454,49 +459,66 @@
 
     <%-- GV DATOS --%>
     <div class="portlet light smmallpadding bordered ">
-        <div class="portlet-title">
+        <div class="portlet-title xspadding">
             <div class="caption font-green">
                 <i class="icon-pin font-green"></i>
                 <span class="caption-subject bold uppercase">Entrada a Inventario</span>
             </div>
             <div class="actions">
-                <div class="btn-group">
-                    
-                    <asp:UpdatePanel runat="server">
-                        <ContentTemplate>
-                            <div  runat="server" id="DivCodigoSeriePS" clientidmode="Static" visible="false">                               
-                                    <table >
-                                        <tr>                                           
-                                            <td><i class="fa fa-barcode" style="font-size: 1.8em; margin-top: 8px;" aria-hidden="true" data-toggle="tooltip" title="Código Barras"></i></td>
-                                            <td>
-                                                <asp:Panel ID="PanelCodigo" runat="server" DefaultButton="BtnCodigoPS">
-                                                    <asp:TextBox ID="TxtCodigoPS" Width="140px" ClientIDMode="Static" Text="" runat="server" />
-                                                    <asp:Button Text="" ID="BtnCodigoPS" OnClick="BtnCodigoPS_Click" Style="display: none" runat="server" />
-                                                </asp:Panel>
-                                            </td>
-                                            <td runat="server" visible="false" id="TdSeriePS">
-                                                <asp:Panel ID="PanelSerie" runat="server" DefaultButton="BtnSeriePS">
-                                                    <asp:TextBox ID="TxtSeriePS" Text="" runat="server" />
-                                                    <asp:Button Text="" ID="BtnSeriePS" OnClick="BtnSeriePS_Click" Style="display: none" runat="server" />
-                                                </asp:Panel>
-                                            </td>
-                                        </tr>
-                                    </table>                                
-                            </div>
-                        </ContentTemplate>
-                    </asp:UpdatePanel>
+                <div class="btn-group">       
+                       
                 </div>
             </div>
             <div class="tools">
-                <a href="javascript:;" class="collapse"></a>
+
+
+                <a id="aDivCodigoSeriePS">
+                    <asp:UpdatePanel runat="server" RenderMode="Inline" ID="UpCodigoSeriePS">
+                        <ContentTemplate>
+
+                            <div runat="server" id="DivCodigoSeriePS" visible="false">
+                                <table class="d-inline-block">
+                                    <tr>
+                                        <td><i class="fa fa-barcode fa-5x" style="font-size: 20px; margin-top: 4px;" aria-hidden="true" data-toggle="tooltip" title="Código Barras"></i></td>
+                                        <td>
+                                            <asp:Panel ID="PanelCodigo" runat="server" DefaultButton="BtnCodigoPS">
+                                                <asp:TextBox ID="TxtCodigoPS" Width="140px" ClientIDMode="Static" Text="" runat="server" />
+                                                <asp:Button Text="" ID="BtnCodigoPS" OnClick="BtnCodigoPS_Click" Style="display: none" runat="server" />
+                                            </asp:Panel>
+                                        </td>
+
+                                        <td runat="server" visible="false" id="TdSeriePS">
+                                            <asp:Panel ID="PanelSerie" runat="server" DefaultButton="BtnSeriePS">
+                                                <asp:TextBox ID="TxtSeriePS" Text="" runat="server" />
+                                                <asp:Button Text="" ID="BtnSeriePS" OnClick="BtnSeriePS_Click" Style="display: none" runat="server" />
+                                            </asp:Panel>
+                                        </td>
+
+                                    </tr>
+                                </table>
+                            </div>
+
+
+                        </ContentTemplate>
+                    </asp:UpdatePanel>
+
+                </a>
+                <a href="javascript:;" class="collapse d-inline-block" data-original-title="" title=""></a>
+
+
+
             </div>
         </div>
         <div class="portlet-body form-horizontal form-row-sepe formnombottom">
-             <asp:UpdatePanel ID="UPInv" runat="server" UpdateMode="Conditional">
+
+            <asp:UpdatePanel ID="UPInv" runat="server" UpdateMode="Conditional">
                 <ContentTemplate>
+
+                  
+
                     <asp:GridView ID="GvInv" runat="server" EmptyDataText="Aun no hay registros." AutoGenerateColumns="False" ShowFooter="True" ShowHeader="true" ShowHeaderWhenEmpty="True"
                         DataKeyNames="EntregaDirecta,Consec,CodigoBarras,CvePS,CveUM,PU,CantidadC,CantidadF,UM,PS,CveCompraDetalle,CveOrdenCompraDetalle,PUExtranjero,AplicaSerieLote,CveClasificacion,Codigo,CveVentaDetalle,CostoIndirecto,CveTamaño,Lote,AplicaSeccion,AplicaLote,AplicaCaducidad,AplicaSerie" HeaderStyle-CssClass="Titulos" RowStyle-Height="25px" CssClass="table table-striped table-hover Widthall ScrollAD mysmallbtn" data-heighterror="450" data-freezerows="1" GridLines="None">
-                        <HeaderStyle Height="28px" />
+                        <HeaderStyle Height="58px" />
                         <Columns>
                             <asp:TemplateField>
                                 <ItemTemplate>
@@ -507,17 +529,17 @@
                             <asp:BoundField HeaderText="Original" DataField="CantidadC" DataFormatString="{0:#,##0.####}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="5%" />
                             <asp:BoundField HeaderText="Recibidó" DataField="CantidadS" DataFormatString="{0:#,##0.####}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="5%" Visible="false" />
                             <asp:BoundField HeaderText="Por Recibir" DataField="CantidadF" DataFormatString="{0:#,##0.##}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="5%" Visible="false" />
-                            <asp:TemplateField HeaderText="Cant. a Recibir" ItemStyle-Width="12.5%">
+                            <asp:TemplateField HeaderText="Cant. a Recibir" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Right">
                                 <ItemTemplate>
-                                    <asp:TextBox ID="TbCantidadF" runat="server" Width="50px" Mask="9,999.99" Text="0" Style="text-align: right; "></asp:TextBox>
+                                    <asp:TextBox ID="TbCantidadF" runat="server" Width="60px" Mask="9,999.99" Text="0"></asp:TextBox>
                                     <ajax:FilteredTextBoxExtender ID="SoloNumerosCantidadF" runat="server" TargetControlID="TbCantidadF" FilterType="Numbers,custom" ValidChars="." />
                                     <asp:Button Text="Serie" ID="BtnSerie" OnClick="BtnSerie_Click" CssClass="btn btn-primary btn-sm" runat="server" Visible="false" />
                                     <asp:Button Text="Lote" ID="BtnLote" CssClass="btn btn-primary" OnClick="BtnLote_Click" runat="server" Visible="false" />
                                 </ItemTemplate>
                             </asp:TemplateField>
                             <asp:BoundField HeaderText="Unidad" DataField="UM" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="7.5%" />
-                            <asp:HyperLinkField HeaderText="Producto" DataTextField="CodigoPS" DataNavigateUrlFields="CvePS" DataNavigateUrlFormatString="/Ventas/ProductosServicios.aspx?CvePS={0}" Target="_blank" ItemStyle-HorizontalAlign="Left" />
-                            <asp:BoundField HeaderText="SubProyecto" DataField="SubProyecto" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="10%" />
+                            <asp:HyperLinkField HeaderText="Producto o Servicio" DataTextField="CodigoPS" DataNavigateUrlFields="CvePS" DataNavigateUrlFormatString="/Ventas/ProductosServicios.aspx?CvePS={0}" Target="_blank" ItemStyle-HorizontalAlign="Left" />
+                            <asp:BoundField HeaderText="SubProyecto" DataField="SubProyecto" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="7.5%" />
                             <asp:BoundField HeaderText="P.U." DataField="PU" DataFormatString="{0:#,###.####}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="7.5%" />
                             <asp:BoundField HeaderText="C.I." DataField="CostoIndirecto" DataFormatString="{0:###.####}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="7.5%" />
                             <asp:TemplateField HeaderText="Total" ItemStyle-HorizontalAlign="Right" FooterStyle-HorizontalAlign="Right" ItemStyle-Width="7.5%">
diff --git a/OC/OC.aspx b/OC/OC.aspx
index 4b0f83c28..db50d4266 100644
--- a/OC/OC.aspx
+++ b/OC/OC.aspx
@@ -1029,7 +1029,8 @@
                                             <%-- 8 --%>
                                             <asp:TemplateField>
                                                 <ItemTemplate>
-                                                    <asp:Literal ID="LtlIva" runat="server" Text='<%#  If(Not IsDBNull(Eval("IVA")), If(Eval("IVA").ToString <> "0", String.Concat(Eval("IVA", "{0:#,##0.00####}"), "<br>", Eval("IVAPorcentaje", "{0:0.### %}")), ""), "")  %>'></asp:Literal>
+                                                    <%--<asp:Literal ID="LtlIva" runat="server" Text='<%#  If(Not IsDBNull(Eval("IVA")), If(Eval("IVA").ToString <> "0", String.Concat(Eval("IVA", "{0:#,##0.00####}"), "<br>", Eval("IVAPorcentaje", "{0:0.### %}")), ""), "")  %>'></asp:Literal>--%>
+                                                    <asp:Literal ID="LtlIva" runat="server" Text='<%#  If(Not IsDBNull(Eval("IVA")), If(Eval("IVA").ToString <> "0", String.Concat(Eval("IVA", "{0:#,##0.00####}"), "<br>", If(Not IsDBNull(Eval("IVAPorcentaje")) AndAlso Decimal.Parse(Eval("IVAPorcentaje").ToString) > 0.10001, "16.00 %", Eval("IVAPorcentaje", "{0:0.### %}"))), ""), "")  %>'></asp:Literal>
                                                 </ItemTemplate>
                                                 <ItemStyle HorizontalAlign="Right" />
                                             </asp:TemplateField>
diff --git a/Sistemas/UsuarioDetalle.aspx.vb b/Sistemas/UsuarioDetalle.aspx.vb
index ae83edfa9..4b7bbcf57 100644
--- a/Sistemas/UsuarioDetalle.aspx.vb
+++ b/Sistemas/UsuarioDetalle.aspx.vb
@@ -1383,6 +1383,9 @@ Partial Class Sistemas_UsuarioDetalle
         GlobalDTAlmacenUsuarios(-1, UsuarioActual.CveEmpresa) = Nothing
         GlobalDTUsuarioResponsable(UsuarioActual.CveEmpresa) = Nothing
         GlobalDTUsuarios(CveEmpresa:=UsuarioActual.CveEmpresa) = Nothing
+        If UsuarioActual.CveUsuario = 100 Then
+            Alert("Globals Recargados")
+        End If
         'If ObjUsuarios.GetUsuariosEmpresas(-1, UsuarioActual.CveEmpresa) Then
         '    Application("GlobalDTUsuarios") = ObjUsuarios.DtResultados
         '    Application("GlobalDTUsuarioResponsable") = ObjUsuarios.DtResultados.FiltraParametros("ProveedoresResponsables > 0")