diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index 7cf26beb7..90ca3f680 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -1931,7 +1931,7 @@ Public Class ClsNominas End Function Public Function AddPeriodo(CveTipoPeriodo As Integer, Ejercicio As Integer, Mes As Integer, Numero As Integer, FechaInicio As Date, FechaFin As Date, - EsInicioMes As Boolean, EsFinMes As Boolean, EsInicioSS As Boolean, EsFinSS As Boolean, EsInicioAño As Boolean, EsFinAño As Boolean, CveUsuario As Integer, CveEmpresa As Integer) As Boolean + EsInicioMes As Boolean, EsFinMes As Boolean, EsInicioSS As Boolean, EsFinSS As Boolean, EsInicioAño As Boolean, EsFinAño As Boolean, CveUsuario As Integer, CveEmpresa As Integer, CveTurno As Integer) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Nom_PeriodosAdd") @@ -1951,7 +1951,7 @@ Public Class ClsNominas .Add("@EsFinAño", SqlDbType.Bit).Value = EsFinAño .Add("@FueCalculado", SqlDbType.Bit).Value = FueCalculado .Add("@Estatus", SqlDbType.SmallInt).Value = Estatus - '.Add("@FechaIng", SqlDbType.DateTime).Value = FechaIng + .Add("@CveTurno", SqlDbType.Int).Value = CveTurno .Add("@CveUsuario", SqlDbType.VarChar).Value = CveUsuario .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With @@ -1974,7 +1974,7 @@ Public Class ClsNominas Public Function UpdatePeriodo(FechaInicio As Date, FechaFin As Date, EsInicioMes As Boolean, EsFinMes As Boolean, EsInicioSS As Boolean, EsFinSS As Boolean, EsInicioAño As Boolean, EsFinAño As Boolean, FueCalculado As Boolean, CveTipoPeriodo As Integer, Ejercicio As Integer, Mes As Integer, Numero As Integer, - Estatus As Integer, CvePeriodo As Integer, CveEmpresa As Integer) As Boolean + Estatus As Integer, CvePeriodo As Integer, CveEmpresa As Integer, CveTurno As Integer) As Boolean Dim Retorno As Boolean = False @@ -1998,6 +1998,7 @@ Public Class ClsNominas '.Add("@FechaIng", SqlDbType.DateTime).Value = FechaIng '.Add("@CveUsuario", SqlDbType.VarChar).Value = CveUsuario .Add("@CvePeriodo", SqlDbType.Int).Value = CvePeriodo + .Add("@CveTurno", SqlDbType.Int).Value = CveTurno .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa End With diff --git a/Nomina/CatPeriodos.aspx b/Nomina/CatPeriodos.aspx index a0c2c4956..8059e38a7 100644 --- a/Nomina/CatPeriodos.aspx +++ b/Nomina/CatPeriodos.aspx @@ -5,12 +5,9 @@ @@ -31,8 +28,8 @@ -
-
+
+
@@ -49,16 +46,15 @@
Ejercicio:
- - +
Estatus:
- + - +
@@ -67,11 +63,11 @@
-
+ +
@@ -98,85 +94,85 @@ - - - - - - - - - - - - - -
+ Tipo + Ej. + Mes + No. + Fecha Ini + Fecha Fin + Ini. Mes + Fin Mes + Ini. SS + Fin SS + Ini. Año + Fin Año + Calculado + Estatus @@ -188,9 +184,9 @@
- + @@ -252,58 +248,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -349,7 +345,7 @@
-