From c9b47f5ac99673beafd85c52b909b0e5145ca194 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Thu, 6 Jun 2024 19:46:21 -0700 Subject: [PATCH 1/2] --GRUPO DIAZ, Asignar la forma de pago segun el importe mayor de los pagaos agregados --- Ventas/Ventas.aspx.vb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index ecce18717..d63a41e9e 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -23892,9 +23892,21 @@ Partial Class Ventas UpPS.Update() End If + If UsuarioActual.Empresa.Funcionalidad(382) = "1" AndAlso DtPagos IsNot Nothing AndAlso DtPagos.Rows.Count > 0 Then + Dim ImporteMaximo As Decimal = DtPagos.MAX("Importe").ToDecimal() + Dim RowPagoMaximo As DataRow = DtPagos.FiltroPrimero($"Importe >= {ImporteMaximo}") + If RowPagoMaximo IsNot Nothing Then + Dim CveTipoTransaccion As Integer = RowPagoMaximo("CveTipoMovimiento").ToString().ToEntero() + If CveTipoTransaccion > 0 Then + Dim CveFormaPago = GlobalDTTipoTransacciones.FiltroPrimeroValor("CveFormaPago", RowFilter:=$"CveTipoTransaccion = {CveTipoTransaccion} AND Estatus = 1") + DdlFormaPago33.SelectedValueExist(CveFormaPago) + End If + End If + End If + CargaGridContado() UpContado.Update() - + UPCondicionesPago.Update() End Sub Private Sub RBLPago_SelectedIndexChanged(sender As Object, e As EventArgs) Handles RBLPago.SelectedIndexChanged LimpiaEscondeContado() From de07d0f7a5dbaea94a069b6eb848bb6a23433eb9 Mon Sep 17 00:00:00 2001 From: JORGE LUIS CAUDILLO ESPARZA Date: Fri, 7 Jun 2024 00:07:44 -0700 Subject: [PATCH 2/2] Dispersion Nomina --- App_Code/ClsNominas.vb | 15 + Empresas/193/Formatos/Nomina.rdlc | 585 +++++++++++++++++++++++++++++- Nomina/Nomina.aspx | 2 + Nomina/Nomina.aspx.cs | 94 ++++- 4 files changed, 679 insertions(+), 17 deletions(-) diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index 4261e7144..9d19306d1 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -642,6 +642,21 @@ Public Class ClsNominas retorno = RunQuery("Ocurrió un error al obtener el valor de la UMA.") Return retorno End Function + Public Function GetDispersionnominaXLS(CvePeriodo As Int32, CveEmpresa As Int32) As Boolean + Dim retorno As Boolean = False + DataAdapter("PA_Nom_DispersionnominaXLS", CommandType.StoredProcedure) + With SqlAdapter.SelectCommand.Parameters + .Add("@CvePeriodo", SqlDbType.Int).Value = CvePeriodo + .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa + End With + Try + SqlAdapter.Fill(Data) + retorno = True + Catch ex As Exception + OnError("Ocurrió un error al obtener el layout de nóminas.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo()) + End Try + Return retorno + End Function Public Function GetDispersionnomina(CvePeriodo As Int32, CveEmpresa As Int32) As Boolean Dim retorno As Boolean = False DataAdapter("PA_Nom_Dispersionnomina", CommandType.StoredProcedure) diff --git a/Empresas/193/Formatos/Nomina.rdlc b/Empresas/193/Formatos/Nomina.rdlc index 00ed95dd3..a4173c80f 100644 --- a/Empresas/193/Formatos/Nomina.rdlc +++ b/Empresas/193/Formatos/Nomina.rdlc @@ -9,6 +9,13 @@ 06ae5329-8ff5-42b5-b7f4-6d68e5186421 + + + System.Data.DataSet + /* Local Connection */ + + 06ae5329-8ff5-42b5-b7f4-6d68e5186455 + System.Data.DataSet @@ -45,6 +52,54 @@ + + + DsMovtosPermanentes + /* Local Query */ + + + + CveTipo + System.String + + + Nombre + System.String + + + Fecha + System.String + + + Concepto + System.String + + + NoPagos + System.String + + + ImportePagos + System.String + + + Total + System.String + + + Saldo + System.String + + + + DsMovtosPermanentes + C:\Users\Orlando Bojorquez\Documents\Visual Studio 2013\WebSites\WebSite1\App_Code\DsOC.xsd + DtOCDetalle + + + + + DsOC @@ -5309,8 +5364,536 @@ Lugar de expedición: 83190 Hermosillo + + + + + 8.17407cm + + + 2.16717cm + + + 1.88203cm + + + 2.59641cm + + + 2.5cm + + + 2.59641cm + + + + + 0.6cm + + + + + true + true + + + + + Registro de movimientos permanentes + + + + + + + Textbox258 + + + DimGray + 2pt + 2pt + 2pt + 2pt + + + 6 + + + + + + + + + + + 0.6cm + + + + + true + true + + + + + Descripción + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Fecha + + + + + + + Textbox30 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + No. Pagos + + + + + + + Textbox22 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Pagos + + + + + + + Textbox24 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Total + + + + + + + Textbox23 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Saldo + + + + + + + Textbox26 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Fields!Nombre.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Fecha.Value + + + + + + + Fecha + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!NoPagos.Value + + + + + + + NoPagos + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!ImportePagos.Value + + + + + + + ImportePagos + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Total.Value + + + + + + + Total + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Saldo.Value + + + + + + + Saldo + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + + After + + + After + + + + + + + DsMovtosPermanentes + 18.29515cm + 0.15979cm + 1.8cm + 19.91609cm + 10 + + =Count(Fields!CveTipo.Value, "DsMovtosPermanentes")= 0 + + + + + - 18.41425cm + 20.18696cm