diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb
index 72bb963e5..0478b39c0 100644
--- a/Compras/Compras.aspx.vb
+++ b/Compras/Compras.aspx.vb
@@ -1418,11 +1418,6 @@ Partial Class Compras_Compras
End If
-
- If UsuarioActual.TienePermisoProceso(360) Then
- BtnProrateoDeducible.Visible = True
- End If
-
ElseIf Request("CveCompra") IsNot Nothing AndAlso IsNumeric(Request("CveCompra")) AndAlso Request("CveCompra").ToEntero > 0 Then
ViewState("CveCompra") = Request("CveCompra")
@@ -1462,9 +1457,9 @@ Partial Class Compras_Compras
UpLnkPaqueteriaGuias.Update()
End If
- If Not CveCompra > 0 Then
- LIContratos.Visible = True
- End If
+ If UsuarioActual.TienePermisoProceso(360) Then BtnProrateoDeducible.Visible = True
+
+ If Not CveCompra > 0 Then LIContratos.Visible = True
'SI ES UNA COMPRA NUEVA SE PONE EL TOTAL, SI NO EL SALDO
LblSaldoFactura.Text = If(CveCompra > 0, CompraSaldo.FormatoNumero, TxtTotal.Text.FormatoNumero)
@@ -10171,7 +10166,7 @@ Partial Class Compras_Compras
CargaGvInv()
CargaGVsAF()
CargaGvPersonal()
- Alert("El Concepto ha sido eliminado correctamente", TipoMensaje.MsgInformacion)
+ Alert("El Concepto ha sido eliminado correctamente", TipoMensaje.ToastInformacion)
End Sub
Private Sub GvDeudores_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvDeudores.RowDataBound
If e.Row.RowType = DataControlRowType.DataRow Then
diff --git a/Compras/eFacturas.aspx b/Compras/eFacturas.aspx
index 8af65aaa1..e53333212 100644
--- a/Compras/eFacturas.aspx
+++ b/Compras/eFacturas.aspx
@@ -1107,6 +1107,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Compras/eFacturas.aspx.vb b/Compras/eFacturas.aspx.vb
index ce502c1e2..8a138cf63 100644
--- a/Compras/eFacturas.aspx.vb
+++ b/Compras/eFacturas.aspx.vb
@@ -781,6 +781,11 @@ Partial Class Compras_eFacturas
CargaGvBitacora()
CargaDatos()
MostrarSolcitudesSAT()
+
+ If UsuarioActual.CveRol = 1 Then
+ GVSolicitudesPendientes.Columns(8).Visible = True
+ End If
+
End If
removeasincevent()
End Sub
@@ -5033,6 +5038,26 @@ Partial Class Compras_eFacturas
RegistraScript("$('#DvmodalPersonalizar').modal('show');")
End Sub
+
+ Protected Sub LnkRemoveSolicitud_Click(sender As Object, e As EventArgs)
+
+ Dim gvRow As GridViewRow = DirectCast((DirectCast(sender, LinkButton)).NamingContainer, GridViewRow)
+ Dim ProcesoOk As Boolean = False
+
+ Dim CveSolicitud = gvRow.DataKey("CveSolicitud").ToEntero
+ Dim Folio = gvRow.DataKey("Folio").ToEntero
+
+ Using nom As ClsNominas = New ClsNominas()
+ ProcesoOk = nom.SolicitudesCancelar(CveSolicitud, UsuarioActual.CveEmpresa, UsuarioActual.CveUsuario)
+ End Using
+
+ If ProcesoOk Then
+ Alert($"Solicitud {Folio} cancelada correctamente.")
+ cargasolicitudes()
+ End If
+
+
+ End Sub
End Class
@@ -5052,6 +5077,12 @@ Public Class GeneralesAPIeFacturas
Public Function VerificaSolicitudesNominas(CveEmpresa As Integer, CveTipoSolicitud As Integer, CveSolicitud As Integer) As Object
Return getData(Of Object)($"VerificaSolicitudesNominas/{CveEmpresa}/{CveTipoSolicitud}/{CveSolicitud}", Nothing, ADSNetLibraryzdE.HelpersE.ConexionesE.SIGAPIE.requestMethod.[GET], False)
End Function
+
+ Public Function CancelarSolicitud(CveEmpresa As Integer, CveSolicitud As Integer, CveUsuario As Integer) As Object
+ Return getData(Of Object)($"CancelarSolicitud/{CveEmpresa}/{CveSolicitud}/{CveUsuario}", Nothing, ADSNetLibraryzdE.HelpersE.ConexionesE.SIGAPIE.requestMethod.[GET], False)
+ End Function
+
+
End Class
diff --git a/Nomina/RepPersonalDIM.aspx b/Nomina/RepPersonalDIM.aspx
index 9260aaf08..4b82ca5f0 100644
--- a/Nomina/RepPersonalDIM.aspx
+++ b/Nomina/RepPersonalDIM.aspx
@@ -506,7 +506,7 @@
Impuesto
- correspondiente(mes)
+ correspondiente (mes)
@@ -574,7 +574,7 @@
- Gratificación anual (Gravado)
+ Gratificación anual (Gravado)
@@ -593,7 +593,7 @@
Viáticos y
gastos de
- viaje (Gravado)
+ viaje (Gravado)
@@ -603,7 +603,7 @@
Viáticos y
gastos de
- viaje (Exento)
+ viaje (Exento)
@@ -855,7 +855,7 @@
Seguro de
gastos médicos
- mayores (Gravado)
+ mayores (Gravado)
@@ -865,7 +865,7 @@
Seguro de
gastos médicos
- mayores (Exento)
+ mayores (Exento)
@@ -963,7 +963,7 @@
Ayuda para
artículos
- escolares (Exento)
+ escolares (Exento)
@@ -973,7 +973,7 @@
Dotación o
ayuda para
- anteojos (Gravado)
+ anteojos (Gravado)
@@ -983,7 +983,7 @@
Dotación o
ayuda para
- anteojos (Exento)
+ anteojos (Exento)
@@ -992,7 +992,7 @@
Ayuda para
- transporte (Gravado)
+ transporte (Gravado)
@@ -1001,7 +1001,7 @@
Ayuda par
- a transporte (Exento)
+ a transporte (Exento)
@@ -1010,7 +1010,7 @@
Cuotas sindicales
- pagadas patron(Gravado)
+ pagadas patron (Gravado)
@@ -1019,7 +1019,7 @@
Cuotas sindicales
- pagadas patron(Exento)
+ pagadas patron (Exento)
@@ -1028,7 +1028,7 @@
Subsidios por
- incapacidad (Gravado)
+ incapacidad (Gravado)
@@ -1037,7 +1037,7 @@
Subsidios por
- incapacidad (Exento)
+ incapacidad (Exento)
@@ -1350,6 +1350,11 @@
+
+
+
+
+
diff --git a/Nomina/RepPersonalDIM.aspx.vb b/Nomina/RepPersonalDIM.aspx.vb
index d264bf3ac..d697818ef 100644
--- a/Nomina/RepPersonalDIM.aspx.vb
+++ b/Nomina/RepPersonalDIM.aspx.vb
@@ -100,15 +100,53 @@ Partial Class Nomina_RepPersonalDIM
End Sub
Private Sub Imprimir(Optional reporte As String = "PDF")
+
+
+ Dim row As New GridViewRow(0, 0, DataControlRowType.Header, DataControlRowState.Normal)
+ Dim cell As New TableHeaderCell()
+ cell.Text = "ANEXO 1 INFORMACION DEL EMPLEADO ->"
+ cell.ColumnSpan = 28
+ cell.HorizontalAlign = HorizontalAlign.Left
+ row.Controls.Add(cell)
+
+ cell = New TableHeaderCell()
+ cell.ColumnSpan = 18
+ cell.Text = "ANEXO 1 PAGOS POR SEPARACION ->"
+ cell.HorizontalAlign = HorizontalAlign.Left
+ row.Controls.Add(cell)
+
+
+ cell = New TableHeaderCell()
+ cell.ColumnSpan = 2
+ cell.Text = " ANEXO 1 ASIM SAL-> "
+ cell.HorizontalAlign = HorizontalAlign.Left
+ row.Controls.Add(cell)
+
+
+ cell = New TableHeaderCell()
+ cell.ColumnSpan = 58
+ cell.Text = "ANEXO 1 PAGOS DEL PATRÓN EFECTUADOS A SUS TRABAJADORES ->"
+ cell.HorizontalAlign = HorizontalAlign.Left
+ row.Controls.Add(cell)
+
+ cell = New TableHeaderCell()
+ cell.ColumnSpan = 19
+ cell.Text = "ANEXO 1 IMPUESTO SOBRE LA RENTA (RESUMEN) ->"
+ cell.HorizontalAlign = HorizontalAlign.Left
+ row.Controls.Add(cell)
+
+ 'row.BackColor = ColorTranslator.FromHtml("#3AC0F2")
+ GvDatos.HeaderRow.Parent.Controls.AddAt(0, row)
+
ExportToExcelGembox(GvDatos, "RepPersonalDIM", UsuarioActual, "Reporte Personal DIM", "", DatosFiltros:=$"Ejercicio {DdlEjercicio.SelectedItem.Text}")
End Sub
Public Overrides Sub VerifyRenderingInServerForm(ByVal control As Control)
End Sub
Protected Sub LnkDescargaArchivo_Click(ByVal sender As Object, ByVal e As EventArgs) Handles LnkDescargaArchivo.Click
- Dim tabla As DataTable = Dt_Datos
- Dim contenidoBytes As Byte() = Encoding.UTF8.GetBytes(ConvertirTablaATexto(tabla))
+
+ Dim contenidoBytes As Byte() = Encoding.UTF8.GetBytes(ConvertirGVATexto())
Using memoryStream As New MemoryStream(contenidoBytes)
Response.Clear()
@@ -121,39 +159,27 @@ Partial Class Nomina_RepPersonalDIM
End Sub
- Public Function ConvertirTablaATexto(ByVal DT As DataTable) As String
-
- Dim DTDatos As DataTable = DT.Copy()
-
- Dim columnasARemover As New List(Of DataColumn)()
-
-
- For Each columna As DataColumn In DTDatos.Columns
- If columna.ColumnName.Contains("CvePersonal") Then
- columnasARemover.Add(columna)
- End If
- Next
-
-
- For Each columna As DataColumn In columnasARemover
- DTDatos.Columns.Remove(columna)
- Next
-
- DTDatos.AcceptChanges()
+ Public Function ConvertirGVATexto() As String
Dim sb As New StringBuilder
- For Each fila As DataRow In DTDatos.Rows
- For i As Integer = 0 To DTDatos.Columns.Count - 1
- sb.Append(fila(i).ToString())
- If i < DTDatos.Columns.Count - 1 Then
- sb.Append("|")
- End If
- Next
- sb.AppendLine()
+ Dim countRows As Integer = 1
+ For Each GvRow As GridViewRow In GvDatos.Rows
+
+ If Not countRows = 1 Then
+ For Each cell As TableCell In GvRow.Cells
+ For Each control As Control In cell.Controls
+ If TypeOf control Is Label Then
+ Dim label As Label = DirectCast(control, Label)
+ sb.Append($"{label.Text.Trim.Replace("True", "1").Replace("False", "0")}|")
+ End If
+ Next
+ Next
+ sb.AppendLine()
+ End If
+ countRows = countRows + 1
Next
-
- Return sb.tostring
+ Return sb.ToString
End Function
@@ -292,14 +318,46 @@ Partial Class Nomina_RepPersonalDIM
' TotalRowHeader += 2
+
+ 'worksheet.Rows(TotalRowHeader).Cells.GetSubrange("A8:AB9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(61, 74, 26), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+
+ 'worksheet.Rows(TotalRowHeader).Cells.GetSubrange("AC8:AT9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(216, 191, 216), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+
+ 'worksheet.Rows(TotalRowHeader).Cells.GetSubrange("AU8:AV9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(59, 131, 189), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+
+ 'worksheet.Rows(TotalRowHeader).Cells.GetSubrange("AW8:DB9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(216, 191, 216), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+
+ 'worksheet.Rows(TotalRowHeader).Cells.GetSubrange("DC8:DS9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 140, 64), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+
+
+ worksheet.Cells.GetSubrange("A8:AB9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(218, 247, 166), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+
+ worksheet.Cells.GetSubrange("AC8:AT9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(216, 191, 216), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+
+ worksheet.Cells.GetSubrange("AU8:AV9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(59, 131, 189), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+
+ worksheet.Cells.GetSubrange("AW8:DB9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(216, 191, 216), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+
+ worksheet.Cells.GetSubrange("DC8:DU9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 140, 64), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+
+ worksheet.Cells("DC8").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 140, 64), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+
For i = celdasConTexto.FirstColumnIndex To celdasConTexto.LastColumnIndex
worksheet.Rows(TotalRowHeader).Cells(i).Style.Font.Size = 12 * 20
- worksheet.Rows(TotalRowHeader).Cells(i).Style.HorizontalAlignment = GemBox.Spreadsheet.HorizontalAlignmentStyle.Center
- worksheet.Rows(TotalRowHeader).Cells(i).Style.VerticalAlignment = GemBox.Spreadsheet.VerticalAlignmentStyle.Center
+ worksheet.Rows(TotalRowHeader).Cells(i).Style.HorizontalAlignment = GemBox.Spreadsheet.HorizontalAlignmentStyle.Left
+ worksheet.Rows(TotalRowHeader).Cells(i).Style.VerticalAlignment = GemBox.Spreadsheet.VerticalAlignmentStyle.Bottom
- worksheet.Rows(TotalRowHeader).Cells(i).Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(75, 119, 190), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
- worksheet.Rows(TotalRowHeader).Cells(i).Style.Font.Color = GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255)
+ 'worksheet.Rows(TotalRowHeader).Cells(i).Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(75, 119, 190), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+ worksheet.Rows(TotalRowHeader).Cells(i).Style.Font.Color = GemBox.Spreadsheet.SpreadsheetColor.FromArgb(0, 0, 0)
+
+
+ worksheet.Rows(TotalRowHeader + 1).Cells(i).Style.Font.Size = 12 * 20
+ worksheet.Rows(TotalRowHeader + 1).Cells(i).Style.HorizontalAlignment = GemBox.Spreadsheet.HorizontalAlignmentStyle.Left
+ worksheet.Rows(TotalRowHeader + 1).Cells(i).Style.VerticalAlignment = GemBox.Spreadsheet.VerticalAlignmentStyle.Bottom
+
+ ' worksheet.Rows(TotalRowHeader + 1).Cells(i).Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(75, 119, 190), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255))
+ worksheet.Rows(TotalRowHeader + 1).Cells(i).Style.Font.Color = GemBox.Spreadsheet.SpreadsheetColor.FromArgb(0, 0, 0)
If i > 0 Then
Try
@@ -330,21 +388,18 @@ Partial Class Nomina_RepPersonalDIM
End If
+ worksheet.Columns(0).Width = 4000
+ worksheet.Columns(1).Width = 4000
+ worksheet.Columns(2).Width = 5500
+ worksheet.Columns(3).Width = 10000
+ worksheet.Columns(4).Width = 5000
+ worksheet.Columns(5).Width = 5000
+ worksheet.Columns(6).Width = 10000
+ worksheet.Columns(7).Width = 5000
+
For I = celdasConTexto.FirstColumnIndex To celdasConTexto.LastColumnIndex
-
- If I > 0 Then
-
- If 1 = 1 Then
- worksheet.Columns(I + 1).Style.NumberFormat = "#,##0.00"
- Else
- worksheet.Columns(I + 1).Style.NumberFormat = "#,##"
- End If
-
- Try
- worksheet.Columns(I).AutoFit(1)
- Catch ex As Exception
- End Try
-
+ If I > 7 Then
+ worksheet.Columns(I).Width = 4500
End If
Next