diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb
index 1b9fa869b..9b6533e90 100644
--- a/App_Code/ClsNominas.vb
+++ b/App_Code/ClsNominas.vb
@@ -2848,13 +2848,14 @@ Public Class ClsNominas
         End Try
         Return retorno
     End Function
-    Public Function GetTablasNomina(CveEmpresa As Integer) As Boolean
+    Public Function GetTablasNomina(CveEmpresa As Integer, Ejercicio As Integer) As Boolean
         Dim retorno As Boolean = False
         Try
             DTSet = New DataSet()
             DataAdapter("PA_Nom_Tablas", CommandType.StoredProcedure)
             With SqlAdapter.SelectCommand.Parameters
                 .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+                .Add("@Ejercicio", SqlDbType.Int).Value = Ejercicio
             End With
 
 
@@ -2869,6 +2870,29 @@ Public Class ClsNominas
         End Try
         Return retorno
     End Function
+    Public Function GetFistablasValues(CveEmpresa As Integer, CveTabla As Integer, Ejercicio As Integer) As Boolean
+        Dim retorno As Boolean = False
+        Try
+            DTSet = New DataSet()
+            DataAdapter("PA_Nom_FistablasValues", CommandType.StoredProcedure)
+            With SqlAdapter.SelectCommand.Parameters
+                .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+                .Add("@CveTabla", SqlDbType.Int).Value = CveTabla
+                .Add("@Ejercicio", SqlDbType.Int).Value = Ejercicio
+            End With
+
+
+            SqlAdapter.Fill(Data)
+            retorno = True
+        Catch sqEx As SqlException
+            retorno = False
+            OnError("Ocurrió un error al obtener las tablas de nómina.", sqEx, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+        Catch ex As Exception
+            retorno = False
+            OnError("Ocurrió un error al obtener las tablas de nómina.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+        End Try
+        Return retorno
+    End Function
 #Region "Prorrateo"
 
     Public Function ProrrateosubproyectoGET(CveEmpresa As Integer) As Boolean
diff --git a/Nomina/Nomina.aspx b/Nomina/Nomina.aspx
index d6b497d88..6b785c696 100644
--- a/Nomina/Nomina.aspx
+++ b/Nomina/Nomina.aspx
@@ -149,6 +149,14 @@
             padding-top: 2px;
             padding-bottom: 2px;
         }
+        #ModalConceptos table.table > tbody > tr > td,
+        #ModalConceptos table.table > tbody > tr > th,
+        #ModalConceptos table.table > thead > tr > td,
+        #ModalConceptos table.table > thead > tr > th {
+            font-size: 11px;
+            padding-top: 2px;
+            padding-bottom: 2px; 
+        }
 
         .GvConceptos.table > tbody > tr.ConceptosTotales td {
             border-top: 1px solid #E87E04;
@@ -323,7 +331,7 @@
                         <div class="row">
                             <label class="col-md-1 compoonenlabel" style="max-width: 65px;">Ejercicio: </label>
                             <div class="col-md-1">
-                                <asp:DropDownList ID="DdlEjercicios" runat="server" OnSelectedIndexChanged="DdlEjercicios_SelectedIndexChanged" AutoPostBack="true"  Style="width: 100% !important;" CssClass="select2me" DataValueField="Ejercicio" DataTextField="Ejercicio"></asp:DropDownList>
+                                <asp:DropDownList ID="DdlEjercicios" runat="server" OnSelectedIndexChanged="DdlEjercicios_SelectedIndexChanged" AutoPostBack="true" Style="width: 100% !important;" CssClass="select2me" DataValueField="Ejercicio" DataTextField="Ejercicio"></asp:DropDownList>
                             </div>
 
                             <label class="col-md-1 compoonenlabel" style="max-width: 100px;">Tipo Período:</label>
@@ -2862,6 +2870,28 @@
                                 <ContentTemplate>
                                     <asp:UpdatePanel ID="upDatosVacaEmpre" runat="server" UpdateMode="Conditional">
                                         <ContentTemplate>
+                                            <div class="portlet solid  grey-cascade portlet-filter">
+                                                <div class="portlet-title portlet-filterT smalltitle">
+                                                    <div class="titlefiltros  caption">
+                                                        <div class="row">
+                                                            <label class="col-md-1">Ejercicio: </label>
+                                                            <div class="col-md-1">
+                                                                <asp:TextBox ID="TxtEjercicioFiltroVacaciones" CssClass="form-control input-sm " runat="server"></asp:TextBox>
+                                                            </div>
+                                                            <div class="col-md-1">
+                                                                <asp:LinkButton ID="LnkConsultartablasVacaciones" OnClick="LnkConsultartablasVacaciones_Click" runat="server" Text="Consultar" class="btn btn-primary" />
+
+                                                            </div>
+
+                                                        </div>
+                                                    </div>
+                                                    <div class="tools">
+                                                        <%--<a href="javascript:;" class="expand" data-original-title="" title=""></a>--%>
+                                                    </div>
+                                                </div>
+                                                <div class="portlet-body" style="display: none">
+                                                </div>
+                                            </div>
                                             <div class="portlet light  xspadding bordered" id="pnlVacEmpresa">
                                                 <div class="portlet-title">
                                                     <div class="caption ">
@@ -2923,66 +2953,44 @@
                                                     </div>
                                                 </div>
                                                 <div class="portlet-body">
-                                                    
-            <div class="portlet solid  grey-cascade portlet-filter">
-                <div class="portlet-title portlet-filterT smalltitle">
-                    <div class="titlefiltros  caption">
-                        <div class="row">
-                            <label class="col-md-1">Ejercicio: </label>
-                            <div class="col-md-1">
-                                  <asp:TextBox ID="TxtEjercicioFiltroVacaciones" CssClass="form-control input-sm " runat="server"></asp:TextBox>
-                            </div>
-                            <div class="col-md-1">
-                                <asp:LinkButton ID="LnkConsultartablasVacaciones" OnClick="LnkConsultartablasVacaciones_Click" runat="server" Text="Consultar" class="btn btn-primary" />
 
-                            </div>
-
-                        </div>
-                    </div>
-                    <div class="tools">
-                        <%--<a href="javascript:;" class="expand" data-original-title="" title=""></a>--%>
-                    </div>
-                </div>
-                <div class="portlet-body" style="display: none">
-                </div>
-            </div>
-                                                <div style="width:340px">
-                                                    <asp:GridView ID="GVVacacionesEmpresas" runat="server" GridLines="None" CssClass="table table-hover table-striped Widthall ScrollAD" AutoGenerateColumns="False"
-                                                        DataKeyNames="CveEmpresa,Inicio,Fin,DiasVacaciones,Ejercicio">
-                                                        <Columns>
-                                                            <asp:TemplateField HeaderText="Ejercicio" ItemStyle-HorizontalAlign="Center">
-                                                                <ItemTemplate  >
-                                                                    <asp:Label ID="lblEjercicio" runat="server" Text='<%# Eval("Ejercicio")%>'> </asp:Label>
-                                                                </ItemTemplate>
-                                                            </asp:TemplateField>
-                                                            <asp:TemplateField HeaderText="Inicio" ItemStyle-HorizontalAlign="right">
-                                                                <ItemTemplate>
-                                                                    <asp:Label ID="lblinicio" runat="server" Text='<%# Eval("Inicio")%>'> </asp:Label>
-                                                                </ItemTemplate>
-                                                            </asp:TemplateField>
-                                                            <asp:TemplateField HeaderText="Fin" ItemStyle-HorizontalAlign="right">
-                                                                <ItemTemplate>
-                                                                    <asp:Label ID="lblfin" runat="server" Text='<%# Eval("Fin")%>'> </asp:Label>
-                                                                </ItemTemplate>
-                                                            </asp:TemplateField>
-                                                            <asp:TemplateField HeaderText="Dias Vacaciones" ItemStyle-HorizontalAlign="right">
-                                                                <ItemTemplate>
-                                                                    <asp:Label ID="Label5" runat="server" Text='<%# Eval("DiasVacaciones")%>'> </asp:Label>
-                                                                </ItemTemplate>
-                                                            </asp:TemplateField>
-                                                            <%--<asp:TemplateField Visible="false">
+                                                    <div style="width: 340px">
+                                                        <asp:GridView ID="GVVacacionesEmpresas" runat="server" GridLines="None" CssClass="table table-hover table-striped Widthall ScrollAD" AutoGenerateColumns="False"
+                                                            DataKeyNames="CveEmpresa,Inicio,Fin,DiasVacaciones,Ejercicio">
+                                                            <Columns>
+                                                                <asp:TemplateField HeaderText="Ejercicio" ItemStyle-HorizontalAlign="Center">
+                                                                    <ItemTemplate>
+                                                                        <asp:Label ID="lblEjercicio" runat="server" Text='<%# Eval("Ejercicio")%>'> </asp:Label>
+                                                                    </ItemTemplate>
+                                                                </asp:TemplateField>
+                                                                <asp:TemplateField HeaderText="Inicio" ItemStyle-HorizontalAlign="right">
+                                                                    <ItemTemplate>
+                                                                        <asp:Label ID="lblinicio" runat="server" Text='<%# Eval("Inicio")%>'> </asp:Label>
+                                                                    </ItemTemplate>
+                                                                </asp:TemplateField>
+                                                                <asp:TemplateField HeaderText="Fin" ItemStyle-HorizontalAlign="right">
+                                                                    <ItemTemplate>
+                                                                        <asp:Label ID="lblfin" runat="server" Text='<%# Eval("Fin")%>'> </asp:Label>
+                                                                    </ItemTemplate>
+                                                                </asp:TemplateField>
+                                                                <asp:TemplateField HeaderText="Dias Vacaciones" ItemStyle-HorizontalAlign="right">
+                                                                    <ItemTemplate>
+                                                                        <asp:Label ID="Label5" runat="server" Text='<%# Eval("DiasVacaciones")%>'> </asp:Label>
+                                                                    </ItemTemplate>
+                                                                </asp:TemplateField>
+                                                                <%--<asp:TemplateField Visible="false">
                                                                 <ItemTemplate>
                                                                     <asp:LinkButton data-toggle="tooltip" title="Editar" ID="LnkEditar" OnClick="LnkEditarVaca_Click" CssClass="btn btn-circle btn-sm btn-xs green" runat="server" Text="<i class='fa fa-pencil'></i>"></asp:LinkButton>
                                                                 </ItemTemplate>
                                                             </asp:TemplateField>--%>
-                                                            <asp:TemplateField>
-                                                                <ItemTemplate>
-                                                                    <asp:LinkButton ID="LnkEliminarVaca" runat="server" OnClick="LnkEliminarVaca_Click" CssClass="btn btn-circle btn-sm btn-xs red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea eliminar el VacacionesEmpresas?" data-btn-ok-label="si" />
-                                                                </ItemTemplate>
-                                                            </asp:TemplateField>
-                                                        </Columns>
-                                                    </asp:GridView>
-                                                </div>
+                                                                <asp:TemplateField>
+                                                                    <ItemTemplate>
+                                                                        <asp:LinkButton ID="LnkEliminarVaca" runat="server" OnClick="LnkEliminarVaca_Click" CssClass="btn btn-circle btn-sm btn-xs red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea eliminar el VacacionesEmpresas?" data-btn-ok-label="si" />
+                                                                    </ItemTemplate>
+                                                                </asp:TemplateField>
+                                                            </Columns>
+                                                        </asp:GridView>
+                                                    </div>
                                                 </div>
                                             </div>
                                         </ContentTemplate>
@@ -2991,24 +2999,25 @@
                             </ajax:TabPanel>
                             <ajax:TabPanel ID="TTFactorDesctInfonavit" runat="server" HeaderText="Factor descuento Infonavit">
                                 <ContentTemplate>
-                                                <div style="width:440px">
-                                    <asp:GridView ID="GVFactorDesctInfonavit" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None" AutoGenerateColumns="false">
-                                                        <Columns>
-                                                            <asp:TemplateField HeaderText="Fecha Inicio" ItemStyle-HorizontalAlign="Center">
-                                                                <ItemTemplate  >
-                                                                    <asp:Label ID="lblFechaInicio" runat="server" Text='<%# Eval("Fecha Inicio","{0:dd/MM/yyyy}")%>'> </asp:Label>
-                                                                </ItemTemplate>
-                                                            </asp:TemplateField>
-                                                            <asp:TemplateField HeaderText="Factor Descuento" ItemStyle-HorizontalAlign="right">
-                                                                <ItemTemplate>
-                                                                    <asp:Label ID="lblFactorDescuento" runat="server" Text='<%# Eval("Factor Descuento")%>'> </asp:Label>
-                                                                </ItemTemplate>
-                                                            </asp:TemplateField>
-                                                        </Columns>
-                                    </asp:GridView>
-                                                </div>
+                                    <div style="width: 440px">
+                                        <asp:GridView ID="GVFactorDesctInfonavit" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None" AutoGenerateColumns="false">
+                                            <Columns>
+                                                <asp:TemplateField HeaderText="Fecha Inicio" ItemStyle-HorizontalAlign="Center">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="lblFechaInicio" runat="server" Text='<%# Eval("Fecha Inicio","{0:dd/MM/yyyy}")%>'> </asp:Label>
+                                                    </ItemTemplate>
+                                                </asp:TemplateField>
+                                                <asp:TemplateField HeaderText="Factor Descuento" ItemStyle-HorizontalAlign="right">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="lblFactorDescuento" runat="server" Text='<%# Eval("Factor Descuento")%>'> </asp:Label>
+                                                    </ItemTemplate>
+                                                </asp:TemplateField>
+                                            </Columns>
+                                        </asp:GridView>
+                                    </div>
                                 </ContentTemplate>
                             </ajax:TabPanel>
+
                             <ajax:TabPanel ID="TTFactorSDI" runat="server" HeaderText="Factor SD" Visible="false">
                                 <ContentTemplate>
                                     <asp:GridView ID="GVFactorSDI" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
@@ -3027,7 +3036,30 @@
                             </ajax:TabPanel>
                             <ajax:TabPanel ID="TTSalariosMinimos" runat="server" HeaderText="Salarios Minimos">
                                 <ContentTemplate>
-                                    <asp:GridView ID="GVSalariosMinimos" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
+                                    <asp:GridView ID="GVSalariosMinimos" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None" AutoGenerateColumns="false">
+                                        <Columns>
+                                            <asp:TemplateField HeaderText="Vigencia" ItemStyle-HorizontalAlign="Center">
+                                                <ItemTemplate>
+                                                    <asp:Label ID="lblVigencia" runat="server" Text='<%# Eval("Vigencia") %>'> </asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="Zona A" ItemStyle-HorizontalAlign="right">
+                                                <ItemTemplate>
+                                                    <asp:Label ID="lblZonaA" runat="server" Text='<%# Eval("Zona A","{0:N2}")%>'> </asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="Zona B" ItemStyle-HorizontalAlign="right">
+                                                <ItemTemplate>
+                                                    <asp:Label ID="lblZonaB" runat="server" Text='<%# Eval("Zona B","{0:N2}")%>'> </asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField HeaderText="Zona C" ItemStyle-HorizontalAlign="right">
+                                                <ItemTemplate>
+                                                    <asp:Label ID="lblZonaC" runat="server" Text='<%# Eval("Zona C","{0:N2}")%>'> </asp:Label>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                        </Columns>
+                                    </asp:GridView>
                                 </ContentTemplate>
                             </ajax:TabPanel>
                             <ajax:TabPanel ID="TTIMMSRiesgot" runat="server" HeaderText="Riesgo de trabajo">
@@ -3090,14 +3122,44 @@
                                             </div>
                                         </div>
                                         <div class="portlet-body  ">
-                                            <asp:GridView ID="GVIMMSRiesgot" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
+                                            <div style="width: 440px">
+                                                <asp:GridView ID="GVIMMSRiesgot" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None" AutoGenerateColumns="false">
+                                                    <Columns>
+                                                        <asp:TemplateField HeaderText="Fecha Inicio" ItemStyle-HorizontalAlign="Center">
+                                                            <ItemTemplate>
+                                                                <asp:Label ID="lblFechaInicio" runat="server" Text='<%# Eval("Fecha Inicio") %>'> </asp:Label>
+                                                            </ItemTemplate>
+                                                        </asp:TemplateField>
+                                                        <asp:TemplateField HeaderText="Riesgo de Trabajo" ItemStyle-HorizontalAlign="right">
+                                                            <ItemTemplate>
+                                                                <asp:Label ID="lblRiesgodeTrabajo" runat="server" Text='<%# Eval("Riesgo de trabajo","{0:N2}")%>'> </asp:Label>
+                                                            </ItemTemplate>
+                                                        </asp:TemplateField>
+                                                    </Columns>
+                                                </asp:GridView>
+                                            </div>
                                         </div>
                                     </div>
                                 </ContentTemplate>
                             </ajax:TabPanel>
                             <ajax:TabPanel ID="TTInfonavitSegViv" runat="server" HeaderText="Infonavit seguro de vivienda">
                                 <ContentTemplate>
-                                    <asp:GridView ID="GVInfonavitSegViv" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
+                                    <div style="width: 440px">
+                                        <asp:GridView ID="GVInfonavitSegViv" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None" AutoGenerateColumns="false">
+                                            <Columns>
+                                                <asp:TemplateField HeaderText="Fecha Inicio" ItemStyle-HorizontalAlign="Center">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="lblFechaInicio" runat="server" Text='<%# Eval("Fecha Inicio") %>'> </asp:Label>
+                                                    </ItemTemplate>
+                                                </asp:TemplateField>
+                                                <asp:TemplateField HeaderText="Cuota" ItemStyle-HorizontalAlign="right">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="lblCuota" runat="server" Text='<%# Eval("Cuota")%>'> </asp:Label>
+                                                    </ItemTemplate>
+                                                </asp:TemplateField>
+                                            </Columns>
+                                        </asp:GridView>
+                                    </div>
                                 </ContentTemplate>
                             </ajax:TabPanel>
                             <ajax:TabPanel ID="TTVigISRAnual" runat="server" HeaderText="ISR Anual" Visible="false">
@@ -3107,6 +3169,28 @@
                             <ajax:TabPanel ID="TTVigISRMensual" runat="server" HeaderText="ISR ">
                                 <ContentTemplate>
 
+                                    <div class="portlet solid  grey-cascade portlet-filter">
+                                        <div class="portlet-title portlet-filterT smalltitle">
+                                            <div class="titlefiltros  caption">
+                                                <div class="row">
+                                                    <label class="col-md-1">Ejercicio: </label>
+                                                    <div class="col-md-1">
+                                                        <asp:TextBox ID="Txtejerciciotablasisr" CssClass="form-control input-sm " runat="server"></asp:TextBox>
+                                                    </div>
+                                                    <div class="col-md-1">
+                                                        <asp:LinkButton ID="LnkconsultartablasISR" OnClick="LnkconsultartablasISR_Click" runat="server" Text="Consultar" class="btn btn-primary" />
+
+                                                    </div>
+
+                                                </div>
+                                            </div>
+                                            <div class="tools">
+                                                <%--<a href="javascript:;" class="expand" data-original-title="" title=""></a>--%>
+                                            </div>
+                                        </div>
+                                        <div class="portlet-body" style="display: none">
+                                        </div>
+                                    </div>
                                     <div class="portlet light  xspadding bordered">
                                         <div class="portlet-title">
                                             <div class="caption ">
@@ -3118,8 +3202,31 @@
                                                 <a href="javascript:;" class="fullscreen" data-original-title="" title=""></a>
                                             </div>
                                         </div>
-                                        <div class="portlet-body  ">
-                                            <asp:GridView ID="GVVigISRMensual" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
+                                        <div class="portlet-body">
+                                            <asp:GridView ID="GVVigISRMensual" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None" AutoGenerateColumns="false">
+                                                <Columns>
+                                                    <asp:TemplateField HeaderText="Ejercicio" ItemStyle-HorizontalAlign="center">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblEjercicio" runat="server" Text='<%# Eval("Ejercicio")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Limite Inferior" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblLimiteinferior" runat="server" Text='<%# Eval("Limite inferior") %>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Cuota Fija" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblCuota" runat="server" Text='<%# Eval("Cuota fija")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Porcentaje" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblPorcentaje" runat="server" Text='<%# Eval("Porcentaje")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                </Columns>
+                                            </asp:GridView>
                                         </div>
                                     </div>
                                     <div class="portlet light  xspadding bordered">
@@ -3134,10 +3241,32 @@
                                             </div>
                                         </div>
                                         <div class="portlet-body  ">
-                                            <asp:GridView ID="GVVigISRSemanal" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
+                                            <asp:GridView ID="GVVigISRSemanal" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None" AutoGenerateColumns="false">
+                                                <Columns>
+                                                    <asp:TemplateField HeaderText="Ejercicio" ItemStyle-HorizontalAlign="center">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblEjercicio" runat="server" Text='<%# Eval("Ejercicio")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Limite Inferior" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblLimiteinferior" runat="server" Text='<%# Eval("Limite inferior") %>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Cuota Fija" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblCuota" runat="server" Text='<%# Eval("Cuota fija")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Porcentaje" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblPorcentaje" runat="server" Text='<%# Eval("Porcentaje")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                </Columns>
+                                            </asp:GridView>
                                         </div>
                                     </div>
-
                                     <div class="portlet light  xspadding bordered">
                                         <div class="portlet-title">
                                             <div class="caption ">
@@ -3150,10 +3279,32 @@
                                             </div>
                                         </div>
                                         <div class="portlet-body  ">
-                                            <asp:GridView ID="GVVigISRDecenal" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
+                                            <asp:GridView ID="GVVigISRDecenal" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None" AutoGenerateColumns="false">
+                                                <Columns>
+                                                    <asp:TemplateField HeaderText="Ejercicio" ItemStyle-HorizontalAlign="center">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblEjercicio" runat="server" Text='<%# Eval("Ejercicio")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Limite Inferior" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblLimiteinferior" runat="server" Text='<%# Eval("Limite inferior") %>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Cuota Fija" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblCuota" runat="server" Text='<%# Eval("Cuota fija")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Porcentaje" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblPorcentaje" runat="server" Text='<%# Eval("Porcentaje")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                </Columns>
+                                            </asp:GridView>
                                         </div>
                                     </div>
-
                                     <div class="portlet light  xspadding bordered">
                                         <div class="portlet-title">
                                             <div class="caption ">
@@ -3166,7 +3317,30 @@
                                             </div>
                                         </div>
                                         <div class="portlet-body  ">
-                                            <asp:GridView ID="GVVigISRQuincenal" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
+                                            <asp:GridView ID="GVVigISRQuincenal" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None" AutoGenerateColumns="false">
+                                                <Columns>
+                                                    <asp:TemplateField HeaderText="Ejercicio" ItemStyle-HorizontalAlign="center">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblEjercicio" runat="server" Text='<%# Eval("Ejercicio")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Limite Inferior" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblLimiteinferior" runat="server" Text='<%# Eval("Limite inferior") %>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Cuota Fija" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblCuota" runat="server" Text='<%# Eval("Cuota fija")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Porcentaje" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblPorcentaje" runat="server" Text='<%# Eval("Porcentaje")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                </Columns>
+                                            </asp:GridView>
                                         </div>
                                     </div>
                                     <div class="portlet light  xspadding bordered">
@@ -3181,7 +3355,30 @@
                                             </div>
                                         </div>
                                         <div class="portlet-body  ">
-                                            <asp:GridView ID="GVVigISRAnual" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
+                                            <asp:GridView ID="GVVigISRAnual" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None" AutoGenerateColumns="false">
+                                                <Columns>
+                                                    <asp:TemplateField HeaderText="Ejercicio" ItemStyle-HorizontalAlign="center">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblEjercicio" runat="server" Text='<%# Eval("Ejercicio")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Limite Inferior" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblLimiteinferior" runat="server" Text='<%# Eval("Limite inferior") %>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Cuota Fija" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblCuota" runat="server" Text='<%# Eval("Cuota fija")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Porcentaje" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblPorcentaje" runat="server" Text='<%# Eval("Porcentaje")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                </Columns>
+                                            </asp:GridView>
                                         </div>
                                     </div>
                                 </ContentTemplate>
@@ -3193,7 +3390,62 @@
                             </ajax:TabPanel>
                             <ajax:TabPanel ID="TTVigSubEmpMensual" runat="server" HeaderText="Subsidio Mensual">
                                 <ContentTemplate>
-                                    <asp:GridView ID="GVVigSubEmpMensual" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
+
+                                    <div class="portlet solid  grey-cascade portlet-filter">
+                                        <div class="portlet-title portlet-filterT smalltitle">
+                                            <div class="titlefiltros  caption">
+                                                <div class="row">
+                                                    <label class="col-md-1">Ejercicio: </label>
+                                                    <div class="col-md-1">
+                                                        <asp:TextBox ID="TxtejerciciotablasSubsidio" CssClass="form-control input-sm " runat="server"></asp:TextBox>
+                                                    </div>
+                                                    <div class="col-md-1">
+                                                        <asp:LinkButton ID="LnkconsultartablasSubsidio" OnClick="LnkconsultartablasSubsidio_Click" runat="server" Text="Consultar" class="btn btn-primary" />
+
+                                                    </div>
+
+                                                </div>
+                                            </div>
+                                            <div class="tools">
+                                                <%--<a href="javascript:;" class="expand" data-original-title="" title=""></a>--%>
+                                            </div>
+                                        </div>
+                                        <div class="portlet-body" style="display: none">
+                                        </div>
+                                    </div>
+                                    <div class="portlet light  xspadding bordered">
+                                        <div class="portlet-title">
+                                            <div class="caption ">
+                                                <i class="fa fa-bookmark font-yellow-gold"></i>
+                                                <span class="caption-subject bold uppercase font-yellow-gold">Subsidio Mensual</span>
+                                            </div>
+                                            <div class="tools">
+                                                <a href="javascript:;" class="collapse" data-original-title="" title=""></a>
+                                                <a href="javascript:;" class="fullscreen" data-original-title="" title=""></a>
+                                            </div>
+                                        </div>
+                                        <div class="portlet-body">
+                                            <asp:GridView ID="GVVigSubEmpMensual" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None" AutoGenerateColumns="false">
+                                                <Columns>
+                                                    <asp:TemplateField HeaderText="Ejercicio" ItemStyle-HorizontalAlign="center">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblEjercicio" runat="server" Text='<%# Eval("Ejercicio") %>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Limite Inferior" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblLimiteinferior" runat="server" Text='<%# Eval("Limiteinferior","{0:N2}") %>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                    <asp:TemplateField HeaderText="Subsidio al empleo" ItemStyle-HorizontalAlign="right">
+                                                        <ItemTemplate>
+                                                            <asp:Label ID="lblCuota" runat="server" Text='<%# Eval("Cuotafija","{0:N2}")%>'> </asp:Label>
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+                                                </Columns>
+                                            </asp:GridView>
+                                        </div>
+                                    </div>
                                 </ContentTemplate>
                             </ajax:TabPanel>
                             <ajax:TabPanel ID="TTUma" runat="server" HeaderText="UMA">
@@ -4725,7 +4977,7 @@
     </div>
 
 
-    
+
     <div id="divCargaMasiva" class="modal ADS fade" role="dialog">
         <asp:UpdatePanel ID="UpCargaMasiva" class="modal-dialog modal" tabindex="-1" runat="server" UpdateMode="Conditional">
             <ContentTemplate>
@@ -4741,7 +4993,7 @@
                     <div class="modal-body">
                         <br />
                         <div class="row">
-                            
+
                             <div class="col-md-2">Ejercicio:</div>
                             <div class="col-md-4">
                                 <asp:DropDownList ID="DdlEjercicioCM" DataTextField="Ejercicio" DataValueField="Ejercicio" CssClass="form-control input-sm select2me" runat="server"></asp:DropDownList>
@@ -4764,7 +5016,7 @@
                                 Numero:
                             </div>
                             <div class="col-xs-4">
-                                <asp:TextBox ID="TxtNumeroCM"  Text="1" runat="server" CssClass=" form-control input-sm" CausesValidation="true" MaxLength="70" ValidationGroup="GrpGuardar" Width="100%"></asp:TextBox>
+                                <asp:TextBox ID="TxtNumeroCM" Text="1" runat="server" CssClass=" form-control input-sm" CausesValidation="true" MaxLength="70" ValidationGroup="GrpGuardar" Width="100%"></asp:TextBox>
                             </div>
                             <div class="col-xs-2" style="text-align: left; padding-top: 10px;">
                                 Fecha Inicio:
diff --git a/Nomina/Nomina.aspx.cs b/Nomina/Nomina.aspx.cs
index 5bd29f8b2..86aa9745c 100644
--- a/Nomina/Nomina.aspx.cs
+++ b/Nomina/Nomina.aspx.cs
@@ -309,6 +309,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
 
         if (!IsPostBack)
         {
+            TxtEjercicioFiltroVacaciones.Text = "2023";
+            TxtejerciciotablasSubsidio.Text = DateTime.Now.Year.ToString();
             enviarCorreoEnTimbrado = (UsuarioActual.CveEmpresa == 141 ? true : true);
             LnkCargaNetos.Visible = (UsuarioActual.Empresa.Funcionalidad(267) == "1") || (UsuarioActual.CveRol == 1);
             if (UsuarioActual.CveEmpresa == 141) { ddlfiniquito.SelectedValueExist("2"); }
@@ -5407,26 +5409,44 @@ public partial class Nomina_Nomina2 : ClsPaginas
 
     }
 
-    public void loadtablas()
+    protected void LnkconsultartablasSubsidio_Click(object sender, EventArgs e)
+    {
+
+        using (ClsNominas objnom = new ClsNominas())
+        {
+            if (objnom.GetFistablasValues(UsuarioActual.CveEmpresa, 2, TxtejerciciotablasSubsidio.Text.Trim().ToEntero()))
+            {
+                GVVigSubEmpMensual.DataSource = objnom.DtResultados;
+                GVVigSubEmpMensual.DataBind();
+            }
+            UpModalTablas.Update();
+        } 
+    }
+    protected void LnkconsultartablasISR_Click(object sender, EventArgs e)
+    {
+        
+        loadtablas(Txtejerciciotablasisr.Text.Trim().ToEntero());
+    }
+    public void loadtablas(int Ejercicio =-1)
     {
         CargaVacacionesEmpresas();
         using (ClsNominas objnom = new ClsNominas())
         {
-            if (objnom.GetTablasNomina(UsuarioActual.CveEmpresa) && objnom.DTSetResultados.Tables.Count > 1)
+            if (objnom.GetTablasNomina(UsuarioActual.CveEmpresa, Ejercicio) && objnom.DTSetResultados.Tables.Count > 1)
             {
                 GVFactorDesctInfonavit.DataSource = objnom.DTSetResultados.Tables[0];
                 GVSalariosMinimos.DataSource = objnom.DTSetResultados.Tables[1];
                 GVIMMSRiesgot.DataSource = objnom.DTSetResultados.Tables[2];
                 GVInfonavitSegViv.DataSource = objnom.DTSetResultados.Tables[3];
                 GVVigISRMensual.DataSource = objnom.DTSetResultados.Tables[4];
-                GVVigSubEmpMensual.DataSource = objnom.DTSetResultados.Tables[5];
                 GVVigISRSemanal.DataSource = objnom.DTSetResultados.Tables[7];
                 GVVigISRDecenal.DataSource = objnom.DTSetResultados.Tables[8];
                 GVVigISRQuincenal.DataSource = objnom.DTSetResultados.Tables[9];
                 GVVigISRAnual.DataSource = objnom.DTSetResultados.Tables[10];
-
-
-
+            }
+            if (objnom.GetFistablasValues(UsuarioActual.CveEmpresa,2, TxtejerciciotablasSubsidio.Text.Trim().ToEntero()) )
+            {
+                GVVigSubEmpMensual.DataSource = objnom.DtResultados;
             }
             if (objnom.RH_TablasValoresGet(UsuarioActual.CveEmpresa, 1))
             {
@@ -5486,7 +5506,8 @@ public partial class Nomina_Nomina2 : ClsPaginas
     }
     protected void LnkVerTablas_Click(object sender, EventArgs e)
     {
-        loadtablas();
+        Txtejerciciotablasisr.Text = DateTime.Now.Year.ToString();
+        loadtablas(Txtejerciciotablasisr.Text.Trim().ToEntero());
         RegistraScript("$('#ModalTablas').modal();");
     }
     protected void LnkVerCalculoISR_Click(object sender, EventArgs e)
@@ -5507,7 +5528,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
         DataTable dtquin = null;
         using (ClsNominas objnom = new ClsNominas())
         {
-            if (objnom.GetTablasNomina(UsuarioActual.CveEmpresa) && objnom.DTSetResultados.Tables.Count > 1)
+            if (objnom.GetTablasNomina(UsuarioActual.CveEmpresa, DateTime.Now.Year ) && objnom.DTSetResultados.Tables.Count > 1)
             {
                 //GVFactorDesctInfonavit.DataSource = objnom.DTSetResultados.Tables[0];
                 //GVSalariosMinimos.DataSource = objnom.DTSetResultados.Tables[1];
@@ -10938,4 +10959,5 @@ public partial class Nomina_Nomina2 : ClsPaginas
         }
     }
 
+
 }
\ No newline at end of file