diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb
index 3a7756ca7..5037614ae 100644
--- a/App_Code/ClsNominas.vb
+++ b/App_Code/ClsNominas.vb
@@ -3468,6 +3468,28 @@ Public Class ClsNominas
End Try
Return retorno
End Function
+
+
+ Public Function GetFonacotSaldos(CveEmpresa As Integer, CvePersonal As Integer, CveFonacot As Integer) As Boolean
+ Dim retorno As Boolean = False
+ DataAdapter("PA_GetFonacotSaldos", CommandType.StoredProcedure)
+ With SqlAdapter.SelectCommand.Parameters
+ .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+ .Add("@CvePersonal", SqlDbType.Int).Value = CvePersonal
+ .Add("@CveFonacot", SqlDbType.Int).Value = CveFonacot
+ End With
+ Try
+ SqlAdapter.Fill(Data)
+ retorno = True
+ Catch sqEx As SqlException
+ retorno = False
+ OnError("Ocurrió un error al obtener los saldos Fonacot.", sqEx, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ Catch ex As Exception
+ retorno = False
+ OnError("Ocurrió un error al obtener los saldos Fonacot.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ End Try
+ Return retorno
+ End Function
Public Function AddMovtoPermanente(cveConcepto As Int32, cvePersonal As Int32, descripcion As String, tipoDescuento As Int32, valor As Double, vecesAplicar As Int32, montoLimite As Decimal, fechaInicioAplicacion As Date, estatus As Boolean, CveCuenta As Integer, Optional CveIE As Integer = -1, Optional EsAcumulado As Integer = 0) As Integer
Dim retorno As Integer = 0
DataAdapter("PA_AddMovtoPermanente", CommandType.StoredProcedure)
diff --git a/Nomina/Nomina.aspx b/Nomina/Nomina.aspx
index e2b86eaf9..b9043eadc 100644
--- a/Nomina/Nomina.aspx
+++ b/Nomina/Nomina.aspx
@@ -7,7 +7,13 @@
#pnlIncapacidade .form-group.form-md-line-input > .select2-container {
margin-top: 20px;
}
-
+ #C_UpModalConceptos > .modal-content{
+ height: calc(100vh - 50px) !important;
+ }
+ #C_UpModalConceptos > .modal-content > .modal-body {
+ height: calc(100vh - 150px);
+ overflow-y: auto;
+ }
.lnkMovotPermanente {
width: 100%;
color: #111;
@@ -1364,6 +1370,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5259,7 +5308,7 @@
+ CssClass="table table-striped table-advance table-hover Widthall ScrollAD mysmallbtn" data-sort="true" AutoGenerateColumns="False" data-heighterror="460">
<%----%>
diff --git a/Nomina/Nomina.aspx.cs b/Nomina/Nomina.aspx.cs
index 4d27e3f08..08f2e55fc 100644
--- a/Nomina/Nomina.aspx.cs
+++ b/Nomina/Nomina.aspx.cs
@@ -4137,6 +4137,12 @@ public partial class Nomina_Nomina2 : ClsPaginas
periodo = 20000101;
LimpiarFonacot();
+ using (ClsNominas ObjMovt = new ClsNominas())
+ {
+ ObjMovt.GetFonacotSaldos(UsuarioActual.CveEmpresa, SRCvePersonal, CveFonacot);
+ GVFonacotDetalle.DataSource = ObjMovt.DtResultados;
+ GVFonacotDetalle.DataBind();
+ }
TxtFonValor.Text = importeFijo.ToString();
TxtFonImporteCredito.Text = importeCredito.ToString();
TxtFonPagosHechos.Text = pagosHechos.ToString();
@@ -5196,7 +5202,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
int finPercepciones = iniciotipe;
column++;
- TitleRange(libro, "Incapacidad", filainicio + 2, column, filainicio + 2, column+2, false, false, PercborderColor);
+ TitleRange(libro, "Incapacidad", filainicio + 2, column, filainicio + 2, column, false, false, PercborderColor);
TitleRange(libro, "Perm. Faltas", filainicio + 3, column, filainicio + 3, column, false, false, PercborderColor);
//column++;
//TitleRange(libro, "Permisos", filainicio + 3, column, filainicio + 3, column, false, false, colororangeblue);
@@ -5353,6 +5359,10 @@ public partial class Nomina_Nomina2 : ClsPaginas
column++;
libro.Cell(Fila, column).Value = "";
+ try{libro.Cell(Fila, column).Value = erow[string.Format("V_{0}", 6817)];
+ libro.Cell(Fila, column).Style.NumberFormat.Format = "#,##0.00;-#,##0.00;\"\"";
+ }
+ catch (Exception) { }
column++;
libro.Cell(Fila, column).Value = erow["SalarioDiario"];