Cambios nominas e inventarios

This commit is contained in:
JORGE LUIS CAUDILLO ESPARZA
2019-09-26 18:58:18 -07:00
parent 7ea10b7141
commit 70d0f69c35
8 changed files with 259 additions and 42 deletions

View File

@@ -1248,12 +1248,16 @@
</div>
<div class="col-md-8">
<div class="portlet light bordered xspadding">
<div class="portlet light bordered xspadding" id="porletconceptos">
<div class="portlet-title">
<div class="caption font-green">
<i class="icon-user-following font-green"></i>
<i class="fa fa-bookmark font-green"></i>
<span class="caption-subject bold uppercase">Conceptos</span>
</div>
<div class="tools">
<a href="javascript:;" class="collapse" data-original-title="" title=""></a>
<a href="javascript:;" class="fullscreen" data-original-title="" title=""></a>
</div>
<div class="actions">
<div class="btn-group">
<asp:Button ID="BtnGuardarConceptos" runat="server" Text="Guardar Conceptos" class="btn btn-primary" />
@@ -1261,7 +1265,9 @@
</div>
</div>
<div class="portlet-body form">
<asp:GridView ID="GVConceptos" runat="server" AutoGenerateColumns="False" DataKeyNames="CvePersonal,CveConcepto,CvePersonalConcepto,Obligatorio" Width="550px" CssClass="table table-striped table-advance table-hover" Style="text-align: center;" GridLines="None">
<asp:GridView ID="GVConceptos" runat="server" AutoGenerateColumns="False" DataKeyNames="CvePersonal,CveConcepto,CvePersonalConcepto,Obligatorio"
data-height="300"
CssClass="table table-striped table-advance table-hover Widthall ScrollAD" Style="text-align: center;" GridLines="None">
<Columns>
<asp:TemplateField>
<HeaderTemplate>Aplica</HeaderTemplate>
@@ -1309,6 +1315,10 @@
<asp:ListItem Text="Saldo" Value="1"></asp:ListItem>
<asp:ListItem Text="No. Pagos" Value="2"></asp:ListItem>
<asp:ListItem Text="Permanente" Value="2600"></asp:ListItem>
<asp:ListItem Text="Infonavit(Movto Permanente)" Value="5000"></asp:ListItem>
<asp:ListItem Text="Infonavit(Porcentaje)" Value="5001"></asp:ListItem>
<asp:ListItem Text="Infonavit(Factor Descuento)" Value="5002"></asp:ListItem>
<asp:ListItem Text="Infonavit(Cuota Fija)" Value="5003"></asp:ListItem>
</asp:DropDownList></td>
<td width="65px">
<asp:Literal ID="LtlNoPago" runat="server" Text='<%# If(IsNumeric(Eval("NoPago")), Eval("NoPago").ToString + "/", "")%>' Visible="false"></asp:Literal>
@@ -1331,6 +1341,85 @@
</div>
</div>
<div class="portlet light bordered xspadding" id="porletInfonavit">
<div class="portlet-title">
<div class="caption font-green">
<i class="fa fa-home font-green"></i>
<span class="caption-subject bold uppercase">Infonavit</span>
</div>
<div class="tools">
<a href="javascript:;" class="collapse" data-original-title="" title=""></a>
<a href="javascript:;" class="fullscreen" data-original-title="" title=""></a>
</div>
<div class="actions">
<div class="btn-group">
<asp:Button ID="BtnGuardarInfornavit" OnClick="BtnGuardarInfornavit_Click" runat="server" Text="Guardar" class="btn btn-primary" />
</div>
</div>
</div>
<div class="portlet-body form">
<div class="row">
<div class="col-md-6">
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="TxtInfoNumCredito" runat="server" MaxLength="20"></asp:TextBox>
<asp:Label AssociatedControlID="TxtInfoNumCredito" runat="server" Text="Número de crédito"></asp:Label>
</div>
</div>
<div class="col-md-6">
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="TxtInfoDescripcion" runat="server" MaxLength="20"></asp:TextBox>
<asp:Label AssociatedControlID="TxtInfoDescripcion" runat="server" Text="Descripción"></asp:Label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group form-md-line-input input-iconright">
<asp:Label AssociatedControlID="DdlInfoTipoAplicacion" runat="server" Text="Tipo Aplicación"></asp:Label>
<asp:DropDownList ID="DdlInfoTipoAplicacion" AutoPostBack="true" runat="server" Class="form-control select2me" width="100%">
<asp:ListItem Text="Infonavit(Movto Permanente)" Value="5000"></asp:ListItem>
<asp:ListItem Text="Infonavit(Porcentaje)" Value="5001"></asp:ListItem>
<asp:ListItem Text="Infonavit(Factor Descuento)" Value="5002"></asp:ListItem>
<asp:ListItem Text="Infonavit(Cuota Fija)" Value="5003"></asp:ListItem>
</asp:DropDownList>
</div>
</div>
<div class="col-md-6">
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="TxtInfoValor" runat="server" MaxLength="20"></asp:TextBox>
<asp:Label AssociatedControlID="TxtInfoValor" runat="server" Text="Valor"></asp:Label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group form-md-line-input input-iconright " style="width: 120px !important; display: inline-block;">
<asp:TextBox CssClass="form-control" ID="TxtInfoFechaInicio" runat="server" MaxLength="20"></asp:TextBox>
<asp:Label AssociatedControlID="TxtInfoFechaInicio" runat="server" Text="Fecha Inicio"></asp:Label>
<asp:RequiredFieldValidator runat="server" ID="REQFechaF" ControlToValidate="TxtInfoFechaInicio" ErrorMessage="Debe ingresar una fecha" ValidationGroup="vgEstFin" />
<ajax:MaskedEditExtender ID="MaskedEditExtender4" runat="server" TargetControlID="TxtInfoFechaInicio" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
<ajax:CalendarExtender runat="server" ID="CEEFechaF" TargetControlID="TxtInfoFechaInicio" PopupButtonID="ImgFechaFEstFin" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
</div>
<div style="display: inline-block; vertical-align: top; padding-top: 10px;">
<span class="input-group-btn ">
<asp:LinkButton ID="ImgFechaFEstFin" class="btn default " Text="<i class='fa fa-calendar'></i>" runat="server"></asp:LinkButton>
</span>
</div>
</div>
<div class="col-md-3">
<div class="form-group form-md-line-input input-iconright">
<asp:Label AssociatedControlID="ChkInfo" runat="server" Text="Estado (Activo)"></asp:Label>
</div>
</div>
<div class="col-md-3">
<asp:CheckBox ID="ChkInfo" CssClass="chksino" runat="server" Text =" " />
</div>
</div>
</div>
</div>
<div class="portlet box blue-hoki" style="width: 100%;">
<div class="portlet-title">
<div class="caption">

View File

@@ -2036,6 +2036,17 @@ Partial Class RH_Personal
Dim ObjPersonal As New ClsRH
If ObjPersonal.GetPersonalConceptos(CvePersonal, UsuarioActual.CveEmpresa) Then
GVConceptos.DataSource = ObjPersonal.DtResultados
Dim frow As DataRow = ObjPersonal.DtResultados.FiltroPrimero("CveSistema =3")
If Not IsNothing(frow) Then
TxtInfoValor.Text = String.Format("{0:###,###.##}", frow("Importe"))
DdlInfoTipoAplicacion.SelectedValueExist(frow("TipoAplicacion").ToString())
Dim TipoAplicacion As Integer = DdlInfoTipoAplicacion.SelectedValue.ToEntero
TxtInfoDescripcion.Text = String.Format("{0}", frow("Descripcion02"))
TxtInfoNumCredito.Text = String.Format("{0}", frow("Descripcion01"))
TxtInfoFechaInicio.Text = String.Format("{0:dd/MM/yyyy}", frow("FInicioAplicacion"))
ChkInfo.Checked = frow("estatus").ToString().ToUpper().Contiene("1", "TRUE")
End If
Else
GVConceptos.DataSource = Nothing
End If
@@ -2093,6 +2104,32 @@ Partial Class RH_Personal
End If
End Sub
Protected Sub BtnGuardarInfornavit_Click(sender As Object, e As EventArgs)
Dim importe As Decimal = TxtInfoValor.Text.ToDecimal()
Dim TipoAplicacion As Integer = DdlInfoTipoAplicacion.SelectedValue.ToEntero
Dim NoPagos As Integer = 0
Dim SaldoIni As Decimal = 0
Dim descripcion02 As String = TxtInfoDescripcion.Text
Dim descripcion01 As String = TxtInfoNumCredito.Text
Dim fecha As String = TxtInfoFechaInicio.Text.Replace("_", "")
Dim estatus As Integer = If(ChkInfo.Checked, 1, 0)
If fecha.Length > 8 Then
fecha = fecha.ToDateTime().ToString("yyyy/MM/dd")
Else
fecha = ""
End If
Dim OcurrioError As Boolean = False
Using ObjPersonal As New ClsRH
If Not ObjPersonal.AddConcepto(CvePersonal, -1, importe, TipoAplicacion, NoPagos, SaldoIni, UsuarioActual.CveUsuario, 3, descripcion01, descripcion02, fecha, "", estatus, UsuarioActual.CveEmpresa) Then
OcurrioError = True
End If
End Using
If Not OcurrioError Then
Alert("Se actualizo el calculo de infonavit")
CarcaConceptosNomina()
End If
End Sub
Protected Sub BtnGuardarConceptos_Click(sender As Object, e As System.EventArgs) Handles BtnGuardarConceptos.Click
If CvePersonal > 0 Then
Dim ObjPersonal As New ClsRH