Personal ajustes cuenta depositito

2025-04-29 11:39:46 -07:00
parent c4e58b18fc
commit 87c9a0d115
6 changed files with 1325 additions and 1139 deletions
--- a/App_Code/ClsGenerales.vb
+++ b/App_Code/ClsGenerales.vb
@@ -1649,7 +1649,7 @@ Public Class ClsGenerales
    Public Function AddCuentasDepositos(BancoNombre As String, Plaza As String, Sucursal As String, Cuenta As String, CLABE As String, CIE As String, SWIFT As String, Referencia As String, RefCrediProveedor As String, CveUsuario As Integer, CveMoneda As Integer, CveEmpresa As Integer,
                                        Optional CveProveedor As Integer = -1, Optional CveCliente As Integer = -1, Optional CvePersonal As Integer = -1, Optional CveColectiva As Integer = -1, Optional CveUsuarioModifico As Integer = -1,
                                        Optional Correo As String = "", Optional BBVAAlias As String = "-1", Optional EstatusPagoElectronico As Boolean = False, Optional EstatusPagoElectronicoGrupos As Boolean = False, Optional CveSATBanco As Integer = -1,
-                                        Optional ConceptoCIE As String = "-1") As Boolean
+                                        Optional ConceptoCIE As String = "-1", Optional Estatus As Boolean = True) As Boolean
        Dim Retorno As Boolean = False

        DataAdapter("PA_Gral_CuentasDepositosAdd")
@@ -1678,6 +1678,7 @@ Public Class ClsGenerales
            .Add("@EstatusPagoElectronicoGrupos", SqlDbType.Bit).Value = EstatusPagoElectronicoGrupos
            .Add("@CveSATBanco", SqlDbType.Int).Value = CveSATBanco
            .Add("@ConceptoCIE", SqlDbType.VarChar).Value = ConceptoCIE
+            .Add("@Estatus", SqlDbType.VarChar).Value = Estatus

        End With

--- a/Compras/RepComplementoPago.aspx
+++ b/Compras/RepComplementoPago.aspx
@@ -18,32 +18,28 @@
 <asp:Content ID="Content5" ContentPlaceHolderID="H" runat="Server">
    <asp:UpdatePanel ID="UpAcciones" runat="server" UpdateMode="Conditional">
        <ContentTemplate>
+
            <li style="text-align: left!important">
                <asp:LinkButton runat="server" ID="LnkNotificar" Visible="false" CssClass=" " OnClick="LnkNotificar_Click" data-html="true" data-placement="left" Text="<i class='fa fa-envelope'></i> Notificar Pendientes"
                    data-toggle="confirmation" data-popout="true" data-original-title="¿Notificar?" data-btn-ok-label="si"></asp:LinkButton>
            </li>
-            <asp:UpdatePanel runat="server" ID="UpPorcentajePrecios" RenderMode="Inline" UpdateMode="Conditional">
-                <ContentTemplate>
-                    <li>
-                        <asp:LinkButton ID="LnkPDF" OnClick="LnkPDF_Click" runat="server"><i class="fa fa-file-pdf-o" style="font-weight:bold;"></i> PDF</asp:LinkButton>
-                    </li>
-                </ContentTemplate>
-                <Triggers>
-                    <asp:PostBackTrigger ControlID="LnkPDF" />
-                </Triggers>
-            </asp:UpdatePanel>

-            <asp:UpdatePanel runat="server" ID="UpdatePanel1" RenderMode="Inline" UpdateMode="Conditional">
-                <ContentTemplate>
-                    <li>
-                        <asp:LinkButton ID="LnkExcel" OnClick="LnkExcel_Click" runat="server"><i class="fa fa-file-excel-o" style="font-weight:bold;"></i> Excel</asp:LinkButton>
-                    </li>
-                </ContentTemplate>
-                <Triggers>
-                    <asp:PostBackTrigger ControlID="LnkExcel" />
-                </Triggers>
-            </asp:UpdatePanel>
+            <li>
+                <asp:LinkButton ID="LnkPDF" OnClick="LnkPDF_Click" runat="server"><i class="fa fa-file-pdf-o" style="font-weight:bold;"></i> PDF</asp:LinkButton>
+            </li>
+
+            <li>
+                <asp:LinkButton ID="LnkExcel" OnClick="LnkExcel_Click" runat="server"><i class="fa fa-file-excel-o" style="font-weight:bold;"></i> Excel</asp:LinkButton>
+            </li>
+            <li>
+                <asp:HyperLink NavigateUrl="#" data-toggle="modal" data-target="#DivPersonalizar" ID="ImgPersonalizar" runat="server"> <i class="fa fa-pencil"></i>  Personalizar</asp:HyperLink>
+            </li>
+
        </ContentTemplate>
+        <Triggers>
+            <asp:PostBackTrigger ControlID="LnkPDF" />
+            <asp:PostBackTrigger ControlID="LnkExcel" />
+        </Triggers>
    </asp:UpdatePanel>
 </asp:Content>
 <asp:Content ID="Content6" ContentPlaceHolderID="HA" runat="Server">
@@ -135,18 +131,32 @@
            </table>
            <asp:GridView ID="GvDatos" runat="server" AutoGenerateColumns="False" EmptyDataText="Sin resultados" ShowHeaderWhenEmpty="true" CssClass="table table-striped table-hover Widthall ScrollAD" GridLines="None" data-sort="true">
                <Columns>
+                    <%--0--%>
                    <asp:HyperLinkField HeaderText="Proveedor" DataTextField="RazonSocial" DataNavigateUrlFields="CveProveedor" DataNavigateUrlFormatString="/Compras/Proveedores.aspx?CveProveedor={0}" Target="_blank" ItemStyle-Width="30%" />
+                    <%--1--%>
                    <asp:HyperLinkField HeaderText="SerieFolio" DataTextField="SerieFolio" DataNavigateUrlFields="CveCompra" DataNavigateUrlFormatString="/Compras/Compras.aspx?CveCompra={0}" Target="_blank" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center" />
+                    <%--2--%>
+                    <asp:TemplateField Visible="false" HeaderText="Folio Fiscal">
+                        <ItemTemplate>
+                            <asp:Label ID="LblFolioFiscal" runat="server" Text='<%# Eval("UUID") %>'></asp:Label>
+                        </ItemTemplate>
+                        <ItemStyle HorizontalAlign="Left" />
+                    </asp:TemplateField>
+                    <%--3--%>
                    <asp:BoundField HeaderText="Fecha" DataField="Fecha" DataFormatString="{0:d}" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="10%" />
+                    <%--4--%>
                    <asp:BoundField HeaderText="Importe" DataField="Total" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="15%" />
+                    <%--5--%>
                    <asp:HyperLinkField HeaderText="Folio" DataTextField="FolioIE" DataNavigateUrlFields="CveIE" DataNavigateUrlFormatString="/Bancos/IE.aspx?CveIE={0}" Target="_blank" ItemStyle-Width="10%" ItemStyle-HorizontalAlign="Center" />
+                    <%--6--%>
                    <asp:BoundField HeaderText="Fecha" DataField="FechaIE" DataFormatString="{0:d}" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="10%" />
+                    <%--7--%>
                    <asp:BoundField HeaderText="Importe" DataField="Importe" DataFormatString="{0:N2}" ItemStyle-HorizontalAlign="Right" ItemStyle-Width="15%" />
+                    <%--8--%>
                    <asp:TemplateField Visible="false">
                        <ItemTemplate>
                            <asp:HyperLink ID="HplPDF" runat="server" Visible="false"><i class='fa fa-ad-pdf'></i></asp:HyperLink>
-                        </ItemTemplate>
-                        <ItemStyle Width="5%" />
+                        </ItemTemplate>                        
                    </asp:TemplateField>
                </Columns>
            </asp:GridView>
@@ -154,6 +164,49 @@
    </asp:UpdatePanel>


+    <asp:UpdatePanel runat="server" ID="UPPersonalizar" UpdateMode="Conditional">
+    <ContentTemplate>
+        <div id="DivPersonalizar" class="modal fade" role="dialog">
+            <div class="modal-dialog">
+
+                <!-- Modal content-->
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                        <h4 class="modal-title">
+                            <asp:Label ID="Label2" runat="server" ClientIDMode="Static" Text="Personalizar Columnas"></asp:Label></h4>
+                    </div>
+                    <div class="modal-body">
+                        <table style="width:100%" class="table table-striped table-advance table-hover">
+                            <tr>
+                                <td>
+                                    <asp:CheckBox ID="ChkFolioFiscal" runat="server" Text="Folio Fiscal" />
+
+                                </td>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                                
+                                 
+                            </tr>
+                           
+                        </table>
+                    </div>
+                    <div class="modal-footer">
+                        <asp:Button ID="BtnPersonalizar" runat="server" Text="Personalizar" class="btn btn-primary" OnClick="BtnPersonalizar_Click" />
+                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancelar</button>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+
+
+
+
+    </ContentTemplate>
+</asp:UpdatePanel>
+
 </asp:Content>
 <asp:Content ID="Content8" ContentPlaceHolderID="JS" runat="Server">
 </asp:Content>
--- a/Compras/RepComplementoPago.aspx.vb
+++ b/Compras/RepComplementoPago.aspx.vb
@@ -69,15 +69,17 @@ Partial Class Compras_RepComplementoPago
        Dim TipoConsulta As Integer = If(ChkViculadas.Checked, 2, 1)
        Dim Count As Integer = 0

+        Personalizar()
+
        Dim ObjCompras As New ClsCompras
        If ObjCompras.RepComplementosPago(CveProveedor, -1, TipoConsulta, FechaInicio, FechaFin, UsuarioActual.CveEmpresa, CveTipoProveedor, DdlSubProyecto.SelectedValue.ToEntero, DdlUsuarioRegistra.SelectedValue.ToEntero) Then
            DTComplemntos = ObjCompras.DtResultados '.FiltraParametros(If(ChkViculadas.Checked, "FechaAsociacionPago IS NOT NULL", "FechaAsociacionPago IS NULL"))
            GvDatos.DataSource = DTComplemntos
            If ChkViculadas.Checked Then
                Count = DTComplemntos.Rows.Count
-                GvDatos.Columns(7).Visible = True
+                GvDatos.Columns(8).Visible = True
            Else
-                GvDatos.Columns(7).Visible = False
+                GvDatos.Columns(8).Visible = False
            End If
        End If
        ObjCompras.Dispose()
@@ -98,6 +100,22 @@ Partial Class Compras_RepComplementoPago
        GvDatos.DataBind()
        UpDatos.Update()
    End Sub
+
+    Private Sub Personalizar()
+
+        GvDatos.Columns(2).Visible = ChkFolioFiscal.Checked
+        If ChkFolioFiscal.Checked Then
+            GvDatos.Columns(0).ItemStyle.Width = 15%
+        Else
+            GvDatos.Columns(0).ItemStyle.Width = 30%
+        End If
+
+
+
+        UpDatos.Update()
+
+    End Sub
+
    Protected Sub GvDatos_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvDatos.RowDataBound
        If e.Row.RowType = DataControlRowType.DataRow Then
            If ChkViculadas.Checked Then
@@ -201,4 +219,11 @@ Partial Class Compras_RepComplementoPago

    End Sub
 #End Region
+
+    Protected Sub BtnPersonalizar_Click(sender As Object, e As EventArgs)
+
+
+        Personalizar()
+    End Sub
+
 End Class
--- a/Empresas/Grales/Formatos/EntradaSalida.rdlc
+++ b/Empresas/Grales/Formatos/EntradaSalida.rdlc
--- a/RH/Personal.aspx
+++ b/RH/Personal.aspx
@@ -4998,18 +4998,35 @@
                     <h4 class="modal-title" id="H2" runat="server">Cuenta Bancaria</h4>
                 </div>
                 <div class="modal-body">
-                     
-                     <div class="form-group form-md-line-input input-iconright">
-                        <asp:DropDownList ID="DdlBancoSat" runat="server" Width="100%" AppendDataBoundItems="true" DataTextField="Banco" DataValueField="CveSATBanco" CssClass="form-control input-sm select2me" ValidationGroup="GrpGuardar"></asp:DropDownList>
-                        <asp:Label runat="server" AssociatedControlID="DdlBancoSat" Text="Banco:"></asp:Label>
-                        <asp:RequiredFieldValidator ID="RFVBancoSat" runat="server" InitialValue="-1" ControlToValidate="DdlBancoSat" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Banco''</b> es necesario, por favor ingréselo." ValidationGroup="GrpAgregarBanco"></asp:RequiredFieldValidator>
-                        <ajax:ValidatorCalloutExtender ID="VcoBancoSat" runat="server" HighlightCssClass="vco" TargetControlID="RFVBancoSat" Width="300px"></ajax:ValidatorCalloutExtender>
-                        <i></i>
-                    </div>
-

                     <div class="row">
                         <div class="col-md-6">
+                             <div class="form-group form-md-line-input input-iconright">
+                                 <asp:DropDownList ID="DdlBancoSat" runat="server" Width="100%" AppendDataBoundItems="true" DataTextField="Banco" DataValueField="CveSATBanco" CssClass="form-control input-sm select2me" ValidationGroup="GrpGuardar"></asp:DropDownList>
+                                 <asp:Label runat="server" AssociatedControlID="DdlBancoSat" Text="Banco:"></asp:Label>
+                                 <asp:RequiredFieldValidator ID="RFVBancoSat" runat="server" InitialValue="-1" ControlToValidate="DdlBancoSat" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Banco''</b> es necesario, por favor ingréselo." ValidationGroup="GrpAgregarBanco"></asp:RequiredFieldValidator>
+                                 <ajax:ValidatorCalloutExtender ID="VcoBancoSat" runat="server" HighlightCssClass="vco" TargetControlID="RFVBancoSat" Width="300px"></ajax:ValidatorCalloutExtender>
+                                 <i></i>
+                             </div>
+
+                         </div>
+
+                         <div class="col-md-6">
+                             <div class="form-group form-md-line-input input-iconright">
+                                 <asp:TextBox ID="TxtNumeroCuenta" runat="server" CssClass="form-control" CausesValidation="true" ValidationGroup="GrpAgregarBanco"></asp:TextBox>
+                                 <ajax:FilteredTextBoxExtender ID="SoloNumeros" runat="server" TargetControlID="TxtNumeroCuenta" FilterType="Numbers" />
+                                 <label for="<%= TxtNumeroCuenta.ClientID.ToString()%>">Numero de Cuenta:</label>
+                             </div>
+                         </div>
+
+                     </div>
+                     
+                    
+
+
+
+                     <div class="row">
+                         <div class="col-md-6" runat="server" visible="false">
                             <div class="form-group form-md-line-input input-iconright">
                                 <asp:TextBox ID="TxtNombreBanco" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="100" ValidationGroup="GrpAgregarBanco"></asp:TextBox>
                                 <asp:RequiredFieldValidator ID="RFVNombreBanco" runat="server" ControlToValidate="TxtNombreBanco" Display="None" 
@@ -5026,13 +5043,7 @@
                         </div>
                     </div>
                     <div class="row">
-                         <div class="col-md-6">
-                             <div class="form-group form-md-line-input input-iconright">
-                                 <asp:TextBox ID="TxtNumeroCuenta" runat="server" CssClass="form-control" CausesValidation="true" ValidationGroup="GrpAgregarBanco"></asp:TextBox>
-                                 <ajax:FilteredTextBoxExtender ID="SoloNumeros" runat="server" TargetControlID="TxtNumeroCuenta" FilterType="Numbers" />
-                                 <label for="<%= TxtNumeroCuenta.ClientID.ToString()%>">Numero de Cuenta:</label>
-                             </div>
-                         </div>
+                        
                         <div class="col-md-6">
                             <div class="form-group form-md-line-input input-iconright">
                                 <asp:TextBox ID="TxtCLABECB" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="18" ValidationGroup="GrpAgregarBanco"></asp:TextBox>
@@ -5041,7 +5052,7 @@
                             </div>
                         </div>
                     </div>
-                     <div class="row">
+                     <div class="row"  runat="server" visible="false">
                         <div class="col-md-6">
                             <div class="form-group form-md-line-input input-iconright">
                                 <asp:TextBox ID="TxtSWIFT" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="100" ValidationGroup="GrpAgregarBanco"></asp:TextBox>
@@ -5056,7 +5067,7 @@
                         </div>
                     </div>
                     <div class="row">
-                         <div class="col-md-6">
+                         <div class="col-md-6"  runat="server" visible="false">
                             <div class="form-group form-md-line-input input-iconright">
                                 <asp:TextBox ID="TxtConvenioCIE" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="8" ValidationGroup="GrpAgregarBanco"></asp:TextBox>
                                 <label for="<%= TxtConvenioCIE.ClientID.ToString()%>">CIE:</label>
@@ -5070,7 +5081,7 @@
                             </div>
                         </div>
                     </div>
-                     <div class="row">
+                     <div class="row"  runat="server" visible="false">
                         <div class="col-md-6">
                             <div class="form-group form-md-line-input input-iconright">
                                 <asp:TextBox ID="TxtConceptoCIE" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="30"></asp:TextBox>
@@ -5085,7 +5096,7 @@
                             </div>
                         </div>
                     </div>
-                     <div class="row">
+                     <div class="row"  runat="server" visible="false">
                         <div class="col-md-6">
                             <div class="form-group form-md-line-input input-iconright">
                                 <asp:TextBox ID="TxtCorreoCuenta" runat="server" CssClass="form-control" CausesValidation="true" MaxLength="100" ValidationGroup="GrpAgregarBanco"></asp:TextBox>
--- a/RH/Personal.aspx.vb
+++ b/RH/Personal.aspx.vb
@@ -9,6 +9,7 @@ Imports System.Globalization



+
 Partial Class RH_Personal
    Inherits ClsPaginas

@@ -2136,8 +2137,9 @@ Partial Class RH_Personal
                                    If Not ObjCuentasDeposito.AddCuentasDepositos(row("BancoNombre").ToString(), row("Plaza").ToString(), row("Sucursal").ToString(), row("Cuenta").ToString(), row("CLABE").ToString(),
                                                                                  row("CIE").ToString(), row("SWIFT").ToString(), row("Referencia").ToString(), row("RefCrediProveedor").ToString(), UsuarioActual.CveUsuario,
                                                                                  row("CveMoneda").ToString().ToEntero(), UsuarioActual.CveEmpresa, CvePersonal:=CvePersonal, CveUsuarioModifico:=UsuarioActual.CveUsuario,
-                                                                                  BBVAAlias:=row("BBVAAlias").ToString(), EstatusPagoElectronico:=True, EstatusPagoElectronicoGrupos:=True, Correo:=row("Correo").ToString(),
-                                                                                  ConceptoCIE:=row("Correo").ToString()) Then
+                                                                                  BBVAAlias:=row("BBVAAlias").ToString(), EstatusPagoElectronico:=Boolean.Parse(row("EstatusPagoElectronico").ToString),
+                                                                                  EstatusPagoElectronicoGrupos:=Boolean.Parse(row("EstatusPagoElectronicoGrupos").ToString), Correo:=row("Correo").ToString(),
+                                                                                  ConceptoCIE:=row("ConceptoCIE").ToString(), Estatus:=If(row("EstatusTexto").ToString = "Activo", True, False)) Then
                                        TieneError = True
                                        Exit For
                                    End If
@@ -3440,6 +3442,7 @@ Partial Class RH_Personal
            If IndexCuentaDepostito > -1 Then
                Dim Row As DataRow = TempDTCuentasBancos.Rows(IndexCuentaDepostito)
                Row("BancoNombre") = nombrebanco
+                Row("Cuenta") = TxtNumeroCuenta.Text.Trim
                Row("Sucursal") = TxtNumeroSucursal.Text
                Row("CLABE") = TxtCLABECB.Text.Trim
                Row("SWIFT") = TxtSWIFT.Text
@@ -3455,7 +3458,10 @@ Partial Class RH_Personal
                Row("EstatusPagoElectronico") = ChkEstatusPagoE.Checked
                Row("EstatusPagoElectronicoGrupos") = ChkPagoElectronicoGrupos.Checked
                Row("Correo") = TxtCorreoCuenta.Text.Trim
+                Row("Correo") = TxtCorreoCuenta.Text.Trim
                Row("ConceptoCIE") = TxtConceptoCIE.Text
+                Row("EstatusTexto") = If(ChkEstatuscuenta.Checked, "Activo", "Inactivo")
+
            End If
        End If

@@ -3594,6 +3600,7 @@ Partial Class RH_Personal
                Row("EstatusPagoElectronicoGrupos") = EstatusPagoElectronicoGrupos
                Row("Correo") = Correo
                Row("ConceptoCIE") = ConceptoCIE
+                Row("EstatusTexto") = If(ChkEstatuscuenta.Checked, "Activo", "Inactivo")

            Else
                Dim Row As DataRow = TempDTCuentasBancos.NewRow
@@ -3615,6 +3622,8 @@ Partial Class RH_Personal
                Row("Correo") = Correo
                Row("ConceptoCIE") = ConceptoCIE
                TempDTCuentasBancos.Rows.Add(Row)
+                Row("EstatusTexto") = If(ChkEstatuscuenta.Checked, "Activo", "Inactivo")
+
            End If


@@ -3718,6 +3727,8 @@ Partial Class RH_Personal
        TxtCorreoCuenta.Text = gvrow.DataKey("Correo")
        TxtBBVAAlias.Text = gvrow.DataKey("BBVAAlias")
        ChkPagoElectronicoGrupos.Checked = Boolean.Parse(gvrow.DataKey("EstatusPagoElectronicoGrupos").ToString)
+        ChkEstatuscuenta.Checked = If(gvrow.DataKey("EstatusTexto").ToString = "Activo", True, False)
+


        'CveCuentaDeposito,BancoNombre,Sucursal,Cuenta,CLABE,SWIFT,Plaza,CIE,Referencia,RefCrediProveedor,CveMoneda,Estatus,Correo,BBVAAlias,EstatusPagoElectronico,EstatusPagoElectronicoGrupos,CveSATBanco,ConceptoCIE,EstatusTexto
@@ -5161,7 +5172,7 @@ Partial Class RH_Personal
    Private Sub CargaVacacionesResumenPeriodoActual()
        Using objnom As New ClsNominas

-            If objnom.GETPersonalVacResumen(UsuarioActual.Empresa.CveEmpresa, CvePersonal) Then
+            If objnom.GetPersonalVacResumen(UsuarioActual.Empresa.CveEmpresa, CvePersonal) Then
                RPTVacacionesResumen.DataSource = objnom.DtResultados
                DdlVacPeriodo.DataSource = objnom.DtResultados.FiltraParametros("DiasDisponibles > 0", "Ejercicio")
                DdlVacPeriodo.DataBind()