cambios nominas

This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2023-12-30 15:48:04 -07:00
parent d1e4dc69d5
commit 0569ba8106
3 changed files with 394 additions and 96 deletions

View File

@@ -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

View File

@@ -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;
@@ -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 ">
@@ -2924,28 +2954,6 @@
</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">
@@ -3009,6 +3017,7 @@
</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 ">
@@ -3119,7 +3203,30 @@
</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>
<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">

View File

@@ -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
}
}
}