AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2024-05-17 05:58:35 -07:00
parent 48f2d16d48 d66fb24728
commit c20e1e94fd
128 changed files with 8611 additions and 3952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Nomina/ChecadorAsistencia.aspx.cs
View File

@@ -363,7 +363,7 @@ public partial class Nomina_ChecadorAsistencia : ClsPaginas
}
using (ClsRH objRH = new ClsRH())
{
if (objRH.PreAsistenciaRegistrosGet(fechai, fechaf, -1, UsuarioActual.Empresa.CveEmpresa))
if (objRH.PreAsistenciaRegistrosGet(fechai, fechaf, -1, UsuarioActual.Empresa.CveEmpresa,false))
{
GvDetalleDias.DataSource = objRH.DtResultados.FiltraParametros(string.Format("FechaRegistro >='{0:yyyy/MM/dd HH:mm}' AND FechaRegistro <='{1:yyyy/MM/dd HH:mm}' AND CvePersonal = {2}", fechai.AddHours(6), fechaf.AddHours(6), CvePersonal), "FechaRegistro");
GvDetalleDias.DataBind();

2
Nomina/Nomina.aspx.cs
View File

@@ -3927,7 +3927,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
if (frow != null)
{
TxtInfoValor.Text = String.Format("{0:###,###.##}", frow["Importe"]);
TxtInfoValor.Text = String.Format("{0:###,###.####}", frow["Importe"]);
DdlInfoTipoAplicacion.SelectedValueExist(frow["TipoAplicacion"].ToString());
TxtInfoDescripcion.Text = String.Format("{0}", frow["Descripcion02"]);