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
2023-11-20 07:38:36 -07:00
parent 13f7b26b2d 3a7d43744b
commit f599c7a3fb
120 changed files with 20969 additions and 2499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RH/AsistenciaDetalle.aspx.vb
View File

@@ -210,7 +210,7 @@ Partial Class RH_AsistenciaDetalle
Dim ObjAsistencias As New ClsRH
Dim ObjAsistenciasDetalle As New ClsRH
If ObjAsistencias.AddAsistencia(CvePersonal, -1, DdlSubProyectoAsignado.SelectedValue.ToEntero, NowADS(), 6, 100, 0, 0, -1, "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa) Then
If ObjAsistencias.AddAsistencia(CvePersonal, -1, DdlSubProyectoAsignado.SelectedValue.ToEntero, NowADS(), 6, 100, 0, 0, -1, "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, "G") Then
If ObjAsistencias.CveAsistencia > 0 AndAlso
ObjAsistenciasDetalle.AddAsistenciasDetalle(ObjAsistencias.CveAsistencia, DdlSubProyectoAsignado.SelectedValue.ToEntero, TxtHoraInicio.Text.Trim.ToDateTime, TxtHoraFin.Text.Trim.ToDateTime, DdlTipoHora.SelectedValue.ToEntero) Then
TxtHoraInicio.Text = ""

6
RH/MiPerfil.aspx.vb
View File

@@ -354,11 +354,11 @@ Partial Class RH_MiPerfil
End Set
End Property
Private Property ImporteTotal As Double
Private Property ImporteTotal As Decimal
Get
Return ViewState("ImporteTotal").ToString.ToDouble
Return ViewState("ImporteTotal").ToString.ToDecimal
End Get
Set(value As Double)
Set(value As Decimal)
ViewState("ImporteTotal") = value
End Set
End Property

7
RH/Personal.aspx.vb
View File

@@ -6958,7 +6958,7 @@ Partial Class RH_Personal
Dim primav As Decimal = TxtFIPrimaVacacional.Text.ToDecimal()
Dim DiasVacaciones As Decimal = TxtFIDiasVacaciones.Text.ToDecimal()
Dim diasaguinaldo As Decimal = TxtFIAguinaldo.Text.ToDecimal()
Dim FI As Decimal = (365 + diasaguinaldo + (DiasVacaciones * (primav / 100))) / 365
Dim FI As Decimal = (365D + diasaguinaldo + (DiasVacaciones * (primav / 100D))) / 365D
Dim SDI As Decimal = (SD * FI)
TxtFactordeIntegracion.Text = FI.ToString()
TxtFISalarioDiarioIntegrado.Text = String.Format("{0:###0.########}", SDI)
@@ -6966,7 +6966,7 @@ Partial Class RH_Personal
End Sub
Protected Sub LnkCalcularFactordeintegracion_Click(sender As Object, e As EventArgs)
calcularSDI()
Alert(String.Format(" salario diario integreado {0}", TxtFISalarioDiarioIntegrado.Text))
Alert(String.Format(" salario diario integrado {0}", TxtFISalarioDiarioIntegrado.Text))
End Sub
Protected Sub LnkCalcularFactordeintegracionyguardar_Click(sender As Object, e As EventArgs)
calcularSDI()
@@ -7654,10 +7654,9 @@ Partial Class RH_Personal
Utilidades = String.Format("{0:N2}", dbrow("Importe"))
dSDTotal = dSDTotal + dbrow("Importe").ToString().ToDecimal()
End If
SDTotalText = Texto2Letras(dSDTotal.ToString().ToDouble())
SDTotalText = Texto2Letras(dSDTotal)
SDTotal = String.Format("{0:N2}", dSDTotal)
End If
End Using

4
RH/SolicitudViaticos.aspx.cs
View File

@@ -38,11 +38,11 @@ public partial class RH_SolicitudViaticos : ClsPaginas
ViewState["DTConceptosDetalles"] = value;
}
}
private Double ImporteTotal
private decimal ImporteTotal
{
get
{
return ViewState["ImporteTotal"].ToString().ToDouble();
return ViewState["ImporteTotal"].ToString().ToDecimal();
}
set