From 5f741c24f6e2a70551a24bb844316136fef01ed3 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Wed, 11 Jan 2023 13:09:23 -0700 Subject: [PATCH] --- Nomina/Aguinaldo.aspx.cs | 4 +- Nomina/Nomina.aspx | 70 ++++++++++++- Nomina/Nomina.aspx.cs | 215 ++++++++++++++++++++++++++++++++++++--- 3 files changed, 268 insertions(+), 21 deletions(-) diff --git a/Nomina/Aguinaldo.aspx.cs b/Nomina/Aguinaldo.aspx.cs index 4b11f9b47..28e4abe3e 100644 --- a/Nomina/Aguinaldo.aspx.cs +++ b/Nomina/Aguinaldo.aspx.cs @@ -434,8 +434,8 @@ public partial class Nomina_Aguinaldo : ClsPaginas FraccionI = (aguinaldogravado / diasanio) * diasmes; FraccionII_1 = salariomensual + FraccionI; str.Clear(); - str.AppendFormat("SELECT dbo.Fnc_NomValues(40, 0, 00, -1, {0}, {1}, {1}) isrFraccionII_2,", FraccionII_1, diasmes); - str.AppendFormat(" dbo.Fnc_NomValues(40, 0, 00, -1, {0}, {1}, {1}) isrFraccionIII_1", salariomensual, diasmes); + str.AppendFormat("SELECT dbo.Fnc_NomValues(40, 0, {2}, -1, {0}, {1}, {1}) isrFraccionII_2,", FraccionII_1, diasmes, DdlEjercicios.SelectedValue); + str.AppendFormat(" dbo.Fnc_NomValues(40, 0, {2}, -1, {0}, {1}, {1}) isrFraccionIII_1", salariomensual, diasmes, DdlEjercicios.SelectedValue); if (objbase.runQuerystr(str.ToString())) { DataRow drow = objbase.DtResultados.Rows[0]; diff --git a/Nomina/Nomina.aspx b/Nomina/Nomina.aspx index e5f0cdf13..c14eaccd0 100644 --- a/Nomina/Nomina.aspx +++ b/Nomina/Nomina.aspx @@ -262,6 +262,9 @@
  • Cargar masiva de conceptos
  • +
  • + Cargar netos +
  • Tablas de cálculo
  • @@ -404,7 +407,7 @@
    + DataTextField="TipoTrabajadorB" DataValueField="CveTipoTrabajador" ValidationGroup="GrpGuardar">
    @@ -629,7 +632,7 @@ <%--Descargar Cargar--%> - + Asistencia @@ -663,7 +666,7 @@
    - + @@ -3231,7 +3234,7 @@ - + - + @@ -3364,6 +3367,9 @@
    +
    + +
    @@ -3383,6 +3389,60 @@ + + +
    + +