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
2023-05-12 00:25:57 -07:00
parent c6b146f0db
commit b2f2f1e389
3 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
App_Code/LogicNominas.vb
View File

@@ -97,7 +97,7 @@ Public Class LogicNominas
Dim DtDeducciones As Data.DataTable = Nothing
Dim DtOtrosPagos As Data.DataTable = Nothing
Dim DtHorasExtras As Data.DataTable = Nothing
'Dim DtHorasExtras As Data.DataTable = Nothing
Dim TotalPercepciones As Decimal = 0
Dim TotalDeducciones As Decimal = 0
Dim TotalOtrosPagos As Decimal = 0
@@ -253,13 +253,13 @@ Public Class LogicNominas
continuar = False
End If
If Not TimbreIndemnizacion Then
If continuar AndAlso objNomina.GetHorasExtras(CvePersonal, CvePeriodo, UsuarioActual.CveEmpresa) Then
DtHorasExtras = objNomina.DtResultados
Else
continuar = False
End If
'If continuar AndAlso objNomina.GetHorasExtras(CvePersonal, CvePeriodo, UsuarioActual.CveEmpresa) Then
' DtHorasExtras = objNomina.DtResultados
'Else
' continuar = False
'End If
Else
DtHorasExtras = New DataTable()
'DtHorasExtras = New DataTable()
End If
If continuar AndAlso objNomina.GetPeriodos(-1, UsuarioActual.CveEmpresa, -1, -1, CvePeriodo) AndAlso objNomina.DtResultados.Rows().Count > 0 Then
Dim DrPeriodo As DataRow = objNomina.DtResultados.Rows(0)
@@ -350,14 +350,32 @@ Public Class LogicNominas
.ImporteGravado = Row("ImporteGravado").ToString().ToDecimal(), .ImporteExento = Row("ImporteExento").ToString().ToDecimal()})
End If
'RMF, falta poner el numero de horas pagadas
If Row("SATCveConcepto").ToString().ToEntero() = 19 AndAlso DtHorasExtras IsNot Nothing Then 'cuando son horas extras
If Row("SATCveConcepto").ToString().ToEntero() = 19 Then 'cuando son horas extras
'Obtengo el desglose de horas extras
Dim dr As DataRow = DtHorasExtras.FiltroPrimero("")
If dr IsNot Nothing Then
If dr("HorasDobles").ToString().ToDouble > 0 And Row("CveSistema").ToString().ToEntero() = 12 Then ObjHorasExtras.Add(New CFDINominaHorasExtras With {.Dias = dr("DiasHorasDobles").ToString().ToEntero().ToString(), .TipoHoras = "01", .HorasExtra = dr("HorasDobles").ToString().ToEntero(), .ImportePagado = Row("Importe").ToString().ToDecimal})
If dr("HorasTriples").ToString().ToDouble > 0 And Row("CveSistema").ToString().ToEntero() = 13 Then ObjHorasExtras.Add(New CFDINominaHorasExtras With {.Dias = dr("DiasHorasTriples").ToString().ToEntero().ToString(), .TipoHoras = "02", .HorasExtra = dr("HorasTriples").ToString().ToEntero(), .ImportePagado = Row("Importe").ToString().ToDecimal})
'Dim dr As DataRow = DtHorasExtras.FiltroPrimero("")
'If dr IsNot Nothing Then
' If dr("HorasDobles").ToString().ToDouble > 0 And Row("CveSistema").ToString().ToEntero() = 12 Then
' ObjHorasExtras.Add(New CFDINominaHorasExtras With {.Dias = dr("DiasHorasDobles").ToString().ToEntero().ToString(),
' .TipoHoras = "01", .HorasExtra = dr("HorasDobles").ToString().ToEntero(), .ImportePagado = Row("Importe").ToString().ToDecimal()})
' End If
' If dr("HorasTriples").ToString().ToDouble > 0 And Row("CveSistema").ToString().ToEntero() = 13 Then
' ObjHorasExtras.Add(New CFDINominaHorasExtras With {.Dias = dr("DiasHorasTriples").ToString().ToEntero().ToString(),
' .TipoHoras = "02", .HorasExtra = dr("HorasTriples").ToString().ToEntero(), .ImportePagado = Row("Importe").ToString().ToDecimal})
' End If
'End If
Dim horasextra As Integer = If(Row("ImporteValor").ToString().Replace("-", "").ToEntero() > 0, Row("ImporteValor").ToString().Replace("-", "").ToEntero(), 1)
Dim diasextra As Integer = (horasextra / 3).ToString().ToEntero()
If Row("CveSistema").ToString().ToEntero() = 12 Then
ObjHorasExtras.Add(New CFDINominaHorasExtras With {.Dias = diasextra.ToString(),
.TipoHoras = "01", .HorasExtra = horasextra, .ImportePagado = Row("Importe").ToString().ToDecimal()})
End If
If Row("CveSistema").ToString().ToEntero() = 13 Then
ObjHorasExtras.Add(New CFDINominaHorasExtras With {.Dias = diasextra.ToString(),
.TipoHoras = "02", .HorasExtra = horasextra, .ImportePagado = Row("Importe").ToString().ToDecimal})
End If
End If
'subsidio al empleo
If Row("SATCveConcepto").ToString().ToEntero().ToEntero() = 17 AndAlso Row("Importe").ToString().ToDecimal > 0 Then 'Subsidio

3
Nomina/Nomina.aspx
View File

@@ -774,6 +774,9 @@
<div class="form-group form-md-line-input input-iconright">
<asp:TextBox CssClass="form-control" ID="TxtObservaciones" runat="server" MaxLength="150"></asp:TextBox>
<asp:Label runat="server" AssociatedControlID="TxtObservaciones" Text="Observaciones"></asp:Label>
</div>
<div class=" text-right">
<asp:CheckBox ID="chkAistenciaRecalcular" Text="¿Volver a calcular la nómina?" runat="server" />
</div>
</div>

5
Nomina/Nomina.aspx.cs
View File

@@ -7082,6 +7082,11 @@ public partial class Nomina_Nomina2 : ClsPaginas
}
}
if (chkAistenciaRecalcular.Checked)
{
cargaDatos(true);
}
}
protected void btnasis_Click(object sender, EventArgs e)