diff --git a/AC/Reportes/RepEstadoActividadesConta2.rdlc b/AC/Reportes/RepEstadoActividadesConta2.rdlc new file mode 100644 index 000000000..bd76638df --- /dev/null +++ b/AC/Reportes/RepEstadoActividadesConta2.rdlc @@ -0,0 +1,1836 @@ + + + 0 + + + + System.Data.DataSet + /* Local Connection */ + + 3560db3f-20af-4776-9f09-85925745c52f + + + + + + DataSet1 + /* Local Query */ + + + + Orden + System.String + + + Nombre + System.String + + + CustLName + System.String + + + ImporteActual + System.Int16 + + + ImporteAcumulado + System.Int16 + + + CtaMayor + System.Int16 + + + Tipo + System.String + + + Sup + System.String + + + PorcentajeActual + System.Decimal + + + PorcentajeAcumulado + System.Decimal + + + + DataSet1 + c:\users\caudillo\documents\visual studio 2013\Projects\WebApplication1\WebApplication1\DataSet1.xsd + ActivoCirculante + + + + + + + + DataSet1 + /* Local Query */ + + + + Orden + System.String + + + Nombre + System.String + + + CustLName + System.String + + + ImporteActual + System.Int16 + + + ImporteAcumulado + System.Int16 + + + CtaMayor + System.Int16 + + + Tipo + System.String + + + Sup + System.String + + + PorcentajeActual + System.Decimal + + + PorcentajeAcumulado + System.Decimal + + + + DataSet2 + c:\users\caudillo\documents\visual studio 2013\Projects\WebApplication1\WebApplication1\DataSet1.xsd + ActivoCirculante + + + + + + + + + + + + + + + 9.16707cm + + + 3.13952cm + + + 1.09771cm + + + 3.13952cm + + + 1.09771cm + + + + + 0.6cm + + + + + true + true + + + + + INGRESOS Y OTROS BENEFICIOS + + + + + + + Textbox7 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Período Actual + + + + + + + Textbox17 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + % + + + + + + + Textbox5 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Período Acumulado + + + + + + + Textbox18 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + % + + + + + + + Textbox5 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.45cm + + + + + true + + + + + =Fields!Nombre.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!ImporteActual.Value + + + + + + + ImporteActual + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!PorcentajeActual.Value + + + + + + + PorcentajeActual + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!ImporteAnterior.Value + + + + + + + ImporteAnterior + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!PorcentajeAcumulado.Value + + + + + + + PorcentajeAcumulado + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + TOTAL INGRESOS + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =MAX(IIF(Fields!CtaMayor.Value < 0, Fields!ImporteActual.Value, 0)) + + + + + + + ImporteActual1 + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox29 + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =MAX(IIF(Fields!CtaMayor.Value < 0, Fields!ImporteAnterior.Value, 0 )) + + + + + + + Textbox12 + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox20 + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + After + true + + + + + =(Fields!CtaMayor.Value="-1") + + + + Before + + + + DataSet1 + 0.74371cm + 1.99074cm + 1.65cm + 17.64153cm + + + + + + + + + 9.16707cm + + + 3.13952cm + + + 1.09771cm + + + 3.13952cm + + + 1.09771cm + + + + + 0.6cm + + + + + true + true + + + + + GASTOS Y OTRAS PÉRDIDAS + + + + + + + Textbox7 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Período Actual + + + + + + + Textbox15 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + % + + + + + + + Textbox5 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Período Acumulado + + + + + + + Textbox16 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + % + + + + + + + Textbox21 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.45cm + + + + + true + + + + + =Fields!Nombre.Value + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!ImporteActual.Value + + + + + + + ImporteActual + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!PorcentajeActual.Value + + + + + + + PorcentajeActual1 + + + + + + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =Fields!ImporteAnterior.Value + + + + + + + ImporteAnterior + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!PorcentajeAcumulado.Value + + + + + + + PorcentajeAcumulado1 + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + TOTAL GASTOS + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =MAX(IIF(Fields!CtaMayor.Value < 0, Fields!ImporteActual.Value, 0 )) + + + + + + + ImporteActual1 + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox30 + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =MAX(IIF(Fields!CtaMayor.Value < 0, Fields!ImporteAnterior.Value, 0)) + + + + + + + Textbox12 + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox23 + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + After + true + + + + + =(Fields!CtaMayor.Value="-1" AND (Fields!Orden.Value <>"600" AND Fields!Orden.Value <> "700" AND Fields!Orden.Value <> "790" )) + + + + Before + + + + DataSet2 + 3.15418cm + 1.99074cm + 1.65cm + 17.64153cm + 1 + + + + + + true + true + + + + + Resultados del ejercicio(Utilidad o pérdida): + + + + + + + Textbox54 + 5.28849cm + 1.99074cm + 0.49417cm + 9.16707cm + 2 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!lbTotalActual.Value + + + + + + + Textbox56 + 5.28849cm + 11.19309cm + 0.49417cm + 3.13952cm + 3 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!lbTotalAnterior.Value + + + + + + + Textbox58 + 5.28849cm + 15.39933cm + 0.49417cm + 3.13952cm + 4 + + + 2pt + 2pt + 2pt + 2pt + + + + 6.51495cm + + + + + + + Textbox8 + 0.06529cm + 16.80162cm + 0.81167cm + 3.13952cm + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Estado de Resultado + + + + =Parameters!periodo.Value + + + + + + + + + Centro de Costos: + + + + =Parameters!SubProyecto.Value + + + + + + + Textbox5 + 0.71396cm + 2.94324cm + 1.12049cm + 13.85838cm + 1 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!pEmp.Value + + + + + + + Textbox1 + 0.02577cm + 2.94324cm + 0.54709cm + 13.85838cm + 2 + + =(Globals.PageNumber>1) + + + + 2pt + 2pt + 2pt + 2pt + + + + External + = Parameters!pImg.Value + FitProportional + 0.06104cm + 1.5cm + 2.94324cm + 3 + + + + + + + + + + + 2.76063cm + true + true + + + true + true + + + + + =Parameters!pFirma1.Value + + + + Textbox2 + 0.49389cm + 10.80759cm + 0.9616cm + 8.02269cm + + = Iif((Globals.PageNumber=Globals.TotalPages) and (Parameters!pFirma2.Value <> ""),false,true) + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!pFirma2.Value + + + + Textbox2 + 0.49389cm + 1.24991cm + 0.99688cm + 8.02269cm + 1 + + = Iif((Globals.PageNumber=Globals.TotalPages) and (Parameters!pFirma2.Value <> ""),false,true) + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + ="Página " & Globals.PageNumber & " de " & Globals.TotalPages + + + + + + + Textbox3 + 1.92292cm + 0.62818cm + 0.6cm + 18.2021cm + 2 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 27.94cm + 21.59cm + 0.5cm + 0.5cm + 1cm + 0.5cm + 0.13cm + @@ -90,14 +94,22 @@ + +
+
+ " style="display: inline-block; margin-right: -20px; width: 150px;" /> + " style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"> +
+
+
- @@ -1350,6 +1362,11 @@ + + + + + diff --git a/Nomina/RepPersonalDIM.aspx.vb b/Nomina/RepPersonalDIM.aspx.vb index 16d37c606..fb2d75c48 100644 --- a/Nomina/RepPersonalDIM.aspx.vb +++ b/Nomina/RepPersonalDIM.aspx.vb @@ -8,10 +8,43 @@ Imports CrystalDecisions.CrystalReports.Engine Imports Extensiones Imports GemBox.Spreadsheet Imports Microsoft.Reporting.WebForms +Imports Stimulsoft.Report.Export Partial Class Nomina_RepPersonalDIM Inherits ClsPaginas + + ReadOnly Property color_green_dark As Drawing.Color + Get + Return System.Drawing.Color.FromArgb(77, 179, 162) + End Get + End Property + + ReadOnly Property color_purple_intense As Drawing.Color + Get + Return System.Drawing.Color.FromArgb(135, 117, 167) + End Get + End Property + + ReadOnly Property color_blue As Drawing.Color + Get + Return System.Drawing.Color.FromArgb(53, 152, 220) + End Get + End Property + + ReadOnly Property color_blue_madison As Drawing.Color + Get + Return System.Drawing.Color.FromArgb(87, 142, 190) + End Get + End Property + + ReadOnly Property color_yellow As Drawing.Color + Get + Return System.Drawing.Color.FromArgb(196, 159, 71) + End Get + End Property + + Public Property Dt_Datos As DataTable Get If ViewState("Dt_Datos") Is Nothing Then @@ -54,6 +87,8 @@ Partial Class Nomina_RepPersonalDIM End Sub + + Protected Sub BtnConsultar_Click(sender As Object, e As EventArgs) CargaDatos() End Sub @@ -99,20 +134,57 @@ Partial Class Nomina_RepPersonalDIM Imprimir("Excel") End Sub - Private Sub Imprimir(Optional reporte As String = "PDF") + Private Sub ColoresCabeceraGrid() + + + Dim countColumnas As Integer = 0 + For Each gvColumn As DataControlField In GvDatos.Columns + + If countColumnas <= 27 Then + GvDatos.Columns(countColumnas).HeaderStyle.BackColor = color_green_dark + End If + + If countColumnas > 27 And countColumnas <= 45 Then + GvDatos.Columns(countColumnas).HeaderStyle.BackColor = color_purple_intense + End If + + If countColumnas > 45 And countColumnas <= 47 Then + GvDatos.Columns(countColumnas).HeaderStyle.BackColor = color_blue + End If + + If countColumnas > 47 And countColumnas <= 105 Then + GvDatos.Columns(countColumnas).HeaderStyle.BackColor = color_blue_madison + End If + + If countColumnas > 105 And countColumnas <= 124 Then + GvDatos.Columns(countColumnas).HeaderStyle.BackColor = color_yellow + End If + countColumnas = countColumnas + 1 + Next + + End Sub + + Private Sub Imprimir(Optional reporte As String = "PDF") + ColoresCabeceraGrid() + 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 + 'cell.BackColor = Drawing.Color.FromArgb(77, 179, 162) + cell.BackColor = color_green_dark row.Controls.Add(cell) + + cell = New TableHeaderCell() cell.ColumnSpan = 18 cell.Text = "ANEXO 1 PAGOS POR SEPARACION ->" cell.HorizontalAlign = HorizontalAlign.Left + cell.BackColor = color_purple_intense row.Controls.Add(cell) @@ -120,6 +192,7 @@ Partial Class Nomina_RepPersonalDIM cell.ColumnSpan = 2 cell.Text = " ANEXO 1 ASIM SAL-> " cell.HorizontalAlign = HorizontalAlign.Left + cell.BackColor = color_blue row.Controls.Add(cell) @@ -127,26 +200,30 @@ Partial Class Nomina_RepPersonalDIM cell.ColumnSpan = 58 cell.Text = "ANEXO 1 PAGOS DEL PATRÓN EFECTUADOS A SUS TRABAJADORES ->" cell.HorizontalAlign = HorizontalAlign.Left + cell.BackColor = color_blue_madison row.Controls.Add(cell) cell = New TableHeaderCell() cell.ColumnSpan = 19 cell.Text = "ANEXO 1 IMPUESTO SOBRE LA RENTA (RESUMEN) ->" cell.HorizontalAlign = HorizontalAlign.Left + cell.BackColor = color_yellow 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() @@ -159,39 +236,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 @@ -199,11 +264,16 @@ Partial Class Nomina_RepPersonalDIM Protected Sub GvDatos_DataBound(sender As Object, e As EventArgs) + + ColoresCabeceraGrid() + 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 + 'cell.BackColor = Drawing.Color.FromArgb(77, 179, 162) + cell.BackColor = color_green_dark row.Controls.Add(cell) @@ -212,6 +282,7 @@ Partial Class Nomina_RepPersonalDIM cell.ColumnSpan = 18 cell.Text = "ANEXO 1 PAGOS POR SEPARACION ->" cell.HorizontalAlign = HorizontalAlign.Left + cell.BackColor = color_purple_intense row.Controls.Add(cell) @@ -219,6 +290,7 @@ Partial Class Nomina_RepPersonalDIM cell.ColumnSpan = 2 cell.Text = " ANEXO 1 ASIM SAL-> " cell.HorizontalAlign = HorizontalAlign.Left + cell.BackColor = color_blue row.Controls.Add(cell) @@ -226,17 +298,19 @@ Partial Class Nomina_RepPersonalDIM cell.ColumnSpan = 58 cell.Text = "ANEXO 1 PAGOS DEL PATRÓN EFECTUADOS A SUS TRABAJADORES ->" cell.HorizontalAlign = HorizontalAlign.Left + cell.BackColor = color_blue_madison row.Controls.Add(cell) cell = New TableHeaderCell() cell.ColumnSpan = 19 cell.Text = "ANEXO 1 IMPUESTO SOBRE LA RENTA (RESUMEN) ->" cell.HorizontalAlign = HorizontalAlign.Left + cell.BackColor = color_yellow row.Controls.Add(cell) - 'row.BackColor = ColorTranslator.FromHtml("#3AC0F2") GvDatos.HeaderRow.Parent.Controls.AddAt(0, row) + End Sub @@ -330,22 +404,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(77, 179, 162), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255)) + + worksheet.Cells.GetSubrange("AC8:AT9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(135, 117, 167), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255)) + + worksheet.Cells.GetSubrange("AU8:AV9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(53, 152, 220), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255)) + + worksheet.Cells.GetSubrange("AW8:DB9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(87, 142, 190), GemBox.Spreadsheet.SpreadsheetColor.FromArgb(255, 255, 255)) + + worksheet.Cells.GetSubrange("DC8:DU9").Style.FillPattern.SetPattern(GemBox.Spreadsheet.FillPatternStyle.Solid, GemBox.Spreadsheet.SpreadsheetColor.FromArgb(196, 159, 71), 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.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(255, 255, 255) + ' 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 @@ -486,3 +584,5 @@ Partial Class Nomina_RepPersonalDIM End Sub End Class +Friend Class GridViewColumn +End Class diff --git a/RH/CalculoSBC.aspx b/RH/CalculoSBC.aspx index f7d0b2a38..d2e7a10bf 100644 --- a/RH/CalculoSBC.aspx +++ b/RH/CalculoSBC.aspx @@ -116,7 +116,8 @@ + DataKeyNames="CvePersonal,Codigo,Nombre,FechaInicio,Antiguedad,Incapacitado,NumeroSS,CveTipodeSalario,TipodeSalario,SalarioDiario,SDINuevo,SalarioVariableNuevo,SalarioDiarioSSNuevo,SDI,SalarioVariable,SalarioDiarioSS,PorPrimaVacacional,NumDiasAguinaldo,Acumulado,diasBimestre,Faltas,Incapaciadad,diaslaborados,Movtotxt,RegistroPatronal" + OnRowDataBound="GVCalculosSBC_RowDataBound"> @@ -242,16 +243,17 @@ Modificación - + + <%-- --%> - - + <%-- + --%> - + <%----%> diff --git a/RH/CalculoSBC.aspx.cs b/RH/CalculoSBC.aspx.cs index 7fbdf7cf9..52de72552 100644 --- a/RH/CalculoSBC.aspx.cs +++ b/RH/CalculoSBC.aspx.cs @@ -662,7 +662,7 @@ public partial class RH_CalculoSBC : ClsPaginas concater = ""; contador = 0; } - if (SalarioDiarioSSNuevo != SalarioDiarioSS || item.FCCheckBox("chkCon").Checked) + if (item.FCCheckBox("chkUpdate").Checked)//(SalarioDiarioSSNuevo != SalarioDiarioSS || item.FCCheckBox("chkCon").Checked) { MovtosmodSalario = string.Format("{0}{1}{2}", MovtosmodSalario, concater, item.DataKey("Movtotxt")); concater = "\\r\\n"; @@ -745,7 +745,7 @@ public partial class RH_CalculoSBC : ClsPaginas double SalarioDiarioSSNuevo = Math.Round(item.DataKey("SalarioDiarioSSNuevo").ToDouble(), 2); double SalarioVariableNuevo = item.DataKey("SalarioVariableNuevo").ToDouble(); double SalarioDiarioSS = Math.Round(item.DataKey("SalarioDiarioSS").ToDouble(), 2); - if (continuar && SalarioDiarioSSNuevo != SalarioDiarioSS && + if (continuar && (item.FCCheckBox("chkUpdate").Checked) &&//SalarioDiarioSSNuevo != SalarioDiarioSS && (continuar = objrh.UpdateSalarios(CvePersonal, fecha, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, SalarioDiario, SDINuevo, SalarioDiarioSSNuevo, SalarioDiario))) { @@ -932,6 +932,19 @@ public partial class RH_CalculoSBC : ClsPaginas } } + + protected void GVCalculosSBC_RowDataBound(object sender, GridViewRowEventArgs e) + { + + //Eval("SalarioDiarioSSNuevo", "{0:N2}") == Eval("SalarioDiarioSS", "{0:N2}") + + if (e.Row.RowType == DataControlRowType.DataRow) + { + e.Row.FCCheckBox("chkUpdate").Checked = !(string.Format("{0:N2}", e.Row.DBCampo("SalarioDiarioSSNuevo")) == string.Format("{0:N2}", e.Row.DBCampo("SalarioDiarioSS"))); + e.Row.FCLabel("lblsalarioDiarioSSf").Text = e.Row.FCCheckBox("chkUpdate").Checked ? "Si" : "No"; + } + + } } public class archivosD { diff --git a/RH/CatPersonal.aspx b/RH/CatPersonal.aspx index dda232f49..6b54a2926 100644 --- a/RH/CatPersonal.aspx +++ b/RH/CatPersonal.aspx @@ -1054,7 +1054,7 @@ Proyecto: - +
diff --git a/SAT/SolicitudesRecibidasSAT.aspx b/SAT/SolicitudesRecibidasSAT.aspx index 8f9aaaf2b..27e0c501d 100644 --- a/SAT/SolicitudesRecibidasSAT.aspx +++ b/SAT/SolicitudesRecibidasSAT.aspx @@ -292,13 +292,13 @@
-
-
+
@@ -308,19 +308,60 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/SAT/SolicitudesRecibidasSAT.aspx.vb b/SAT/SolicitudesRecibidasSAT.aspx.vb index 8c8e6834b..ed74f3fba 100644 --- a/SAT/SolicitudesRecibidasSAT.aspx.vb +++ b/SAT/SolicitudesRecibidasSAT.aspx.vb @@ -83,7 +83,46 @@ Partial Class SAT_SolicitudesRecibidasSAT If e.Row.DataKey("Fecha") = "" Then e.Row.Attributes.Add("class", "Totales") End If + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(2).Visible = False + End If + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(7).Visible = False + End If End If + + If e.Row.RowType = DataControlRowType.Header Then + e.Row.Cells(1).BackColor = System.Drawing.Color.FromName("#3598dc") + e.Row.Cells(2).BackColor = System.Drawing.Color.FromName("#3598dc") + e.Row.Cells(3).BackColor = System.Drawing.Color.FromName("#3598dc") + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(2).Visible = False + End If + e.Row.Cells(4).BackColor = System.Drawing.Color.FromName("#3598dc") + e.Row.Cells(5).BackColor = System.Drawing.Color.FromName("#3598dc") + + e.Row.Cells(6).BackColor = System.Drawing.Color.FromName("#C46B06") + e.Row.Cells(7).BackColor = System.Drawing.Color.FromName("#C46B06") + e.Row.Cells(8).BackColor = System.Drawing.Color.FromName("#C46B06") + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(7).Visible = False + End If + e.Row.Cells(9).BackColor = System.Drawing.Color.FromName("#C46B06") + e.Row.Cells(10).BackColor = System.Drawing.Color.FromName("#C46B06") + + + e.Row.Cells(1).ForeColor = System.Drawing.Color.FromName("white") + e.Row.Cells(2).ForeColor = System.Drawing.Color.FromName("white") + e.Row.Cells(3).ForeColor = System.Drawing.Color.FromName("white") + e.Row.Cells(4).ForeColor = System.Drawing.Color.FromName("white") + e.Row.Cells(5).ForeColor = System.Drawing.Color.FromName("white") + e.Row.Cells(6).ForeColor = System.Drawing.Color.FromName("white") + e.Row.Cells(7).ForeColor = System.Drawing.Color.FromName("white") + e.Row.Cells(8).ForeColor = System.Drawing.Color.FromName("white") + e.Row.Cells(9).ForeColor = System.Drawing.Color.FromName("white") + e.Row.Cells(10).ForeColor = System.Drawing.Color.FromName("white") + End If + End Sub Protected Sub GvDatos_RowDataBound(ByVal sender As Object, ByVal e As GridViewRowEventArgs) If e.Row.RowType = DataControlRowType.DataRow Then @@ -139,6 +178,14 @@ Partial Class SAT_SolicitudesRecibidasSAT LnkCFDIData.PostBackUrl = "#" End If End If + + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(7).Visible = False + End If + + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(14).Visible = False + End If End If If e.Row.RowType = DataControlRowType.Header Then @@ -148,6 +195,9 @@ Partial Class SAT_SolicitudesRecibidasSAT e.Row.Cells(4).BackColor = System.Drawing.Color.FromName("#3598dc") e.Row.Cells(5).BackColor = System.Drawing.Color.FromName("#3598dc") e.Row.Cells(6).BackColor = System.Drawing.Color.FromName("#3598dc") + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(7).Visible = false + End If e.Row.Cells(7).BackColor = System.Drawing.Color.FromName("#3598dc") e.Row.Cells(8).BackColor = System.Drawing.Color.FromName("#3598dc") e.Row.Cells(9).BackColor = System.Drawing.Color.FromName("#3598dc") @@ -155,6 +205,9 @@ Partial Class SAT_SolicitudesRecibidasSAT e.Row.Cells(11).BackColor = System.Drawing.Color.FromName("#C46B06") e.Row.Cells(12).BackColor = System.Drawing.Color.FromName("#C46B06") e.Row.Cells(13).BackColor = System.Drawing.Color.FromName("#C46B06") + If UsuarioActual.Empresa.Funcionalidad(713) <> "1" Then + e.Row.Cells(14).Visible = False + End If e.Row.Cells(14).BackColor = System.Drawing.Color.FromName("#C46B06") e.Row.Cells(15).BackColor = System.Drawing.Color.FromName("#C46B06") e.Row.Cells(16).BackColor = System.Drawing.Color.FromName("#C46B06") @@ -206,6 +259,7 @@ Partial Class SAT_SolicitudesRecibidasSAT GvResumen.DataSource = ObjCompras.DtResultados TipoDescarga = If(ObjCompras.DtResultados.Rows.Count > 0, 1, 0) LnkDownloadExcel.Visible = True + ElseIf DdlReporte.SelectedValue.ToEntero() = 2 Then GvDatos.DataSource = ObjCompras.DtResultados TipoDescarga = If(ObjCompras.DtResultados.Rows.Count > 0, 2, 0) diff --git a/Ventas/Clientes.aspx.vb b/Ventas/Clientes.aspx.vb index 0b80dafe3..4b979fb0a 100644 --- a/Ventas/Clientes.aspx.vb +++ b/Ventas/Clientes.aspx.vb @@ -2332,7 +2332,7 @@ Partial Class Clientes ' Else ' Alert("No se pudo adjuntar el correo electrónico.", TipoMensaje.MsgError) ' End If - ElseIf HdnTipoDocto.Value = "Cot" Then + ElseIf HdnTipoDocto.Value.Contiene("Cot", "Rem") Then If File.Exists($"{Ruta}PDF\{HdnTipoDocto.Value}\{HdnFolioVenta.Value}.pdf") Then Dim PDF As String = $"{Ruta}PDF\{HdnTipoDocto.Value}\{HdnFolioVenta.Value}.pdf" diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index dfed40166..575f4b57f 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -15450,9 +15450,10 @@ Partial Class Ventas ' Dim DtTest = ObjConta.DtResultados 'End If End If + Else + ErrorPrepoliza = True End If - Return ErrorPrepoliza Catch ex As Exception GuardaLog("GuardaPreP." & ex.ToString()) @@ -15675,7 +15676,7 @@ Partial Class Ventas If DebeGenerarMovimiento Then Dim CveAlmacenSalida As Integer = ddlAlmacen.SelectedValue.ToEntero() - Dim CveAlmacenExA As Integer = GlobalDTAlmacen(UsuarioActual.CveEmpresa, CveTipoAlmacen:=10).FiltroPrimeroValor("CveAlmacen", $"CveSubProyecto={DdlSubProyecto.SelectedValue}").ToEntero() + Dim CveAlmacenExA As Integer = GlobalDTAlmacen(UsuarioActual.CveEmpresa, CveTipoAlmacen:=10).FiltroPrimeroValor("CveAlmacen", $"CveSubProyecto={DdlSubProyectoDatos.SelectedValue}").ToEntero() Dim CveRemision As Integer = factura.CveVenta Dim CveMoneda As Integer = DdlMoneda.SelectedValue.ToEntero()