diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index d07254317..b6ee28d2f 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -1459,9 +1459,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Public Property CveEstado As Integer Public Property Estado As String Public Property ClaveEstado As String - Public Property Telefono As String + Public Property Telefono As String + Public Property TelefonoEmergencia As String Public Property Celular As String Public Property LugarNacimiento As String + Public Property CredencialElector As String Public Property NombrePadre As String Public Property NombreMadre As String 'RH @@ -1673,9 +1675,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Me.Estado = Data.Rows(0)("Estado").ToString Me.ClaveEstado = Data.Rows(0)("ClaveEstado").ToString Me.Telefono = Data.Rows(0)("Telefono").ToString + Me.TelefonoEmergencia = Data.Rows(0)("NombreTelEmergencia").ToString Me.Celular = Data.Rows(0)("Celular").ToString Me.RFC = Data.Rows(0)("RFC").ToString Me.CURP = Data.Rows(0)("CURP").ToString + Me.CredencialElector = Data.Rows(0)("CredencialElector").ToString Me.NombrePadre = Data.Rows(0)("NombrePadre").ToString Me.NombreMadre = Data.Rows(0)("NombreMadre").ToString Me.Cliente = Data.Rows(0)("ClienteAsignado").ToString @@ -1849,9 +1853,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Me.CveEstado = Data.Rows(0)("CveEstado").ToString.ToEntero Me.Estado = Data.Rows(0)("Estado").ToString Me.Telefono = Data.Rows(0)("Telefono").ToString + Me.TelefonoEmergencia = Data.Rows(0)("NombreTelEmergencia").ToString Me.Celular = Data.Rows(0)("Celular").ToString Me.RFC = Data.Rows(0)("RFC").ToString Me.CURP = Data.Rows(0)("CURP").ToString + Me.CredencialElector = Data.Rows(0)("CredencialElector").ToString Me.NombrePadre = Data.Rows(0)("NombrePadre").ToString Me.NombreMadre = Data.Rows(0)("NombreMadre").ToString Me.Cliente = Data.Rows(0)("ClienteAsignado").ToString @@ -1929,7 +1935,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo SalarioDiarioSS As Double, Bono As Double, NumDiasAguinaldo As Integer, PorPrimaVacacional As Double, CveMetodoPago As Integer, FechaInicioContrato As Date, FechaFinContrato As String, CveTipoContrato As Integer, Ubicacion As String, CveTurno As Integer, CvePuesto As Integer, CveDepartamento As Integer, CveRuta As Integer, CveEscolaridad As Integer, CveEstadoCivil As Integer, CveGenero As Integer, CveMotivoBaja As Integer, FechaBaja As String, CveEstatusPersonal As Integer, FechaNacimiento As Date, LugarNacimiento As String, - Calle As String, NumExt As String, NumInt As String, Colonia As String, CP As String, Ciudad As String, CveEstado As Integer, Telefono As String, Celular As String, RFC As String, CURP As String, + Calle As String, NumExt As String, NumInt As String, Colonia As String, CP As String, Ciudad As String, CveEstado As Integer, Telefono As String, TelefonoEmergencia As String, Celular As String, RFC As String, CURP As String, CredencialElector As String, NombrePadre As String, NombreMadre As String, CveSATBanco As Integer, CveSATRiesgoPuesto As Integer, CveSATRegimenContratacion As Integer, CveClienteAsignado As Integer, CveSubProyecto As Integer, URL As String, CveSupervisor As Integer, CLABE As String, BancoNumCuenta As String, CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, CveUsuario As Integer, CveEmpresa As Integer, CveUsuarioNomina As Integer, Optional CveSubProyectoZona As Integer = Nothing, Optional CveUniforme As Integer = -1, Optional TelefonoExtension As String = "-1", Optional CelularPersonal As String = "-1", Optional TelefonoMarcadoRapido As String = "-1", Optional ContactoAlterno As String = "-1", Optional CveTipodeSalario As Integer = 1, Optional Sindicalizado As Boolean = False, Optional CvePais As Integer = -1, @@ -1985,9 +1991,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo .Add("@CveEstado", SqlDbType.VarChar).Value = CveEstado '.Add("@Estado", SqlDbType.VarChar).Value = Estado .Add("@Telefono", SqlDbType.VarChar).Value = Telefono + .Add("@TelefonoEmergencia", SqlDbType.VarChar).Value = TelefonoEmergencia .Add("@Celular", SqlDbType.VarChar).Value = Celular .Add("@RFC", SqlDbType.VarChar).Value = RFC .Add("@CURP", SqlDbType.VarChar).Value = CURP + .Add("@CredencialElector", SqlDbType.VarChar).Value = CredencialElector .Add("@NombrePadre", SqlDbType.VarChar).Value = NombrePadre .Add("@NombreMadre", SqlDbType.VarChar).Value = NombreMadre .Add("@CveClienteAsignado", SqlDbType.Int).Value = CveClienteAsignado @@ -2060,7 +2068,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo SalarioDiarioSS As Double, Bono As Double, NumDiasAguinaldo As Integer, PorPrimaVacacional As Double, CveMetodoPago As Integer, FechaInicioContrato As Date, FechaFinContrato As String, CveTipoContrato As Integer, Ubicacion As String, CveTurno As Integer, CvePuesto As Integer, CveDepartamento As Integer, CveRuta As Integer, CveEscolaridad As Integer, CveEstadoCivil As Integer, CveGenero As Integer, CveMotivoBaja As Integer, FechaBaja As String, CveEstatusPersonal As Integer, FechaNacimiento As Date, LugarNacimiento As String, - Calle As String, NumExt As String, NumInt As String, Colonia As String, CP As String, Ciudad As String, CveEstado As Integer, Telefono As String, Celular As String, RFC As String, CURP As String, + Calle As String, NumExt As String, NumInt As String, Colonia As String, CP As String, Ciudad As String, CveEstado As Integer, Telefono As String, TelefonoEmergencia As String, Celular As String, RFC As String, CURP As String, CredencialElector As String, NombrePadre As String, NombreMadre As String, CveSATBanco As Integer, CveSATRiesgoPuesto As Integer, CveSATRegimenContratacion As Integer, CveClienteAsignado As Integer, CveSubProyecto As Integer, CvePersonal As Integer, URL As String, CveSupervisor As Integer, CLABE As String, BancoNumCuenta As String, CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, CveEmpresa As Integer, CveUsuarioNomina As Integer, Optional CveSubProyectoZona As Integer = Nothing, Optional CveUniforme As Integer = -1, Optional TelefonoExtension As String = "-1", Optional CelularPersonal As String = "-1", Optional TelefonoMarcadoRapido As String = "-1", Optional ContactoAlterno As String = "-1", Optional CveUsuarioModifico As Integer = -1, @@ -2118,9 +2126,11 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo .Add("@CveEstado", SqlDbType.VarChar).Value = CveEstado '.Add("@Estado", SqlDbType.VarChar).Value = Estado .Add("@Telefono", SqlDbType.VarChar).Value = Telefono + .Add("@TelefonoEmergencia", SqlDbType.VarChar).Value = TelefonoEmergencia .Add("@Celular", SqlDbType.VarChar).Value = Celular .Add("@RFC", SqlDbType.VarChar).Value = RFC .Add("@CURP", SqlDbType.VarChar).Value = CURP + .Add("@CredencialElector", SqlDbType.VarChar).Value = CredencialElector .Add("@NombrePadre", SqlDbType.VarChar).Value = NombrePadre .Add("@NombreMadre", SqlDbType.VarChar).Value = NombreMadre .Add("@CveClienteAsignado", SqlDbType.Int).Value = CveClienteAsignado diff --git a/General/SaldosIniciales.aspx.vb b/General/SaldosIniciales.aspx.vb index 0d1f00b3e..b2305f899 100644 --- a/General/SaldosIniciales.aspx.vb +++ b/General/SaldosIniciales.aspx.vb @@ -3524,7 +3524,7 @@ Partial Class General_SaldosIniciales End If If Not ObjRH.AddPersonal(Codigo, ApellidoPaterno, ApellidoMaterno, Nombre, CorreoElectronico, FechaIn, CveTipoPeriodo, NumeroSS, CBool(AltaIMSS), SalarioDiario.ToDouble, SalarioDiario.ToDouble, SDI.ToDouble, SDI.ToDouble, -1, -1, -1, CveMetodoPago, FechaIn, FechaFn.ToString, CveTipoContrato, Direccion, CveTurno, CvePuesto, CveDepartamento, -1, CveEscolaridad, CveEstadoCivil, CveGenero, -1, FechaBaja, CveEstatusPersonal, FechaNac, - LugarNacimiento, Direccion, "", "", "", CodigoPostal, Ciudad, CveEstado, Telefono, Celular, RFC, CURP, NombrePadre, NombreMadre, -1, CveSATRiesgoPuesto, CveSATRegimenContratacion, -1, CveSubProyecto, "", -1, + LugarNacimiento, Direccion, "", "", "", CodigoPostal, Ciudad, CveEstado, Telefono, "", Celular, RFC, CURP, "", NombrePadre, NombreMadre, -1, CveSATRiesgoPuesto, CveSATRegimenContratacion, -1, CveSubProyecto, "", -1, ClabeInterbancaria, "", CveJornada, CveJornada, "", -1, "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, CveUsuarioNomina, CveRegistroPatronal:=CveRegistroPatronal) Then If (ObjRH.noguardoXcurpb) Then Else diff --git a/RH/CatPersonal.aspx.vb b/RH/CatPersonal.aspx.vb index e3d2655de..c2264872e 100644 --- a/RH/CatPersonal.aspx.vb +++ b/RH/CatPersonal.aspx.vb @@ -1190,8 +1190,8 @@ Partial Class RH_CatPersonal CveEtadoCivil, DdlGeneroAdd.SelectedValue.ToEntero(), -1, "-1", CveEstatusPersonal, TxtFechaNacimiento.Text.ToDate, "", "", "", "", "", "", "", - DdlEstados.SelectedValue.ToEntero, "", "", TxtRFC.Text.Trim, - TxtCURP.Text.Trim, "", "", -1, CveSATRiesgoPuesto, DdlRegimenContratacion.SelectedValue.ToEntero, + DdlEstados.SelectedValue.ToEntero, "", "", "", TxtRFC.Text.Trim, + TxtCURP.Text.Trim, "", "", "", -1, CveSATRiesgoPuesto, DdlRegimenContratacion.SelectedValue.ToEntero, -1, DdlSubProyectoAsignadoAdd.SelectedValue.ToEntero, "", DdlSupervisor.SelectedValue.ToEntero, "", "", DdlJornada.SelectedValue.ToEntero, -1, "-1", 0, "Seleccione", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, -1, CveUniforme:=-1, diff --git a/RH/Personal.aspx b/RH/Personal.aspx index a34dde223..ca73980fd 100644 --- a/RH/Personal.aspx +++ b/RH/Personal.aspx @@ -264,7 +264,7 @@ -