From 87c9a0d11595ed6cf4e5d229a1e0eba5161d12b2 Mon Sep 17 00:00:00 2001 From: rakcsle Date: Tue, 29 Apr 2025 11:39:46 -0700 Subject: [PATCH] Personal ajustes cuenta depositito --- App_Code/ClsGenerales.vb | 3 +- Compras/RepComplementoPago.aspx | 97 +- Compras/RepComplementoPago.aspx.vb | 29 +- Empresas/Grales/Formatos/EntradaSalida.rdlc | 2267 ++++++++++--------- RH/Personal.aspx | 51 +- RH/Personal.aspx.vb | 17 +- 6 files changed, 1325 insertions(+), 1139 deletions(-) diff --git a/App_Code/ClsGenerales.vb b/App_Code/ClsGenerales.vb index 7b7617049..791d4eb80 100644 --- 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 diff --git a/Compras/RepComplementoPago.aspx b/Compras/RepComplementoPago.aspx index 4bbace20e..e938b7749 100644 --- a/Compras/RepComplementoPago.aspx +++ b/Compras/RepComplementoPago.aspx @@ -18,32 +18,28 @@ +
    • - - -
  • - PDF -
    • -     - - - -     - - -
  • - Excel -
    • -     - - - -     +
  • + PDF +
    • + +
  • + Excel +
    • +
  • + Personalizar +
    • +     + + + +     @@ -135,18 +131,32 @@ + <%--0--%> + <%--1--%> + <%--2--%> + + + + + + + <%--3--%> + <%--4--%> + <%--5--%> + <%--6--%> + <%--7--%> + <%--8--%> - - + @@ -154,6 +164,49 @@ + + + + + + + + + + diff --git a/Compras/RepComplementoPago.aspx.vb b/Compras/RepComplementoPago.aspx.vb index eb4b41f15..52053551e 100644 --- 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 diff --git a/Empresas/Grales/Formatos/EntradaSalida.rdlc b/Empresas/Grales/Formatos/EntradaSalida.rdlc index c80980b50..a6883293e 100644 --- a/Empresas/Grales/Formatos/EntradaSalida.rdlc +++ b/Empresas/Grales/Formatos/EntradaSalida.rdlc @@ -1,1095 +1,5 @@ - - - - - - - - 1.14223cm - - - 3.14766cm - - - 11.67011cm - - - 2.70027cm - - - 1.73945cm - - - - - 0.42054cm - - - - - true - true - - - - - Cant. - - - - - - - Textbox7 - - - - Black - - 1pt - - - Black - - 1pt - - White - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Código - - - - - - - Textbox9 - - - - Black - - 1pt - - - Black - - 1pt - - White - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Descripción - - - - - - - Textbox11 - - - - Black - - 1pt - - - Black - - 1pt - - White - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Serie - - - - - - - Textbox6 - - - - Black - - 1pt - - - Black - - 1pt - - White - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Lote - - - - - - - Textbox5 - - - - Black - - 1pt - - - Black - - 1pt - - White - 2pt - 2pt - 2pt - 2pt - - - - - - - - 0.69042cm - - - - - true - true - - - - - =Fields!Cantidad.Value - - - - - - - Cantidad - - - 2pt - 2pt - =IIf(RowNumber(Nothing)=1,"1pt","0pt") - - - - - - - - true - true - - - - - =Fields!Codigo.Value - - - - - - - Codigo - - - 2pt - 2pt - =IIf(RowNumber(Nothing)=1,"1pt","0pt") - - - - - - - - true - true - - - - - =Fields!PS.Value - - - - - - 2pt - 2pt - =IIf(RowNumber(Nothing)=1,"1pt","0pt") - - - - - - - - true - true - - - - - =Fields!SerieLote.Value - - - - - - 2pt - 2pt - =IIf(RowNumber(Nothing)=1,"1pt","0pt") - - - - - - - - true - true - - - - - =Fields!Lote.Value - - - - - - 2pt - 2pt - =IIf(RowNumber(Nothing)=1,"1pt","0pt") - - - - - - - - - - - - - - - - - =IIF(String.IsNullOrEmpty(Fields!Lote.Value), True,False) - - - - - - - - After - - - - - - - DsInventarios - 0.17639cm - 0.22456cm - 1.11096cm - 20.39971cm - - - - - - true - true - - - - - =Parameters!Observaciones.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - 0.82291in - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Concepto.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - External - =Parameters!LogoPath.Value - FitProportional - 0.3175cm - 0.19987cm - 1.66316cm - 3.43141cm - 2 - - - - - - true - true - - - - - =Parameters!FacturaProveedor.Value - - - 2pt - 2pt - 2pt - 2pt - - - - true - - - - - =Parameters!FacturadoA.Value - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Proveedor: - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Factura: - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Folio: - - - - - - - Textbox3 - 0.35028cm - 13.63291cm - 0.89103cm - 2.06494cm - 7 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Folio.Value - - - - - - - Textbox31 - 0.31501cm - 15.69784cm - 0.9263cm - 2.57165cm - 8 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Fecha: - - - - - - 2pt - 2pt - 2pt - 2pt - - - - true - - - - - =Parameters!Almacen.Value - - - - - - - Textbox6 - 2.34505cm - 14.4575cm - 0.6cm - 5.9022cm - 10 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!Fecha.Value - - - - - - - Textbox32 - 3.09701cm - 14.4575cm - 0.59999cm - 5.9022cm - 11 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Almacén: - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - - 2.22251cm - true - true - - - 0.28886cm - 2.22221cm - 0cm - 4.95004cm - - - - - - true - true - - - - - =Parameters!NombreRecibio.Value - - - - Textbox31 - 0.46525cm - 1.74387cm - 0.6cm - 5.95755cm - 1 - - - 2pt - 2pt - 2pt - 2pt - - - - 0.28886cm - 12.20081cm - 0cm - 4.95004cm - 2 - - - - - - true - true - - - - - =Parameters!Almacen.Value - - - - Textbox31 - 0.42997cm - 11.80394cm - 0.6cm - 5.95755cm - 3 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Fecha Impresion: - - - - - - - Textbox5 - 1.49022cm - 11.96388cm - 0.6cm - 2.90426cm - 4 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!FechaImpresion.Value - - - - - - - Textbox33 - 1.49022cm - 14.86814cm - 0.6cm - 2.89335cm - 5 - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - 29.7cm - 21cm - 0.5cm - 1.5cm - 2cm - 2cm - 0.13cm - + + + + + + Textbox7 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Código + + + + + + + Textbox9 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Descripción + + + + + + + Textbox11 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Serie + + + + + + + Textbox6 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Lote + + + + + + + Textbox5 + + + + Black + + 1pt + + + Black + + 1pt + + White + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.69042cm + + + + + true + true + + + + + =Fields!Cantidad.Value + + + + + + + Cantidad + + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!Codigo.Value + + + + + + + Codigo + + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!PS.Value + + + + + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!SerieLote.Value + + + + + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + true + true + + + + + =Fields!Lote.Value + + + + + + 2pt + 2pt + =IIf(RowNumber(Nothing)=1,"1pt","0pt") + + + + + + + + + + + + + + + + + =IIF(String.IsNullOrEmpty(Fields!Lote.Value), True,False) + + + + + + + + After + + + + + + + DsInventarios + 0.17639cm + 0.02646cm + 1.11096cm + 20.61138cm + + + + + + true + true + + + + + =Parameters!Observaciones.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + 0.82291in + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!Concepto.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + External + =Parameters!LogoPath.Value + FitProportional + 0.34574cm + 1.66316cm + 3.43141cm + 2 + + + + + + true + true + + + + + =Parameters!FacturaProveedor.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + + + + + =Parameters!FacturadoA.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Proveedor: + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Factura: + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Folio: + + + + + + + Textbox3 + 0.37852cm + 13.43304cm + 0.89103cm + 2.06494cm + 7 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!Folio.Value + + + + + + + Textbox31 + 0.34325cm + 15.49797cm + 0.9263cm + 2.57165cm + 8 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Fecha: + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!Almacen.Value + + + + + + + Textbox6 + 2.05579cm + 13.14776cm + 0.6cm + 7.51654cm + 10 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!Fecha.Value + + + + + + + Textbox32 + 2.74425cm + 13.1213cm + 0.59999cm + 7.51654cm + 11 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Almacén: + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + + + + + =Parameters!FolioOC.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + OC: + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + 2.22251cm + true + true + + + 0.28886cm + 2.26223cm + 0cm + 4.95004cm + + + + + + true + true + + + + + =Parameters!NombreRecibio.Value + + + + Textbox31 + 0.46525cm + 1.78389cm + 0.6cm + 5.95755cm + 1 + + + 2pt + 2pt + 2pt + 2pt + + + + 0.28886cm + 12.24083cm + 0cm + 4.95004cm + 2 + + + + + + true + true + + + + + =Parameters!Almacen.Value + + + + Textbox31 + 0.42997cm + 11.84396cm + 0.6cm + 5.95755cm + 3 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Fecha Impresion: + + + + + + + Textbox5 + 1.49022cm + 12.0039cm + 0.6cm + 2.90426cm + 4 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!FechaImpresion.Value + + + + + + + Textbox33 + 1.49022cm + 14.90816cm + 0.6cm + 2.89335cm + 5 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 29.7cm + 21cm + 0.5cm + 0.5cm + 0.5cm + 0.5cm + 0.13cm +