Merge branch 'master' of http://192.168.10.111:8383/SIG

App_Code/ClsNominas.vb

@@ -3571,6 +3571,22 @@ Public Class ClsNominas
         retorno = RunQuery("Ocurrió un error al eliminar las Solicitudes de nómina.")
         Return retorno
     End Function
+
+
+    Public Function SolicitudesCancelar(CveSolicitud As Integer, CveEmpresa As Integer, CveUsuario As Integer) As Boolean
+        Dim retorno As Boolean = False
+        DataAdapter("PA_Gral_SAT_SolicitudesCancelar", CommandType.StoredProcedure)
+        addParameters("@CveSolicitud", SqlDbType.Int, CveSolicitud)
+        addParameters("@CveEmpresa", SqlDbType.Int, CveEmpresa)
+        addParameters("@CveUsuario", SqlDbType.Int, CveUsuario)
+
+        retorno = RunQuery("Ocurrió un error al cancelar la Solicitude.")
+
+        Return retorno
+    End Function
+
+
+
 #End Region
 #End Region
 

Compras/eFacturas.aspx

@@ -1107,6 +1107,19 @@
                                                             <asp:Label runat="server" Text='<%# Eval("UsuarioIng")%>'></asp:Label>
                                                         </ItemTemplate>
                                                     </asp:TemplateField>
+
+                                                    <asp:TemplateField HeaderText="" Visible="false">
+                                                        <ItemTemplate>
+                                                            <asp:LinkButton ID="LnkRemoveSolicitud" runat="server" OnClick="LnkRemoveSolicitud_Click" CssClass="btn btn-circle btn-sm red" Text="<i class='fa fa-minus'></i>" 
+                                                                data-toggle="confirmation" data-popout="true" data-original-title="¿Está seguro que desea cancelar la solicitud?" data-btn-ok-label="si" />
+                                                        </ItemTemplate>
+                                                    </asp:TemplateField>
+
+                                                    
+ 
+
+
+
                                                 </Columns>
                                             </asp:GridView>
                                         </div>

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
 
 

Contabilidad2/RepEstadoActividades.aspx

@@ -12,7 +12,7 @@
 <asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server">
 
     <li>
-        <asp:LinkButton ID="ImgExcel" runat="server"><i class="fa fa-ad-excel"></i> Exporta Excel</asp:LinkButton>
+        <asp:LinkButton ID="ImgExcel" runat="server"><i class="fa fa-file-excel-o"></i> Exporta Excel</asp:LinkButton>
     </li>
     <li>
         <asp:LinkButton ID="Imprimir" runat="server"><i class="fa fa-print"></i> Imprimir</asp:LinkButton>
@@ -66,7 +66,25 @@
                                 </asp:DropDownList>
                             </div>
 
-                            <label class="col-md-1"  runat="server" id="DVConsolidado1" visible="false">Consolidado: </label>
+                         
+
+                            <label class="col-md-1" runat="server" >Ver con Sub Totales: </label>
+                            <div class="col-md-1" >
+                                  <asp:DropDownList ID="DdlVerConSubTotales" runat="server"  CssClass="select2me"  >
+                                        <asp:ListItem Text="Si" Value="1" ></asp:ListItem>
+                                        <asp:ListItem Text="No" Value="0" Selected="True"></asp:ListItem>                                        
+                                    </asp:DropDownList>
+                            </div>
+                            
+
+
+                            
+                        </div>
+                    </div>
+                    <div class="portlet-body" style="display: none">
+                        <div class="row">
+
+                               <label class="col-md-1"  runat="server" id="DVConsolidado1" visible="false">Consolidado: </label>
                              <div class="col-md-1" runat="server" id="DVConsolidado2" visible="false">
                                 <asp:DropDownList ID="DdlOpcion" runat="server" CssClass="select2me"   Width="100%">
                                     <asp:ListItem Selected="True" Value ="1">Normal</asp:ListItem>
@@ -74,7 +92,6 @@
                                 </asp:DropDownList>
                             </div>
 
-
                              <label class="col-md-1" runat="server" id="DivTipo1" visible="false" >Tipo: </label>
                              <div class="col-md-1" runat="server" id="DivTipo2" visible="false"  >
                                   <asp:DropDownList ID="DdlTipoReporte" runat="server" Width="150px">
@@ -84,10 +101,9 @@
                                     </asp:DropDownList>
                             </div>
 
-
-                            
                         </div>
                     </div>
+
                 </div>
             </div>
         </ContentTemplate>
@@ -96,17 +112,18 @@
     <br />
     <br />
 
-    <table style="width: 100%;" class="table table-striped table-advance table-hover">
+    <table style="width: 100%;" class="">
         <tr>
             <td width="100%" padding="0">
                 <asp:UpdatePanel ID="UpDatos" UpdateMode="Conditional" runat="server">
                     <ContentTemplate>
-                        <asp:GridView ID="GvIngresos" runat="server" AutoGenerateColumns="False" DataKeyNames="" OnRowDataBound="GvIngresos_RowDataBound" ShowHeaderWhenEmpty="true" CssClass="table table-striped table-hover Widthall" Style="margin-top: -10px; text-align: center;" GridLines="None">
+                        <asp:GridView ID="GvIngresos" runat="server" AutoGenerateColumns="False" DataKeyNames="" OnRowDataBound="GvIngresos_RowDataBound" ShowHeaderWhenEmpty="true"
+                            CssClass=" Widthall" Style="margin-top: -10px; text-align: center;" GridLines="None">
                             <Columns>
                                 <asp:TemplateField>
                                     <ItemTemplate>
                                         <asp:Label ID="LbNombre" runat="server" Text='<%# Eval("Nombre")%>'></asp:Label>
-                                    </ItemTemplate>
+                                    </ItemTemplate> 
                                     <ItemStyle HorizontalAlign="Left" />
                                     <HeaderTemplate>
                                         <asp:Label ID="LbTitulo" runat="server" Style="padding-left: 20px;" Font-Size="14px" Text="INGRESOS Y OTROS BENEFICIOS"></asp:Label>
@@ -136,7 +153,8 @@
                         </asp:GridView>
                         <br />
                         <br />
-                        <asp:GridView ID="GvGastos" runat="server" AutoGenerateColumns="False" DataKeyNames="" OnRowDataBound="GvGastos_RowDataBound" ShowHeaderWhenEmpty="true" CssClass="table table-striped table-hover Widthall" Style="margin-top: -10px; text-align: center;" GridLines="None">
+                        <asp:GridView ID="GvGastos" runat="server" AutoGenerateColumns="False" DataKeyNames="" OnRowDataBound="GvGastos_RowDataBound" ShowHeaderWhenEmpty="true" 
+                            CssClass=" Widthall" Style="margin-top: -10px; text-align: center;" GridLines="None">
                             <Columns>
                                 <asp:TemplateField>
                                     <ItemTemplate>
@@ -177,7 +195,7 @@
 
     <asp:UpdatePanel ID="UPPTotal" runat="server">
         <ContentTemplate>
-            <table class="table table-striped table-hover Widthall">
+            <table class="table table-striped   Widthall">
                 <tr>
                     <td align="center">
                         <h4>Resultados del Ejercicio:</h4>

Contabilidad2/RepEstadoActividades.aspx.vb

@@ -215,6 +215,104 @@ Partial Class AC_RepEstadoActividades
             DtGastos.Rows.Add(Row)
         End If
 
+        DtGastos.AcceptChanges()
+
+
+        If DdlVerConSubTotales.SelectedValue.ToEntero = 1 Then
+
+            Dim idxUtilidadBruta As Integer = 0
+            Dim idxUtilidadOperacion As Integer = 0
+            Dim idxUtilidadAntesImpuestos As Integer = 0
+
+            Dim IndexActual As Integer = 0
+            For Each dRow As DataRow In DtGastos.Rows
+
+                If dRow("Codigo").ToString.Contains("6000000") Then 'Utilidad Bruta indice que se tomara
+                    idxUtilidadBruta = IndexActual
+                    IndexActual = IndexActual + 2 'Son mas dos por que se esta conciderando el row en blanco
+                End If
+
+                If dRow("Codigo").ToString.Contains("7000000") Then 'Utilidad de Operación
+                    idxUtilidadOperacion = IndexActual
+                    IndexActual = IndexActual + 2 'Son mas dos por que se esta conciderando el row en blanco
+                End If
+
+                If dRow("Nombre").ToString.Contains("TOTAL GASTOS") Then 'Utilidad antes de impuestos
+                    idxUtilidadAntesImpuestos = IndexActual
+                End If
+
+                IndexActual = IndexActual + 1
+            Next
+
+            DtGastos.AcceptChanges()
+
+            'DtIngresos
+
+            Dim UtilidadBrutaActual, UtilidadBrutaAcumulada As Decimal
+            Dim UtilidadOperacionActual, UtilidadOperacionAcumulada As Decimal
+            Dim UtilidadAntesImpuestosActual, UtilidadAntesImpuestosAcumulada As Decimal
+
+            UtilidadBrutaActual = DtIngresos.SUMD("ImporteActual", "  CtaMayor  = 1 ") - DtGastos.SUMD("ImporteActual", " Codigo LIKE '5%' AND CtaMayor  = 1 ")
+            UtilidadBrutaAcumulada = DtIngresos.SUMD("ImporteAcumulado", " CtaMayor  = 1 ") - DtGastos.SUMD("ImporteAcumulado", " Codigo LIKE '5%' AND CtaMayor  = 1")
+
+            UtilidadOperacionActual = DtIngresos.SUMD("ImporteActual", " CtaMayor  = 1 ") - DtGastos.SUMD("ImporteActual", " Codigo LIKE '5%' AND CtaMayor  = 1 ") - DtGastos.SUMD("ImporteActual", " Codigo LIKE '6%' AND CtaMayor  = 1 ")
+            UtilidadOperacionAcumulada = DtIngresos.SUMD("ImporteAcumulado", " CtaMayor  = 1 ") - DtGastos.SUMD("ImporteAcumulado", " Codigo LIKE '5%' AND CtaMayor  = 1 ") - DtGastos.SUMD("ImporteAcumulado", " Codigo LIKE '6%' AND CtaMayor  = 1 ")
+
+            UtilidadAntesImpuestosActual = DtIngresos.SUMD("ImporteActual", " CtaMayor  = 1 ") - DtGastos.SUMD("ImporteActual", " Codigo LIKE '5%' AND CtaMayor  = 1 ") - DtGastos.SUMD("ImporteActual", " Codigo LIKE '6%' AND CtaMayor  = 1 ") - DtGastos.SUMD("ImporteActual", " Codigo LIKE '7%' AND CtaMayor  = 1 ")
+            UtilidadAntesImpuestosAcumulada = DtIngresos.SUMD("ImporteAcumulado", " CtaMayor  = 1 ") - DtGastos.SUMD("ImporteAcumulado", " Codigo LIKE '5%' AND CtaMayor  = 1 ") - DtGastos.SUMD("ImporteAcumulado", " Codigo LIKE '6%' AND CtaMayor  = 1 ") - DtGastos.SUMD("ImporteAcumulado", " Codigo LIKE '7%' AND CtaMayor  = 1 ")
+
+            Dim dRowUtilidadBruta As DataRow = DtGastos.NewRow
+            Dim dRowUtilidadBrutaVacio As DataRow = DtGastos.NewRow
+
+            Dim dRowUtilidadOperacion As DataRow = DtGastos.NewRow
+            Dim dRowUtilidadOperacionVacio As DataRow = DtGastos.NewRow
+
+            Dim dRowUtilidadAntesImpuestos As DataRow = DtGastos.NewRow
+            Dim dRowUtilidadAntesImpuestosVacio As DataRow = DtGastos.NewRow
+
+
+
+            dRowUtilidadBruta("Nombre") = "Utilidad Bruta"
+            dRowUtilidadBruta("ImporteActual") = UtilidadBrutaActual
+            dRowUtilidadBruta("ImporteAcumulado") = UtilidadBrutaAcumulada
+            dRowUtilidadBruta("CtaMayor") = -1
+            dRowUtilidadBruta("Orden") = "600"
+            dRowUtilidadBrutaVacio("CtaMayor") = -1
+            dRowUtilidadBrutaVacio("Orden") = "600"
+
+            dRowUtilidadOperacion("Nombre") = "Utilidad de Operación"
+            dRowUtilidadOperacion("ImporteActual") = UtilidadOperacionActual
+            dRowUtilidadOperacion("ImporteAcumulado") = UtilidadOperacionAcumulada
+            dRowUtilidadOperacion("CtaMayor") = -1
+            dRowUtilidadOperacion("Orden") = "700"
+            dRowUtilidadOperacionVacio("CtaMayor") = -1
+            dRowUtilidadOperacionVacio("Orden") = "700"
+
+            dRowUtilidadAntesImpuestos("Nombre") = "Utilidad antes de impuestos"
+            dRowUtilidadAntesImpuestos("ImporteActual") = UtilidadAntesImpuestosActual
+            dRowUtilidadAntesImpuestos("ImporteAcumulado") = UtilidadAntesImpuestosAcumulada
+            dRowUtilidadAntesImpuestos("CtaMayor") = -1
+            dRowUtilidadAntesImpuestos("Orden") = "790"
+            dRowUtilidadAntesImpuestosVacio("CtaMayor") = -1
+            dRowUtilidadAntesImpuestosVacio("Orden") = "790"
+
+
+            DtGastos.Rows.InsertAt(dRowUtilidadBruta, idxUtilidadBruta)
+            DtGastos.Rows.InsertAt(dRowUtilidadBrutaVacio, idxUtilidadBruta + 1)
+
+            DtGastos.Rows.InsertAt(dRowUtilidadOperacion, idxUtilidadOperacion)
+            DtGastos.Rows.InsertAt(dRowUtilidadOperacionVacio, idxUtilidadOperacion + 1)
+
+
+            DtGastos.Rows.InsertAt(dRowUtilidadAntesImpuestos, idxUtilidadAntesImpuestos)
+            DtGastos.Rows.InsertAt(dRowUtilidadAntesImpuestosVacio, idxUtilidadAntesImpuestos + 1)
+
+            'ImporteActual
+            'ImporteAcumulado
+
+            DtGastos.AcceptChanges()
+        End If
+
 
         GvIngresos.DataSource = DtIngresos
         GvIngresos.DataBind()
@@ -278,6 +376,11 @@ Partial Class AC_RepEstadoActividades
             If e.Row.DBCampo("ImporteAcumulado").ToString.ToDouble < 0 Then
                 e.Row.FCHyperLink("HLAnterior").ForeColor = Drawing.Color.Red
             End If
+
+            If e.Row.DBCampo("CtaMayor").ToEntero = -1 And e.Row.DBCampo("Nombre").ToString.Length > 0 Then
+                e.Row.Attributes.Add("style", "border-top: thick solid; border-top-width: thin; border-top-color: #000;")
+            End If
+
         End If
     End Sub
 
@@ -305,6 +408,12 @@ Partial Class AC_RepEstadoActividades
             If e.Row.DBCampo("ImporteAcumulado").ToString.ToDouble < 0 Then
                 e.Row.FCHyperLink("HLAnterior").ForeColor = Drawing.Color.Red
             End If
+
+
+            If e.Row.DBCampo("CtaMayor").ToEntero = -1 And e.Row.DBCampo("Nombre").ToString.Length > 0 Then
+                e.Row.Attributes.Add("style", "border-top: thick solid; border-top-width: thin; border-top-color: #000;")
+            End If
+
         End If
     End Sub
 
@@ -337,12 +446,10 @@ Partial Class AC_RepEstadoActividades
         params.Add(New ReportParameter("pFirma2", ""))
         params.Add(New ReportParameter("periodo", String.Format("de {0} {1}", DdlPeriodo.SelectedItem.Text, DdlEjercicio.SelectedItem.Text)))
         params.Add(New ReportParameter("SubProyecto", DdlSubproyecto.SelectedItem.Text))
-
+        ImprimirPDF("AC/Reportes/RepEstadoActividadesConta2.rdlc", lrds, params, "EstadoActividades", Formato)
-        ImprimirPDF("AC/Reportes/RepEstadoActividades.rdlc", lrds, params, "EstadoActividades", Formato)
-
-
         ' UsuarioActual.Empresa.GrupoEmpresa
 
     End Sub
 
 End Class
+

LogIn.aspx.vb

@@ -275,7 +275,7 @@ Partial Class LogIn
                     If Not IsNothing(Request("port")) Then
                         puerto = String.Format(":{0}", Request("port"))
                     Else
-                        puerto = String.Format(":{0}", If(System.Configuration.ConfigurationManager.AppSettings("EsProduccion").ToString() = "1", 84, 4200))
+                        puerto = String.Format(":{0}", 84)
                     End If
                     Dim strdomain = Request.Url.AbsoluteUri.Replace(Request.Url.PathAndQuery, "")
                     If Request.Url.Port <> 80 Then

Nomina/RepPersonalDIM.aspx

@@ -28,7 +28,11 @@
 
       th{
           text-align:left!important;
+          border-top-style:none!important;
       }
+
+    
+
     </style>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="HB" runat="Server">
@@ -90,14 +94,22 @@
         </ContentTemplate>
     </asp:UpdatePanel>
 
+
+       <div class="row">
+                <div class="Widthall" style="text-align: right!important; margin-top: 20px!important; margin-bottom: 2px!important">
+                    <input type="text" id="TxtBusqueda" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvDatos.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
+                    <a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvDatos.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
+                </div>
+            </div>
+
    
     <div class="row">
         <div class="col-md-12">
 
             <asp:UpdatePanel runat="server" ID="UpGvCargaDatos" UpdateMode="Conditional">
                 <ContentTemplate>
-                    <asp:GridView ID="GvDatos" runat="server" AutoGenerateColumns="false" DataKeyNames="" ShowHeaderWhenEmpty="true"  OnDataBound="GvDatos_DataBound"
+                    <asp:GridView ID="GvDatos" runat="server" AutoGenerateColumns="false" DataKeyNames="" ShowHeaderWhenEmpty="true"  OnDataBound="GvDatos_DataBound"   data-freezerows="2"
-                        CssClass="table table-striped table-advance table-hover ScrollAD mysmallbtn" 
+                        CssClass="table    table-hover ScrollAD mysmallbtn" 
                         Style="margin-top: -10px; text-align: center;" GridLines="None">
                         <Columns>
 
@@ -1350,6 +1362,11 @@
 
                         </Columns>
                     </asp:GridView>
+
+
+
+                  
+
                 </ContentTemplate>
             </asp:UpdatePanel>
 

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
+    Public Function ConvertirGVATexto() 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()
 
         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
+        Dim countRows As Integer = 1
-                    sb.Append("|")
+        For Each GvRow As GridViewRow In GvDatos.Rows
-                End If
+
-            Next
+            If Not countRows = 1 Then
-            sb.AppendLine()
+                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.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.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.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.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

RH/CalculoSBC.aspx

@@ -116,7 +116,8 @@
                             </tr>
                         </table>
                         <asp:GridView ID="GVCalculosSBC" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD Widthall GVCalculosSBC GVBuscaddor" AutoGenerateColumns="False" data-tableheader="#tableheader"
-                            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">
+                            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">
                             <Columns>
                                 <asp:TemplateField HeaderText="Código">
                                     <ItemTemplate>
@@ -242,16 +243,17 @@
                                         Modificación
                                     </HeaderTemplate>
                                     <ItemTemplate>
-                                        <asp:Label ID="lblsalarioDiarioSSf" runat="server" Text='<%# (Eval("SalarioDiarioSSNuevo", "{0:N2}") == Eval("SalarioDiarioSS", "{0:N2}") ? "NO" : "SI")  %>'> </asp:Label>
+                                        <asp:Label ID="lblsalarioDiarioSSf" runat="server" > </asp:Label>
+                                        <%--<asp:Label ID="lblsalarioDiarioSSf" runat="server" Text='<%# (Eval("SalarioDiarioSSNuevo", "{0:N2}") == Eval("SalarioDiarioSS", "{0:N2}") ? "NO" : "SI")  %>'> </asp:Label>--%>
                                     </ItemTemplate>
                                 </asp:TemplateField>
                                 <asp:TemplateField ItemStyle-HorizontalAlign="Center">
                                     <HeaderTemplate>
-                                        <input type="checkbox" class="chkt4u" checked="checked" />
+                                        <%--<input type="checkbox" class="chkt4u" checked="checked" />
-                                        <input type="checkbox" id="ChkAllGVDatosA" />
+                                        <input type="checkbox" id="ChkAllGVDatosA" />--%>
                                     </HeaderTemplate>
                                     <ItemTemplate>
-                                        <input id="chk" type="checkbox" class="chkt4" runat="server" />
+                                        <%--<input id="chk" type="checkbox" class="chkt4" runat="server" />--%>
                                         <asp:CheckBox ID="chkUpdate" CssClass="chkp4" runat="server"></asp:CheckBox>
                                     </ItemTemplate>
                                 </asp:TemplateField>

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
 {

RH/CatPersonal.aspx

@@ -1054,7 +1054,7 @@
                                                     <asp:DropDownList Width="100%" ID="DdlProyectoAsignadoAdd" runat="server" AppendDataBoundItems="True" AutoPostBack="True" DataTextField="Proyecto" DataValueField="CveProyecto" CssClass="form-control input-sm select2me" ValidationGroup="GrpGuardarAddS">
                                                     </asp:DropDownList>
                                                     <asp:Label runat="server" ID="LblProyectoAsignado" AssociatedControlID="DdlProyectoAsignadoAdd">Proyecto:</asp:Label>
-                                                    <asp:RequiredFieldValidator ID="RfvDdlProyectoAsignado" runat="server" InitialValue="-1" ControlToValidate="DdlProyectoAsignado" ValidationGroup="GrpGuardarAddS" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Proyecto''</b> es necesario, por favor seleccione uno."></asp:RequiredFieldValidator>
+                                                    <asp:RequiredFieldValidator ID="RfvDdlProyectoAsignado" runat="server" InitialValue="-1" ControlToValidate="DdlProyectoAsignadoAdd" ValidationGroup="GrpGuardarAddS" CssClass="help-block errorimput" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Proyecto''</b> es necesario, por favor seleccione uno."></asp:RequiredFieldValidator>
                                                     <i></i>
                                                 </div>
                                                 <div class="form-group form-md-line-input input-iconright">

SAT/SolicitudesRecibidasSAT.aspx

@@ -292,13 +292,13 @@
     <asp:UpdatePanel ID="UpDatos" runat="server" UpdateMode="Conditional">
         <ContentTemplate>
             <div class="row" runat="server" id="DVResumen1" visible="false">
-                <div class="col-md-7" style="text-align: right">
+                <div class="col-md-12" style="text-align: right">
                     <input type="text" id="TxtBusquedaResumen" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusquedaResumen','{0}')", GvResumen.ClientID) %>" style="display: inline-block; width: 150px;" />
                     <a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusquedaResumen','{0}')", GvResumen.ClientID) %>" style="margin-top: -3px; margin-left: -13px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
                 </div>
             </div>
             <div class="row" runat="server" id="DVResumen2" visible="false">
-                <div class="col-md-7">
+                <div class="col-md-12">
                     <asp:GridView ID="GvResumen" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD Widthall" AutoGenerateColumns="False" OnRowDataBound="GvResumen_RowDataBound"
                         ShowHeaderWhenEmpty="true" EmptyDataText="No se encontraron registros"
                         DataKeyNames="Fecha">
@@ -308,19 +308,60 @@
                                     <asp:Label ID="LblMes" runat="server" Text='<%# Eval("Mes")%>'></asp:Label>
                                 </ItemTemplate>
                             </asp:TemplateField>
-                            <asp:TemplateField HeaderText="SIG" ItemStyle-HorizontalAlign="Right">
+                            <asp:TemplateField HeaderText="IVA" ItemStyle-HorizontalAlign="Right">
                                 <ItemTemplate>
-                                    <asp:Label ID="LblVTotal" runat="server" Text='<%# Eval("VTotal","{0:N2}")%>'></asp:Label>
+                                    <asp:Label runat="server" Text='<%# Eval("CIVA", "{0:N2}")%>'></asp:Label>
                                 </ItemTemplate>
                             </asp:TemplateField>
-                            <asp:TemplateField HeaderText="SAT" ItemStyle-HorizontalAlign="Right">
+                            <asp:TemplateField HeaderText="IEPS" ItemStyle-HorizontalAlign="Right">
                                 <ItemTemplate>
-                                    <asp:Label ID="LblCBTTotal" runat="server" Text='<%# Eval("CBTTotal","{0:N2}")%>'></asp:Label>
+                                    <asp:Label runat="server" Text='<%# Eval("CIEPS", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Ret IVA" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label  runat="server" Text='<%# Eval("CRetIVA", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Ret ISR" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("CRetISR", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="TOTAL SIG" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label ID="LblVTotal" runat="server" Text='<%# Eval("CTotal", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="IVA" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("FIVA", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="IEPS" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("FIEPS", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Ret IVA" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label  runat="server" Text='<%# Eval("FRetIVA", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Ret ISR" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("FRetISR", "{0:N2}")%>'></asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            
+                            <asp:TemplateField HeaderText="TOTAL SAT" ItemStyle-HorizontalAlign="Right">
+                                <ItemTemplate>
+                                    <asp:Label ID="LblCBTTotal" runat="server" Text='<%# Eval("FTotal", "{0:N2}")%>'></asp:Label>
                                 </ItemTemplate>
                             </asp:TemplateField>
                             <asp:TemplateField HeaderText="Diferencia" ItemStyle-HorizontalAlign="Right">
                                 <ItemTemplate>
-                                    <asp:Label ID="LblDif" runat="server" Text='<%# Eval("Dif","{0:N2}")%>'></asp:Label>
+                                    <asp:Label ID="LblDif" runat="server" Text='<%# Eval("Dif", "{0:N2}")%>'></asp:Label>
                                 </ItemTemplate>
                             </asp:TemplateField>
                         </Columns>

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)

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"
 

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()