From 8b0555f7f58cbc9b0215138b4eb6ea8ca440679d Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Wed, 2 Nov 2022 05:43:42 -0700 Subject: [PATCH] --- App_Code/LogicNominas.vb | 6 +- App_Code/modExtensiones.vb | 8 +-- Nomina/Nomina.aspx | 81 +++++++++++++++++++-- Nomina/Nomina.aspx.cs | 141 +++++++++++++++++++++++++++++++++++++ RH/CalculoSBC.aspx.cs | 16 ++--- vwd.webinfo | 2 + 6 files changed, 234 insertions(+), 20 deletions(-) diff --git a/App_Code/LogicNominas.vb b/App_Code/LogicNominas.vb index 8f2cafafa..6fee37f4c 100644 --- a/App_Code/LogicNominas.vb +++ b/App_Code/LogicNominas.vb @@ -19,7 +19,7 @@ Public Class LogicNominas sw.Start() End If - Dim cfdi As CFDITimbre = PreTimbrar(CveNomina, UsuarioActual, False) 'CvePersonal, CvePeriodo, + Dim cfdi As CFDITimbre = PreTimbrar(CveNomina, UsuarioActual, False, CvePAC) 'CvePersonal, CvePeriodo, If cfdi IsNot Nothing AndAlso cfdi.Mensaje = "" Then If Not cfdi.Timbrado Then Dim ObjTimbrado As New Timbrado @@ -81,7 +81,7 @@ Public Class LogicNominas Return Retorno End Function Dim hasfiniquito As Boolean - Public Function PreTimbrar(CveNomina As Integer, UsuarioActual As Usuario, TimbreIndemnizacion As Boolean) As CFDITimbre + Public Function PreTimbrar(CveNomina As Integer, UsuarioActual As Usuario, TimbreIndemnizacion As Boolean, Optional CvePAC As Integer = 4) As CFDITimbre Dim continuar As Boolean = True hasfiniquito = False Dim CvePersonal As Integer = -1 @@ -439,7 +439,7 @@ Public Class LogicNominas cfdi.Comprobante.TipoComprobante = "N" cfdi.Comprobante.TipoDocto = "Egs" cfdi.Comprobante.MetodoPago = "PUE" - cfdi.Comprobante.CondicionesdePago = "" '"CONTADO" + cfdi.Comprobante.CondicionesdePago = If(CvePAC < 4, "CONTADO", "") '"" '"" cfdi.Comprobante.FormadePago = If(UsuarioActual.Empresa.Funcionalidad(350).Contiene("1"), "", "99") cfdi.Comprobante.LugarExpedicion = UsuarioActual.Empresa.CP.ToString() ' AHORITA SOLO SE REQUIERE ESPECIFICAR EL CODIGO POSTAL cfdi.Comprobante.NumCuentaPago = "" 'objPersonal.BancoNumCuenta diff --git a/App_Code/modExtensiones.vb b/App_Code/modExtensiones.vb index ee58149a8..38687b3e8 100644 --- a/App_Code/modExtensiones.vb +++ b/App_Code/modExtensiones.vb @@ -59,14 +59,14 @@ Namespace Extensiones #End Region - Public Function ReadExcelFile(ByVal flatFilePath As String, ByVal firstRowHasHeaders As Boolean) As DataTable + Public Function ReadExcelFile(ByVal flatFilePath As String, ByVal firstRowHasHeaders As Boolean, Optional curRow As Integer = 0) As DataTable GemBox.Spreadsheet.SpreadsheetInfo.SetLicense(ModExtensiones.SerialGemBoxSpreadsheet) Dim excelFile As GemBox.Spreadsheet.ExcelFile = GemBox.Spreadsheet.ExcelFile.Load(flatFilePath) Dim unnamed As Integer = 0 Dim cols As Integer Dim columns As String() - Dim curRow As Integer = 0 + 'Dim curRow As Integer = 0 Dim curCol As Integer = 0 Dim dataTable As DataTable = New DataTable() Dim worksheet As GemBox.Spreadsheet.ExcelWorksheet = excelFile.Worksheets(0) @@ -75,8 +75,8 @@ Namespace Extensiones If firstRowHasHeaders Then - If worksheet.Rows(0).Cells(cols).Value IsNot Nothing Then - dataTable.Columns.Add(worksheet.Rows(0).Cells(cols).Value.ToString()) + If worksheet.Rows(curRow).Cells(cols).Value IsNot Nothing Then + dataTable.Columns.Add(worksheet.Rows(curRow).Cells(cols).Value.ToString()) Else dataTable.Columns.Add("Unnamed Column " & (System.Threading.Interlocked.Increment(unnamed))) End If diff --git a/Nomina/Nomina.aspx b/Nomina/Nomina.aspx index 796e7f71e..acdab6bfe 100644 --- a/Nomina/Nomina.aspx +++ b/Nomina/Nomina.aspx @@ -615,19 +615,49 @@ -
-
-
-
+
+ <%--Descargar + Cargar--%> + + + + Asistencia + + + + + + + + + + + +
+
+
- + @@ -3195,6 +3225,47 @@ + +