diff --git a/Nomina/Nomina2.aspx b/Nomina/Nomina2.aspx index 676d992db..e5b598ad1 100644 --- a/Nomina/Nomina2.aspx +++ b/Nomina/Nomina2.aspx @@ -654,7 +654,7 @@
- + diff --git a/RH/Personal.aspx b/RH/Personal.aspx index f79e77d4d..039803a0d 100644 --- a/RH/Personal.aspx +++ b/RH/Personal.aspx @@ -1554,6 +1554,83 @@
+ +
+
+
+ + Fonacot +
+
+ +
+
+
+ +
+
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+
+
+ + + + + +
+
+ + + +
+
+
+
+ +
+
+
+ +
+
+
+
+
diff --git a/RH/Personal.aspx.vb b/RH/Personal.aspx.vb index 866555610..a0ce17f20 100644 --- a/RH/Personal.aspx.vb +++ b/RH/Personal.aspx.vb @@ -2285,7 +2285,7 @@ Partial Class RH_Personal Private Sub CarcaConceptosNomina() Dim ObjPersonal As New ClsRH If ObjPersonal.GetPersonalConceptos(CvePersonal, UsuarioActual.CveEmpresa) Then - GVConceptos.DataSource = ObjPersonal.DtResultados + GVConceptos.DataSource = ObjPersonal.DtResultados.FiltraParametros("(CveSistema <>3 AND CveSistema <>4) OR CveSistema IS NULL") Dim frow As DataRow = ObjPersonal.DtResultados.FiltroPrimero("CveSistema =3") If Not IsNothing(frow) Then TxtInfoValor.Text = String.Format("{0:###,###.##}", frow("Importe")) @@ -2297,6 +2297,24 @@ Partial Class RH_Personal TxtInfoFechaInicio.Text = String.Format("{0:dd/MM/yyyy}", frow("FInicioAplicacion")) ChkInfo.Checked = frow("estatus").ToString().ToUpper().Contiene("1", "TRUE") End If + + + frow = ObjPersonal.DtResultados.FiltroPrimero("CveSistema =4") + TxtFonValor.Text = "" + DdlFonTipoAplicacion.SelectedValueExist("-1") + TxtFonDescripcion.Text = "" + TxtFonNumCredito.Text = "" + TxtFonFechaInicio.Text = "" + ChkFonacot.Checked = False + If Not IsNothing(frow) Then + TxtFonValor.Text = String.Format("{0:###,###.##}", frow("Importe")) + DdlFonTipoAplicacion.SelectedValueExist(frow("TipoAplicacion").ToString()) + + TxtFonDescripcion.Text = String.Format("{0}", frow("Descripcion02")) + TxtFonNumCredito.Text = String.Format("{0}", frow("Descripcion01")) + TxtFonFechaInicio.Text = String.Format("{0:dd/MM/yyyy}", frow("FInicioAplicacion")) + ChkFonacot.Checked = frow("estatus").ToString().ToUpper().Contiene("1", "TRUE") + End If Else GVConceptos.DataSource = Nothing End If @@ -6064,4 +6082,30 @@ Partial Class RH_Personal gvrow.FCTextBox("TxtPorPago").Text = "87.5" End If End Sub + Protected Sub LnkGuardarFonacot_Click(sender As Object, e As EventArgs) + Dim importe As Double = TxtFonValor.Text.ToDouble() + Dim TipoAplicacion As Integer = DdlFonTipoAplicacion.SelectedValue.ToEntero() + Dim NoPagos As Integer = 0 + Dim SaldoIni As Double = 0 + Dim descripcion02 As String = TxtFonDescripcion.Text + Dim descripcion01 As String = TxtFonNumCredito.Text + Dim fecha As String = TxtFonFechaInicio.Text.Replace("_", "") + Dim estatus As Integer = If(ChkFonacot.Checked, 1, 0) + + If fecha.Length > 8 Then + fecha = fecha.ToDateTime().ToString("yyyy/MM/dd") + Else + fecha = "" + End If + + Dim continuar As Boolean = True + + Using ObjPersonal As ClsRH = New ClsRH() + If Not ObjPersonal.AddConcepto(CvePersonal, -1, importe, TipoAplicacion, NoPagos, SaldoIni, UsuarioActual.CveUsuario, 4, descripcion01, descripcion02, fecha, "", estatus, UsuarioActual.CveEmpresa) Then continuar = False + End Using + + If continuar Then + Alert("Se actualizo el calculo de fonacot") + End If + End Sub End Class