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

Browse Source
This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2021-01-13 12:27:32 -07:00
parent d7a36b68a9
commit ba3f507c1d
17 changed files with 1994 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RH/Personal.aspx
View File

@@ -474,7 +474,7 @@
</div>
<div class="form-group form-md-line-input input-iconright">
<asp:DropDownList Width ="100%" ID="DdlTipoContrato" runat="server" AppendDataBoundItems="True" DataTextField="txtoddl" DataValueField="CveTipoContrato" CssClass="form-control input-sm select2me" ValidationGroup="GrpGuardar">
<asp:DropDownList Width ="100%" ID="DdlTipoContrato" runat="server" AppendDataBoundItems="True" DataTextField="TipoContrato" DataValueField="CveTipoContrato" CssClass="form-control input-sm select2me" ValidationGroup="GrpGuardar">
<asp:ListItem Selected="True" Text="Seleccione" Value="-1"></asp:ListItem>
</asp:DropDownList>
@@ -4711,7 +4711,7 @@
</div>
<div class="form-group form-md-line-input">
<asp:TextBox ID="TxtSalarioDiarioImSS" Enabled="true" CssClass="form-control" runat="server"></asp:TextBox>
<asp:TextBox ID="TxtSalarioDiarioImSS" Enabled="false" CssClass="form-control" runat="server"></asp:TextBox>
<asp:Label runat="server" AssociatedControlID="TxtSalarioDiarioImSS">Salario diario(IMSS):</asp:Label>
</div>

38
RH/Personal.aspx.vb
View File

@@ -1001,10 +1001,9 @@ Partial Class RH_Personal
End Sub
Private Sub CargaTiposContrato()
Dim dt As DataTable = GlobalDTTiposContrato
'dt.Columns.Add("txtoddl", GetType(String), "CodigoTipoContrato + ' ' + TipoContrato")
'DdlTipoContrato.DataSource = dt
'DdlTipoContrato.DataBind()
Dim dt As DataTable = GlobalDTTiposContrato
DdlTipoContrato.DataSource = dt
DdlTipoContrato.DataBind()
End Sub
Private Sub CargaTurno()
@@ -6208,7 +6207,12 @@ Partial Class RH_Personal
Alert("Se actualizo el calculo de fonacot")
End If
End Sub
Protected Sub LnkCalcularFactor_Click(sender As Object, e As EventArgs)
Protected Sub LnkCalcularFactor_Click(sender As Object, e As EventArgs)
getdatosFI()
RegistraScript("$('#DmodalFactordeIntegraccion').modal()")
End Sub
Private Sub getdatosFI()
If TxtFIAguinaldo.Text = "0" Or TxtFIAguinaldo.Text = "" Or TxtFIAguinaldo.Text = "-1" Then
TxtFIAguinaldo.Text = "15"
End If
@@ -6237,10 +6241,8 @@ Partial Class RH_Personal
End If
End If
End Using
End If
RegistraScript("$('#DmodalFactordeIntegraccion').modal()")
UpFactordeintegracion.Update()
End If
UpFactordeintegracion.Update()
End Sub
Private Sub calcularSDI()
Dim SD As Decimal = TxtFISalariodiario.Text.ToDecimal()
@@ -6282,15 +6284,25 @@ Partial Class RH_Personal
End If
End Using
End Sub
Protected Sub LnkModificarSalarioGuardar_Click(sender As Object, e As EventArgs)
Protected Sub LnkModificarSalarioGuardar_Click(sender As Object, e As EventArgs)
getdatosFI()
TxtFISalariodiario.Text = TxtSalarioDiarioM.Text
calcularSDI()
TxtSalarioDiarioImSS.Text = TxtFISalarioDiarioIntegrado.Text
TxtSalarioDiarioIntegrado.Text = TxtFISalarioDiarioIntegrado.Text
Using ObjPersonal As ClsRH = New ClsRH()
If ObjPersonal.UpdateSalarios(CvePersonal, TxtFechamodSalario.Text.ToDate().ToString("yyyy/MM/dd"), UsuarioActual.CveEmpresa, TxtSalarioDiarioM.Text.ToDecimal(), TxtSalarioDiarioIntegrado.Text.ToDecimal(), TxtSalarioDiarioImSS.Text.ToDecimal(), TxtSalarioDiarioPago.Text.ToDecimal()) Then
If ObjPersonal.UpdateSalarios(CvePersonal, TxtFechamodSalario.Text.ToDate().ToString("yyyy/MM/dd"), UsuarioActual.CveEmpresa, TxtSalarioDiarioM.Text.ToDecimal(), TxtFISalarioDiarioIntegrado.Text.ToDecimal(), TxtFISalarioDiarioIntegrado.Text.ToDecimal(), TxtSalarioDiarioM.Text.ToDecimal()) Then
TxtSalarioDiario.Text = TxtSalarioDiarioM.Text
TxtFISalariodiario.Text = TxtSalarioDiarioM.Text
TxtSalarioCotizado.Text = TxtSalarioDiarioImSS.Text
TxtSDI.Text = TxtSalarioDiarioIntegrado.Text
TxtFISalarioDiarioIntegrado.Text = TxtSalarioDiarioIntegrado.Text
TxtFISalarioDiarioIntegrado.Text = TxtSalarioDiarioIntegrado.Text
UpModSalario.Update()
UpDatos.Update()
Alert("Se ha actualizado el salario", TipoMensaje.ToastInformacion)
End If