diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index b6ee28d2f..5fb4804f3 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -2452,7 +2452,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Return Retorno End Function - Public Function UpPersonalAltas(CvePersonal As Integer, fechaInicio As String, fechaFin As String, CvePeriodoFiniquito As Integer, CveMotivoBaja As Integer, esLiquidacion As Boolean, ValIndemnizacion As Boolean, ValSeparacionunica As Boolean, ValPrimadeantiguedad As Boolean) As Boolean + Public Function UpPersonalAltas(CvePersonal As Integer, fechaInicio As String, fechaFin As String, CvePeriodoFiniquito As Integer, CveMotivoBaja As Integer, esLiquidacion As Boolean, ValIndemnizacion As Boolean, ValSeparacionunica As Boolean, ValPrimadeantiguedad As Boolean, Optional Observaciones As String = "") As Boolean Dim Retorno As Boolean = False SqlDataAdapter("PA_RH_PersonalAltasUp") @@ -2466,6 +2466,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo .Add("@ValIndemnizacion", SqlDbType.Bit).Value = If(ValIndemnizacion, 1, 0) .Add("@ValSeparacionunica", SqlDbType.Bit).Value = If(ValSeparacionunica, 1, 0) .Add("@ValPrimadeantiguedad", SqlDbType.Bit).Value = If(ValPrimadeantiguedad, 1, 0) + .Add("@Observaciones", SqlDbType.VarChar).Value = Observaciones End With Try SqlAdapter.Fill(Data) @@ -7397,7 +7398,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo End Try Return Retorno End Function - Public Function estatusPersonalUp(Fecha As DateTime, CvePersonal As Integer, CveEstatusPersonal As Integer, CveEmpresa As Integer, CveUsuario As Integer) As Boolean + Public Function estatusPersonalUp(Fecha As DateTime, CvePersonal As Integer, CveEstatusPersonal As Integer, CveEmpresa As Integer, CveUsuario As Integer, Optional CveMotivoBaja As Integer = -1, Optional Observaciones As String = "") As Boolean Dim Retorno As Boolean = False Data = New DataTable SqlDataAdapter("PA_RH_EstatusPersonalUp") @@ -7407,6 +7408,8 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo .Add("@CveEstatusPersonal", SqlDbType.Int).Value = CveEstatusPersonal .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario + .Add("@CveMotivoBaja", SqlDbType.Int).Value = CveMotivoBaja ' + .Add("@Observaciones", SqlDbType.VarChar).Value = Observaciones End With Try SqlAdapter.Fill(Data) diff --git a/General/CONTRATO.doc b/General/CONTRATO.doc new file mode 100644 index 000000000..47e90f754 Binary files /dev/null and b/General/CONTRATO.doc differ diff --git a/Nomina/Nomina.aspx.cs b/Nomina/Nomina.aspx.cs index 7204fddf2..69b5b8280 100644 --- a/Nomina/Nomina.aspx.cs +++ b/Nomina/Nomina.aspx.cs @@ -2610,6 +2610,8 @@ public partial class Nomina_Nomina2 : ClsPaginas { if (objnom.GETPersonalVacResumen(UsuarioActual.Empresa.CveEmpresa, SRCvePersonal)) { + DdlVacPeriodo.DataSource = objnom.DtResultados; + DdlVacPeriodo.DataBind(); DataRow drow = objnom.DtResultados.FiltroPrimero("Selected =1"); if (drow != null) { @@ -2618,6 +2620,7 @@ public partial class Nomina_Nomina2 : ClsPaginas } } } + UPSRModalVacaciones.Update(); RegistraScript("$('#ModalSRVacaciones').modal()"); } diff --git a/RH/Personal.aspx b/RH/Personal.aspx index ca73980fd..3c308cc86 100644 --- a/RH/Personal.aspx +++ b/RH/Personal.aspx @@ -109,7 +109,14 @@