From 15ca5c823d0510147a9a903576a4f3823af42b2f Mon Sep 17 00:00:00 2001
From: JORGE LUIS CAUDILLO ESPARZA <caudillo_90@hotmail.com>
Date: Mon, 3 Jan 2022 04:34:11 -0700
Subject: [PATCH]

---
 App_Code/ClsRH.vb           |   1 +
 Nomina/CalculoISRAnual.aspx | 219 +++++++++++++++++++++++-------------
 Nomina/Nomina.aspx          |  18 ++-
 Nomina/Nomina.aspx.cs       |   2 +
 vwd.webinfo                 |   2 +
 5 files changed, 159 insertions(+), 83 deletions(-)

diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb
index 5c1b1d796..d333a9036 100644
--- a/App_Code/ClsRH.vb
+++ b/App_Code/ClsRH.vb
@@ -1535,6 +1535,7 @@ chkAplicaVacacion As Boolean, chkAplicaIncapacidad As Boolean, chkAplicaRetardo
             .Add("@FechaIIngreso", SqlDbType.VarChar).Value = FechaIIngreso
             .Add("@FechaFIngreso", SqlDbType.VarChar).Value = FechaFIngreso
             .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
+            .Add("@ISSIG", SqlDbType.Int).Value = 1
 
 
         End With
diff --git a/Nomina/CalculoISRAnual.aspx b/Nomina/CalculoISRAnual.aspx
index 87f44d135..3f0826cb1 100644
--- a/Nomina/CalculoISRAnual.aspx
+++ b/Nomina/CalculoISRAnual.aspx
@@ -7,6 +7,13 @@
         .GVCalculoISRAnual tr td:nth-child(n+6) {
             text-align: right;
         }
+        
+        .GVCalculoISRAnual tr td:nth-child(5) {
+            white-space: nowrap;
+        }
+        .GVCalculoISRAnual tr td:nth-child(6) {
+            white-space: nowrap;
+        }
 
         .btn.btn-circle.btn-sm {
             font-size: 9px;
@@ -63,87 +70,137 @@
     </asp:UpdatePanel>
     <asp:UpdatePanel ID="upDatos" runat="server" UpdateMode="Conditional">
         <ContentTemplate>
-            <asp:GridView ID="GVCalculoISRAnual" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD GVCalculoISRAnual Widthall" AutoGenerateColumns="False"
-                DataKeyNames="CvePersonal,Codigo,NombreCompleto,TipoIngreso,FechaInicio,IngresosTotales,BaseGravada,Deducciones,ISRRetenido,Art152,SubsCorrespondiente,LimiteInferior,LimiteSuperior,CuotaFija,Porcentaje,ImpuestoAnual,Acargo,Acompensar">
-                <Columns>
-                    <asp:TemplateField HeaderText="Aplica">
-                        <ItemTemplate>
-                            <%# Eval("Aplica").ToString() =="1" ?"✓" :"✘" %>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="">
-                        <ItemTemplate>
-                            <asp:LinkButton ID="LnkAplicar" Visible='<%# Eval("Aplica").ToString() =="0"%>' OnClick="LnkAplicar_Click" CssClass="btn btn-circle btn-sm green " runat="server" data-toggle="confirmation" data-popout="true" data-original-title="AgregarEmpleado al calculo anual" data-btn-ok-label="si"> +</asp:LinkButton>
-                            <asp:LinkButton ID="LnkCancelar" Visible='<%# Eval("Aplica").ToString() =="1"%>' OnClick="LnkCancelar_Click" CssClass="btn btn-circle btn-sm red " runat="server"> -</asp:LinkButton>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Causa">
-                        <ItemTemplate>
-                            <asp:Label runat="server" Text='<%# Eval("Causa")%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Código">
-                        <ItemTemplate>
-                            <asp:Label ID="lblcodigo" runat="server" Text='<%# Eval("Codigo")%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Nombre ">
-                        <ItemTemplate>
-                            <asp:Label ID="lblnombreCompleto" runat="server" Text='<%# Eval("NombreCompleto")%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Tipo ingreso">
-                        <ItemTemplate>
-                            <asp:Label ID="lblfechaInicio" runat="server" Text='<%# string.Format("{0} - {1:dd/MM/yyyy}",Eval("TipoIngreso"), Eval("FechaInicio"))%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Ingresos totales">
-                        <ItemTemplate>
-                            <asp:Label ID="lblingresosTotales" runat="server" Text='<%# Eval("IngresosTotales","{0:N2}")%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Base gravada">
-                        <ItemTemplate>
-                            <asp:Label runat="server" Text='<%# Eval("BaseGravada","{0:N2}")%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Base exenta">
-                        <ItemTemplate>
-                            <asp:Label runat="server" Text='<%# Eval("BaseExcenta","{0:N2}")%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="ISR retenido">
-                        <ItemTemplate>
-                            <asp:Label ID="lbliSRRetenido" runat="server" Text='<%# Eval("ISRRetenido","{0:N2}")%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Art 152">
-                        <ItemTemplate>
-                            <asp:Label ID="lblart152" runat="server" Text='<%# Eval("Art152","{0:N2}")%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Subs. correspondiente">
-                        <ItemTemplate>
-                            <asp:Label ID="lblsubsCorrespondiente" runat="server" Text='<%# Eval("SubsCorrespondiente","{0:N2}")%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="Impuesto anual">
-                        <ItemTemplate>
-                            <asp:Label ID="lblimpuestoAnual" runat="server" Text='<%# Eval("ImpuestoAnual","{0:N2}")%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="A cargo">
-                        <ItemTemplate>
-                            <asp:Label ID="lblacargo" runat="server" Text='<%# Eval("Acargo","{0:N2}")%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                    <asp:TemplateField HeaderText="A compensar">
-                        <ItemTemplate>
-                            <asp:Label ID="lblacompensar" runat="server" Text='<%# Eval("Acompensar","{0:N2}")%>'> </asp:Label>
-                        </ItemTemplate>
-                    </asp:TemplateField>
-                </Columns>
-            </asp:GridView>
+
+            <div class="portlet light  xspadding bordered " id="pnldl">
+                <div class="portlet-title">
+                    <div class="caption ">
+                        <i class="fa fa-bookmark font-yellow-gold"></i>
+                        <span class="caption-subject font-yellow-gold bold uppercase">Calculo anual
+                                        <asp:Literal ID="LtlPeriodoseleccionado" runat="server"></asp:Literal></span>
+                    </div>
+
+                    <div class="tools">
+                        <a href="javascript:;" class="collapse" data-original-title="" title=""></a>
+                        <a href="javascript:;" class="fullscreen" data-original-title="" title=""></a>
+                    </div>
+                    <div class="actions">
+                        <div class="btn-group">
+                        </div>
+                    </div>
+                    <div style="float: right;">
+                        <asp:TextBox CssClass="TxtBusqueda form-control input-sm" runat="server" onkeyup="FiltrarTablaV2('.TxtBusqueda','.ADScroller-body .GVCalculoISRAnual')" Style="display: inline-block; margin-right: -20px; width: 150px;"></asp:TextBox>
+                        <a href="javascript:;" onclick="FiltrarTablaV2('.TxtBusqueda','.ADScroller-body .GVCalculoISRAnual')" style="margin-top: -3px;" class="btn btn-circle btn-sm font-bold yellow-gold"><i class="icon-magnifier" style="font-weight: bold;"></i></a>
+                    </div>
+                </div>
+                <div class="portlet-body nomarginleftright form-horizontal form-row-sepe formnombottom ">
+
+
+
+                    <asp:GridView ID="GVCalculoISRAnual" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD GVCalculoISRAnual Widthall" AutoGenerateColumns="False"
+                        DataKeyNames="CvePersonal,Codigo,NombreCompleto,TipoIngreso,FechaInicio,IngresosTotales,BaseGravada,Deducciones,ISRRetenido,Art152,SubsCorrespondiente,LimiteInferior,LimiteSuperior,CuotaFija,Porcentaje,ImpuestoAnual,Acargo,Acompensar">
+                        <Columns>
+                            <asp:TemplateField HeaderText="Aplica">
+                                <ItemTemplate>
+                                    <%# Eval("Aplica").ToString() =="1" ?"✓" :"✘" %>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="">
+                                <ItemTemplate>
+                                    <asp:LinkButton ID="LnkAplicar" Visible='<%# Eval("Aplica").ToString() =="0"%>' OnClick="LnkAplicar_Click" CssClass="btn btn-circle btn-sm green " runat="server" data-toggle="confirmation" data-popout="true" data-original-title="AgregarEmpleado al calculo anual" data-btn-ok-label="si"> +</asp:LinkButton>
+                                    <asp:LinkButton ID="LnkCancelar" Visible='<%# Eval("Aplica").ToString() =="1"%>' OnClick="LnkCancelar_Click" CssClass="btn btn-circle btn-sm red " runat="server"> -</asp:LinkButton>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Causa">
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("Causa")%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Código">
+                                <ItemTemplate>
+                                    <asp:Label ID="lblcodigo" runat="server" Text='<%# Eval("Codigo")%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Nombre ">
+                                <ItemTemplate>
+                                    <asp:Label ID="lblnombreCompleto" runat="server" Text='<%# Eval("NombreCompleto")%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Tipo ingreso">
+                                <ItemTemplate>
+                                    <asp:Label ID="lblfechaInicio" runat="server" Text='<%# string.Format("{0} - {1:dd/MM/yyyy}",Eval("TipoIngreso"), Eval("FechaInicio"))%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField >
+                                <HeaderTemplate>
+                                    <span data-toggle="tooltip" data-html="true" title="Suma de percepciones <br/>capturadas en los distintos <br/>periodos del año">Ingresos <br/>totales</span>
+                                </HeaderTemplate>
+                                <ItemTemplate>
+                                    <asp:Label ID="lblingresosTotales" runat="server" Text='<%# Eval("IngresosTotales","{0:N2}")%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField >
+                                <HeaderTemplate>
+                                    <span data-toggle="tooltip" data-html="true" title="">Base <br/>gravada</span>
+                                </HeaderTemplate>
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("BaseGravada","{0:N2}")%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField >
+                                <HeaderTemplate>
+                                    <span data-toggle="tooltip" data-html="true" title="">Base <br/>exenta</span>
+                                </HeaderTemplate>
+                                <ItemTemplate>
+                                    <asp:Label runat="server" Text='<%# Eval("BaseExcenta","{0:N2}")%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="">
+                                <HeaderTemplate>
+                                    <span data-toggle="tooltip" data-html="true" title="Suma del isr capturado <br/>en los distintos <br/>periodos del año">ISR <br/>retenido</span>
+                                </HeaderTemplate>
+                                <ItemTemplate>
+                                    <asp:Label ID="lbliSRRetenido" runat="server" Text='<%# Eval("ISRRetenido","{0:N2}")%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="">
+                                <HeaderTemplate>
+                                    <span data-toggle="tooltip" data-html="true" title="calculo a partir de <br/>la tabla anual y la <br/>base grabada">Art 152</span>
+                                </HeaderTemplate>
+                                <ItemTemplate>
+                                    <asp:Label ID="lblart152" runat="server" Text='<%# Eval("Art152","{0:N2}")%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField >
+                                <HeaderTemplate>
+                                    <span data-toggle="tooltip" data-html="true" title=" suma de importes <br/>durante el ejercicio <br/>(subsidio acreditalbe -<br/> ajuste al subsidio causado)">Subs.<br />correspondiente</span>
+                                </HeaderTemplate>
+                                <ItemTemplate>
+                                    <asp:Label ID="lblsubsCorrespondiente" runat="server" Text='<%# Eval("SubsCorrespondiente","{0:N2}")%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="Impuesto anual">
+                                <HeaderTemplate>
+                                    <span data-toggle="tooltip" data-html="true" title="">Impuesto<br />anual</span>
+                                </HeaderTemplate>
+                                <ItemTemplate>
+                                    <asp:Label ID="lblimpuestoAnual" runat="server" Text='<%# Eval("ImpuestoAnual","{0:N2}")%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="A cargo">
+                                <ItemTemplate>
+                                    <asp:Label ID="lblacargo" runat="server" Text='<%# Eval("Acargo","{0:N2}")%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                            <asp:TemplateField HeaderText="A compensar">
+                                <ItemTemplate>
+                                    <asp:Label ID="lblacompensar" runat="server" Text='<%# Eval("Acompensar","{0:N2}")%>'> </asp:Label>
+                                </ItemTemplate>
+                            </asp:TemplateField>
+                        </Columns>
+                    </asp:GridView>
+
+                </div>
+            </div>
         </ContentTemplate>
     </asp:UpdatePanel>
 
diff --git a/Nomina/Nomina.aspx b/Nomina/Nomina.aspx
index 69c9446da..80beff38b 100644
--- a/Nomina/Nomina.aspx
+++ b/Nomina/Nomina.aspx
@@ -2380,7 +2380,6 @@
                             </ajax:TabPanel>
                             <ajax:TabPanel ID="TTVigISRAnual" runat="server" HeaderText="ISR Anual" Visible="false">
                                 <ContentTemplate>
-                                    <asp:GridView ID="GVVigISRAnual" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
                                 </ContentTemplate>
                             </ajax:TabPanel>
                             <ajax:TabPanel ID="TTVigISRMensual" runat="server" HeaderText="ISR ">
@@ -2448,9 +2447,24 @@
                                             <asp:GridView ID="GVVigISRQuincenal" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
                                         </div>
                                     </div>
+                                    <div class="portlet light  xspadding bordered">
+                                        <div class="portlet-title">
+                                            <div class="caption ">
+                                                <i class="fa fa-bookmark font-yellow-gold"></i>
+                                                <span class="caption-subject bold uppercase font-yellow-gold">Anual</span>
+                                            </div>
+                                            <div class="tools">
+                                                <a href="javascript:;" class="collapse" data-original-title="" title=""></a>
+                                                <a href="javascript:;" class="fullscreen" data-original-title="" title=""></a>
+                                            </div>
+                                        </div>
+                                        <div class="portlet-body  ">
+                                            <asp:GridView ID="GVVigISRAnual" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
+                                        </div>
+                                    </div>
                                 </ContentTemplate>
                             </ajax:TabPanel>
-                            <ajax:TabPanel ID="TTVigSubEmpAnual" runat="server" HeaderText="Subsidio Anual" Visible="false">
+                            <ajax:TabPanel ID="TTVigSubEmpAnual" runat="server" HeaderText="Subsidio Anual" >
                                 <ContentTemplate>
                                     <asp:GridView ID="GVVigSubEmpAnual" runat="server" CssClass="table table-striped table-hover mysmallbtn Widthall GvNominas" GridLines="None"></asp:GridView>
                                 </ContentTemplate>
diff --git a/Nomina/Nomina.aspx.cs b/Nomina/Nomina.aspx.cs
index 99ac821e1..7029ad299 100644
--- a/Nomina/Nomina.aspx.cs
+++ b/Nomina/Nomina.aspx.cs
@@ -3612,6 +3612,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
                 GVVigISRSemanal.DataSource = objnom.DTSetResultados.Tables[7];
                 GVVigISRDecenal.DataSource = objnom.DTSetResultados.Tables[8];
                 GVVigISRQuincenal.DataSource = objnom.DTSetResultados.Tables[9];
+                GVVigISRAnual.DataSource = objnom.DTSetResultados.Tables[10];
 
 
 
@@ -3631,6 +3632,7 @@ public partial class Nomina_Nomina2 : ClsPaginas
         GVVigISRSemanal.DataBind();
         GVVigISRDecenal.DataBind();
         GVVigISRQuincenal.DataBind();
+        GVVigISRAnual.DataBind();
         GVUma.DataBind();
         UpModalTablas.Update();
     }
diff --git a/vwd.webinfo b/vwd.webinfo
index 77f975b92..3ae19f0e8 100644
--- a/vwd.webinfo
+++ b/vwd.webinfo
@@ -394,6 +394,8 @@
     
   
     
+  
+