diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index 7617ad869..241ce2730 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -1555,8 +1555,8 @@ Public Class ClsRH Public Property SalarioDiarioSS As Decimal Public Property NumDiasAguinaldo As Integer Public Property PorPrimaVacacional As Decimal - 'Public Property Bono As Double Public Property CveMetodoPago As Integer + Public Property CveFormaPago As Integer Public Property MetodoPago As String Public Property MetodoPagoSAT As String Public Property CLABE As String @@ -1603,7 +1603,7 @@ Public Class ClsRH Public Function GetPersonal(CvePersonal As Integer, Codigo As String, Nombre As String, NSS As String, RFC As String, CveTurno As Integer, CvePuesto As Integer, CveDepartamento As Integer, CveRuta As Integer, CveEscolaridad As Integer, CveEstadoCivil As Integer, CveGenero As Integer, CveEstatusPersonal As Integer, CveSubProyecto As Integer, CveClienteAsignado As Integer, HorarioTrabajo As String, CveSupervisor As Integer, - CveTipoPeriodo As Integer, CveMetodoPago As Integer, CveTipoContrato As Integer, CveMotivoBaja As Integer, CveProyecto As Integer, + CveTipoPeriodo As Integer, CveFormaPago As Integer, CveTipoContrato As Integer, CveMotivoBaja As Integer, CveProyecto As Integer, FechaIFinContrato As String, FechaFFinContrato As String, FechaIIngreso As String, FechaFIngreso As String, CveEmpresa As Integer, Optional EsReserva As Integer = -1) As Boolean Dim Retorno As Boolean = False @@ -1628,7 +1628,7 @@ Public Class ClsRH .Add("@HorarioTrabajo", SqlDbType.VarChar).Value = HorarioTrabajo .Add("@CveSupervisor", SqlDbType.Int).Value = CveSupervisor .Add("@CveTipoPeriodo", SqlDbType.Int).Value = CveTipoPeriodo - .Add("@CveMetodoPago", SqlDbType.Int).Value = CveMetodoPago + .Add("@CveFormaPago", SqlDbType.Int).Value = CveFormaPago .Add("@CveTipoContrato", SqlDbType.Int).Value = CveTipoContrato .Add("@CveMotivoBaja", SqlDbType.Int).Value = CveMotivoBaja .Add("@CveProyecto", SqlDbType.Int).Value = CveProyecto @@ -1668,8 +1668,9 @@ Public Class ClsRH 'Me.Bono = Data.Rows(0)("Bono").ToString.ToDouble Me.SalarioDiarioSS = Data.Rows(0)("SalarioDiarioSS").ToString.ToDecimal Me.NumDiasAguinaldo = Data.Rows(0)("NumDiasAguinaldo").ToString.ToEntero - Me.PorPrimaVacacional = Data.Rows(0)("PorPrimaVacacional").ToString.ToDecimal + Me.PorPrimaVacacional = Data.Rows(0)("PorPrimaVacacional").ToString.ToDecimal Me.CveMetodoPago = Data.Rows(0)("CveMetodoPago").ToString.ToEntero + Me.CveFormaPago = Data.Rows(0)("CveFormaPago").ToString.ToEntero Me.MetodoPago = Data.Rows(0)("MetodoPago").ToString Me.MetodoPagoSAT = Data.Rows(0)("MetodoPagoSAT").ToString @@ -1780,7 +1781,7 @@ Public Class ClsRH Public Function GetPersonal2(CvePersonal As Integer, Codigo As String, Nombre As String, NSS As String, RFC As String, CveTurno As Integer, CvePuesto As Integer, CveDepartamento As Integer, CveRuta As Integer, CveEscolaridad As Integer, CveEstadoCivil As Integer, CveGenero As Integer, CveEstatusPersonal As Integer, CveSubProyecto As Integer, CveClienteAsignado As Integer, HorarioTrabajo As String, CveSupervisor As Integer, - CveTipoPeriodo As Integer, CveMetodoPago As Integer, CveTipoContrato As Integer, CveMotivoBaja As Integer, CveProyecto As Integer, + CveTipoPeriodo As Integer, CveFormaPago As Integer, CveTipoContrato As Integer, CveMotivoBaja As Integer, CveProyecto As Integer, FechaIFinContrato As String, FechaFFinContrato As String, FechaIIngreso As String, FechaFIngreso As String, SqlStr As String, NCaracteristicas As Integer, CveEmpresa As Integer, Optional TopSelect As Integer = 10000, Optional EsReserva As Integer = -1) As Boolean @@ -1806,7 +1807,7 @@ Public Class ClsRH .Add("@HorarioTrabajo", SqlDbType.VarChar).Value = HorarioTrabajo .Add("@CveSupervisor", SqlDbType.Int).Value = CveSupervisor .Add("@CveTipoPeriodo", SqlDbType.Int).Value = CveTipoPeriodo - .Add("@CveMetodoPago", SqlDbType.Int).Value = CveMetodoPago + .Add("@CveFormaPago", SqlDbType.Int).Value = CveFormaPago .Add("@CveTipoContrato", SqlDbType.Int).Value = CveTipoContrato .Add("@CveMotivoBaja", SqlDbType.Int).Value = CveMotivoBaja .Add("@CveProyecto", SqlDbType.Int).Value = CveProyecto @@ -1846,7 +1847,7 @@ Public Class ClsRH Me.SalarioDiarioSS = Data.Rows(0)("SalarioDiarioSS").ToString.ToDecimal Me.NumDiasAguinaldo = Data.Rows(0)("NumDiasAguinaldo").ToString.ToEntero Me.PorPrimaVacacional = Data.Rows(0)("PorPrimaVacacional").ToString.ToDecimal - Me.CveMetodoPago = Data.Rows(0)("CveMetodoPago").ToString.ToEntero + Me.CveFormaPago = Data.Rows(0)("CveFormaPago").ToString.ToEntero Me.MetodoPago = Data.Rows(0)("MetodoPago").ToString Me.MetodoPagoSAT = Data.Rows(0)("MetodoPagoSAT").ToString @@ -1975,7 +1976,7 @@ Public Class ClsRH Return Retorno End Function Public Function AddPersonal(Codigo As String, APaterno As String, AMaterno As String, Nombres As String, Correo As String, FechaIngreso As Date, CveTipoPeriodo As Integer, NumeroSS As String, SeInscribioSS As Boolean, SalarioDiarioPago As Double, SalarioDiario As Double, SDI As Double, - SalarioDiarioSS As Double, Bono As Double, NumDiasAguinaldo As Integer, PorPrimaVacacional As Double, CveMetodoPago As Integer, FechaInicioContrato As Date, FechaFinContrato As String, + SalarioDiarioSS As Double, Bono As Double, NumDiasAguinaldo As Integer, PorPrimaVacacional As Double, CveFormaPago 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, TelefonoEmergencia As String, Celular As String, RFC As String, CURP As String, CredencialElector As String, @@ -2008,7 +2009,7 @@ Public Class ClsRH .Add("@Bono", SqlDbType.Money).Value = Bono .Add("@NumDiasAguinaldo", SqlDbType.Int).Value = NumDiasAguinaldo .Add("@PorPrimaVacacional", SqlDbType.Float).Value = PorPrimaVacacional - .Add("@CveMetodoPago", SqlDbType.Int).Value = CveMetodoPago + .Add("@CveFormaPago", SqlDbType.Int).Value = CveFormaPago .Add("@FechaInicioContrato", SqlDbType.Date).Value = FechaInicioContrato .Add("@FechaFinContrato", SqlDbType.VarChar).Value = FechaFinContrato .Add("@CveTipoContrato", SqlDbType.Int).Value = CveTipoContrato @@ -2130,7 +2131,7 @@ Public Class ClsRH Public Function UpdatePersonal(Codigo As String, APaterno As String, AMaterno As String, Nombres As String, Correo As String, FechaIngreso As Date, CveTipoPeriodo As Integer, NumeroSS As String, SeInscribioSS As Boolean, SalarioDiarioPago As Double, SalarioDiario As Double, SDI As Double, - SalarioDiarioSS As Double, Bono As Double, NumDiasAguinaldo As Integer, PorPrimaVacacional As Double, CveMetodoPago As Integer, FechaInicioContrato As Date, FechaFinContrato As String, + SalarioDiarioSS As Double, Bono As Double, NumDiasAguinaldo As Integer, PorPrimaVacacional As Double, CveFormaPago 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, TelefonoEmergencia As String, Celular As String, RFC As String, CURP As String, CredencialElector As String, @@ -2165,7 +2166,7 @@ Public Class ClsRH .Add("@Bono", SqlDbType.Money).Value = Bono .Add("@NumDiasAguinaldo", SqlDbType.Int).Value = NumDiasAguinaldo .Add("@PorPrimaVacacional", SqlDbType.Float).Value = PorPrimaVacacional - .Add("@CveMetodoPago", SqlDbType.Int).Value = CveMetodoPago + .Add("@CveFormaPago", SqlDbType.Int).Value = CveFormaPago .Add("@FechaInicioContrato", SqlDbType.Date).Value = FechaInicioContrato .Add("@FechaFinContrato", SqlDbType.VarChar).Value = FechaFinContrato .Add("@CveTipoContrato", SqlDbType.Int).Value = CveTipoContrato diff --git a/RH/Personal.aspx b/RH/Personal.aspx index 489ecb236..32e1ab0a1 100644 --- a/RH/Personal.aspx +++ b/RH/Personal.aspx @@ -1643,7 +1643,7 @@ -
+
@@ -1651,6 +1651,14 @@
+
+ + + + + + +
diff --git a/RH/Personal.aspx.vb b/RH/Personal.aspx.vb index abd96ff48..0135cf003 100644 --- a/RH/Personal.aspx.vb +++ b/RH/Personal.aspx.vb @@ -1418,6 +1418,9 @@ Partial Class RH_Personal Private Sub CargaMetodosPago() DdlMetodoPago.DataSource = GlobalDTVtaMetodoPago DdlMetodoPago.DataBind() + + DdlFormaPago.DataSource = GlobalDTVtaFormaPago + DdlFormaPago.DataBind() End Sub Private Sub CargaTipoRegimen() @@ -1863,7 +1866,8 @@ Partial Class RH_Personal TxtPorPrimaVacacional.Text = ObjPersonal.PorPrimaVacacional.ToString() TxtFIPrimaVacacional.Text = ObjPersonal.PorPrimaVacacional.ToString() - DdlMetodoPago.SelectedValue = ObjPersonal.CveMetodoPago.ToString() + 'DdlMetodoPago.SelectedValue = ObjPersonal.CveMetodoPago.ToString() + DdlFormaPago.SelectedValue = ObjPersonal.CveFormaPago.ToString() TxtBancoNumCuenta.Text = ObjPersonal.BancoNumCuenta TxtCLABE.Text = ObjPersonal.CLABE DdlSupervisorOrganigrama.SelectedValueExist(If(ObjPersonal.CvePersonalPadre = ObjPersonal.CvePersonal, "0", If(ObjPersonal.CvePersonalPadre.ToString() = "0", "-1", ObjPersonal.CvePersonalPadre.ToString()))) @@ -2036,7 +2040,7 @@ Partial Class RH_Personal If ObjPersonal.AddPersonal(TxtCodigo.Text.Trim, TxtAPaterno.Text.Trim, TxtAMaterno.Text.Trim, TxtNombres.Text.Trim, TxtCorreo.Text.Trim, TxtFechaIngreso.Text.ToDate, DdlTipoPeriodo.SelectedValue.ToEntero(), TxtNumeroSS.Text.Trim, ChkSeInscribioSS.Checked, TxtSalarioDiarioPago.Text.Trim.ToDouble, TxtSalarioDiario.Text.Trim.ToDouble, TxtSDI.Text.Trim.ToDouble, TxtSalarioCotizado.Text.Trim.ToDouble, TxtBono.Text.Trim.ToDouble, TxtNumDiasAguinaldo.Text.Trim.ToEntero(), - TxtPorPrimaVacacional.Text.Trim.ToDouble, DdlMetodoPago.SelectedValue.ToEntero(), TxtFechaInicioContrato.Text.Trim.ToDate, If(IsDate(TxtFechaFinContrato.Text.Trim()), TxtFechaFinContrato.Text.Trim(), "-1"), + TxtPorPrimaVacacional.Text.Trim.ToDouble, DdlFormaPago.SelectedValue.ToEntero(), TxtFechaInicioContrato.Text.Trim.ToDate, If(IsDate(TxtFechaFinContrato.Text.Trim()), TxtFechaFinContrato.Text.Trim(), "-1"), DdlTipoContrato.SelectedValue.ToEntero(), TxtUbicacion.Text.Trim, DdlTurno.SelectedValue.ToEntero(), DdlPuesto.SelectedValue.ToEntero(), DdlDepartamento.SelectedValue.ToEntero(), @@ -2121,7 +2125,7 @@ Partial Class RH_Personal If ObjPersonal.UpdatePersonal(TxtCodigo.Text.Trim, TxtAPaterno.Text.Trim, TxtAMaterno.Text.Trim, TxtNombres.Text.Trim, TxtCorreo.Text.Trim, TxtFechaIngreso.Text.ToDate, DdlTipoPeriodo.SelectedValue.ToEntero(), TxtNumeroSS.Text.Trim, ChkSeInscribioSS.Checked, TxtSalarioDiarioPago.Text.Trim.ToDouble, TxtSalarioDiario.Text.Trim.ToDouble, TxtSDI.Text.Trim.ToDouble, TxtSalarioCotizado.Text.Trim.ToDouble, TxtBono.Text.Trim.ToDouble, TxtNumDiasAguinaldo.Text.Trim.ToEntero(), - TxtPorPrimaVacacional.Text.Trim.ToDouble, DdlMetodoPago.SelectedValue.ToEntero(), TxtFechaInicioContrato.Text.Trim.ToDate, If(IsDate(TxtFechaFinContrato.Text.Trim()), TxtFechaFinContrato.Text.Trim(), "-1"), + TxtPorPrimaVacacional.Text.Trim.ToDouble, DdlFormaPago.SelectedValue.ToEntero(), TxtFechaInicioContrato.Text.Trim.ToDate, If(IsDate(TxtFechaFinContrato.Text.Trim()), TxtFechaFinContrato.Text.Trim(), "-1"), DdlTipoContrato.SelectedValue.ToEntero(), TxtUbicacion.Text.Trim, DdlTurno.SelectedValue.ToEntero(), DdlPuesto.SelectedValue.ToEntero(), DdlDepartamento.SelectedValue.ToEntero(),