diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index 49613218c..e48f19d44 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -1470,7 +1470,8 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Public Property Estado As String Public Property ClaveEstado As String Public Property Telefono As String - Public Property TelefonoEmergencia As String + Public Property TelefonoEmergencia As String + Public Property Beneficiario As String Public Property Celular As String Public Property LugarNacimiento As String Public Property CredencialElector As String @@ -1684,6 +1685,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Me.ClaveEstado = Data.Rows(0)("ClaveEstado").ToString Me.Telefono = Data.Rows(0)("Telefono").ToString Me.TelefonoEmergencia = Data.Rows(0)("NombreTelEmergencia").ToString + Me.Beneficiario = Data.Rows(0)("Beneficiario").ToString Me.Celular = Data.Rows(0)("Celular").ToString Me.RFC = Data.Rows(0)("RFC").ToString Me.CURP = Data.Rows(0)("CURP").ToString @@ -1860,6 +1862,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo Me.Estado = Data.Rows(0)("Estado").ToString Me.Telefono = Data.Rows(0)("Telefono").ToString Me.TelefonoEmergencia = Data.Rows(0)("NombreTelEmergencia").ToString + Me.Beneficiario = Data.Rows(0)("Beneficiario").ToString Me.Celular = Data.Rows(0)("Celular").ToString Me.RFC = Data.Rows(0)("RFC").ToString Me.CURP = Data.Rows(0)("CURP").ToString @@ -1939,7 +1942,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo 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, 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, + CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, CveUsuario As Integer, CveEmpresa As Integer, CveUsuarioNomina As Integer, Beneficiario As String, 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, Optional Pensionado As Boolean = False, Optional CveMedioTransporte As Integer = -1, Optional CveRegistroPatronal As Integer = -1, Optional CveEmpresaAsignado As Integer = -1, Optional CveTipoTrabajador As Integer = -1) As Boolean @@ -2016,6 +2019,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo .Add("@CtaContPrestamos", SqlDbType.VarChar).Value = CtaContPrestamos .Add("@CveUsuario", SqlDbType.Int).Value = CveUsuario .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + .Add("@Beneficiario", SqlDbType.VarChar).Value = Beneficiario .Add("@CveUsuarioNomina", SqlDbType.VarChar).Value = CveUsuarioNomina .Add("@CveSubProyectoZona", SqlDbType.Int).Value = CveSubProyectoZona .Add("@CveUniforme", SqlDbType.Int).Value = CveUniforme ' @@ -2073,7 +2077,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo 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, 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, + CveJornada As Integer, IdCtaContPersonal As Integer, CtaContPersonal As String, IdCtaContPrestamos As Integer, CtaContPrestamos As String, CveEmpresa As Integer, CveUsuarioNomina As Integer, Beneficiario As String, 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, Optional FechaActivo As Date = MinFecha, Optional FechaReingreso As Date = MinFecha, Optional CveTipodeSalario As Integer = 1, Optional Sindicalizado As Integer = -1, Optional CvePais As Integer = -1, Optional Pensionado As Boolean = False, Optional CveRegistroPatronal As Integer = -1, Optional CveEmpresaAsignado As Integer = -1, Optional CveMedioTransporte As Integer = -1, Optional EsReserva As Integer = -1, Optional Fiscalizable As Integer = -1, Optional CveTipoTrabajador As Integer = -1) As Boolean @@ -2152,6 +2156,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo .Add("@IdCtaContPrestamos", SqlDbType.Int).Value = IdCtaContPrestamos .Add("@CtaContPrestamos", SqlDbType.VarChar).Value = CtaContPrestamos .Add("@CveUsuarioNomina", SqlDbType.VarChar).Value = CveUsuarioNomina + .Add("@Beneficiario", SqlDbType.VarChar).Value = Beneficiario .Add("@CveSubProyectoZona", SqlDbType.Int).Value = CveSubProyectoZona .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa .Add("@CveUniforme", SqlDbType.Int).Value = CveUniforme diff --git a/RH/CatPersonal.aspx.vb b/RH/CatPersonal.aspx.vb index a7c1e2095..64f953bbc 100644 --- a/RH/CatPersonal.aspx.vb +++ b/RH/CatPersonal.aspx.vb @@ -1194,7 +1194,7 @@ Partial Class RH_CatPersonal 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, + 0, "Seleccione", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, "", -1, CveUniforme:=-1, TelefonoExtension:="", CelularPersonal:="", TelefonoMarcadoRapido:="", ContactoAlterno:="", CveTipodeSalario:=DDlTipoSalario.SelectedValue.ToEntero(), Sindicalizado:=isSindicalizado, CvePais:=151, CveMedioTransporte:=DdlMedioTransporte.SelectedValue.ToEntero(), CveRegistroPatronal:=DdlRegistroPatronal.SelectedValue.ToEntero() ) Then diff --git a/RH/Personal.aspx b/RH/Personal.aspx index e5be60e7a..dbdc3f200 100644 --- a/RH/Personal.aspx +++ b/RH/Personal.aspx @@ -328,6 +328,11 @@ +
+ + + +
diff --git a/RH/Personal.aspx.vb b/RH/Personal.aspx.vb index f86f4b1d8..077c0520a 100644 --- a/RH/Personal.aspx.vb +++ b/RH/Personal.aspx.vb @@ -1644,6 +1644,7 @@ Partial Class RH_Personal TxtEstado.Text = ObjPersonal.Estado TxtTelefono.Text = ObjPersonal.Telefono TxtTelefonoEmergencia.Text = ObjPersonal.TelefonoEmergencia + TxtBeneficiario.Text = ObjPersonal.Beneficiario TxtCelular.Text = ObjPersonal.Celular TxtLugarNacimiento.Text = ObjPersonal.LugarNacimiento.ToString() TxtCredencialElector.Text = ObjPersonal.CredencialElector @@ -1965,7 +1966,7 @@ Partial Class RH_Personal TxtCURP.Text.Trim, TxtNombrePadre.Text.Trim, TxtNombreMadre.Text.Trim, DdlBanco.SelectedValue.ToEntero(), DdlRiesgoPuesto.SelectedValue.ToEntero(), DdlRegimenContratacion.SelectedValue.ToEntero(), DdlClienteAsignado.SelectedValue.ToEntero(), DdlSubProyectoAsignado.SelectedValue.ToEntero(), URL, DdlSupervisor.SelectedValue.ToEntero(), TxtCLABE.Text.Trim, TxtBancoNumCuenta.Text.Trim, DdlJornada.SelectedValue.ToEntero(), DdlViaticos.SelectedValue.ToEntero(), DdlViaticos.SelectedItem.Text, - DdlPrestamos.SelectedValue.ToEntero(), DdlPrestamos.SelectedItem.Text, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, DDLUsuarioNomina.SelectedValue.ToEntero(), DdlSubproyectoZona.SelectedValue.ToEntero(), CveUniforme:=DdlUniforme.SelectedValue.ToEntero(), + DdlPrestamos.SelectedValue.ToEntero(), DdlPrestamos.SelectedItem.Text, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, DDLUsuarioNomina.SelectedValue.ToEntero(), TxtBeneficiario.Text.Trim, DdlSubproyectoZona.SelectedValue.ToEntero(), CveUniforme:=DdlUniforme.SelectedValue.ToEntero(), TelefonoExtension:=TxtTelefonoExtension.Text, CelularPersonal:=TxtCelularPersonal.Text, TelefonoMarcadoRapido:=TxtTelefonoMarcadoRapido.Text, ContactoAlterno:="", CveTipodeSalario:=DDlTipoSalario.SelectedValue.ToEntero(), Sindicalizado:=ChkSindicalizado.Checked, Pensionado:=ChkPensionado.Checked, CvePais:=DdlPais.SelectedValue.ToEntero(), CveRegistroPatronal:=DdlRegistroPatronal.SelectedValue.ToEntero(), CveEmpresaAsignado:=DdlEmpresaAsignada.SelectedValue.ToEntero, CveTipoTrabajador:=DdlTipoTrabajador.SelectedValue.ToEntero()) Then @@ -2049,7 +2050,7 @@ Partial Class RH_Personal DdlBanco.SelectedValue.ToEntero(), DdlRiesgoPuesto.SelectedValue.ToEntero(), DdlRegimenContratacion.SelectedValue.ToEntero(), DdlClienteAsignado.SelectedValue.ToEntero(), DdlSubProyectoAsignado.SelectedValue.ToEntero(), CvePersonal, URL, DdlSupervisor.SelectedValue.ToEntero(), TxtCLABE.Text.Trim, TxtBancoNumCuenta.Text.Trim, DdlJornada.SelectedValue.ToEntero(), DdlViaticos.SelectedValue.ToEntero(), DdlViaticos.SelectedItem.Text, - DdlPrestamos.SelectedValue.ToEntero(), DdlPrestamos.SelectedItem.Text, UsuarioActual.CveEmpresa, DDLUsuarioNomina.SelectedValue.ToEntero(), DdlSubproyectoZona.SelectedValue.ToEntero(), CveUniforme:=DdlUniforme.SelectedValue.ToEntero(), + DdlPrestamos.SelectedValue.ToEntero(), DdlPrestamos.SelectedItem.Text, UsuarioActual.CveEmpresa, DDLUsuarioNomina.SelectedValue.ToEntero(), TxtBeneficiario.Text.Trim, DdlSubproyectoZona.SelectedValue.ToEntero(), CveUniforme:=DdlUniforme.SelectedValue.ToEntero(), TelefonoExtension:=TxtTelefonoExtension.Text, CelularPersonal:=TxtCelularPersonal.Text, TelefonoMarcadoRapido:=TxtTelefonoMarcadoRapido.Text, ContactoAlterno:="", CveUsuarioModifico:=UsuarioActual.CveUsuario, CveTipodeSalario:=DDlTipoSalario.SelectedValue.ToEntero(), Sindicalizado:=If(ChkSindicalizado.Checked, 1, 0), Pensionado:=ChkPensionado.Checked, CvePais:=DdlPais.SelectedValue.ToEntero(), CveRegistroPatronal:=DdlRegistroPatronal.SelectedValue.ToEntero(), CveEmpresaAsignado:=DdlEmpresaAsignada.SelectedValue.ToEntero(), EsReserva:=If(chkEsReserva.Checked, 1, 0), Fiscalizable:=If(chkNoFiscalizar.Checked, 0, 1), CveTipoTrabajador:=DdlTipoTrabajador.SelectedValue.ToEntero()) Then @@ -3699,6 +3700,7 @@ Partial Class RH_Personal params.Add(New ReportParameter("Estado", UsuarioActual.Empresa.Empresa)) params.Add(New ReportParameter("Telefono", ObjPersonal.Telefono)) params.Add(New ReportParameter("TelefonoEmergencia", ObjPersonal.TelefonoEmergencia)) + params.Add(New ReportParameter("Beneficiario", ObjPersonal.Beneficiario)) params.Add(New ReportParameter("Celular", ObjPersonal.Celular)) params.Add(New ReportParameter("Correo", ObjPersonal.Correo)) params.Add(New ReportParameter("LugarNacimiento", Now.ToDateTime.ToShortDateString))