From 6d783b13fcb9b7692933eb9da595cff0a5694dc5 Mon Sep 17 00:00:00 2001 From: rrene Date: Tue, 22 Apr 2025 19:17:40 -0700 Subject: [PATCH 1/5] -- dns jumbolon --- App_Code/ClsPaginas.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 65b176d49..b48d0ecb2 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -78,6 +78,7 @@ Public Class ClsPaginas If Dominio.Contains("VYA".ToUpper()) Then Retorno = "VYA" If Dominio.Contains("GRUPODIAZ".ToUpper()) Then Retorno = "GRUPODIAZ" If Dominio.Contains("FERRETERA".ToUpper()) Then Retorno = "FERRETERA" + If Dominio.Contains("JUMBOLON".ToUpper()) Then Retorno = "JUMBOLON" Return Retorno End Get End Property From bac43e98267e66d3ec416ca33470ed53373ac5d8 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Tue, 22 Apr 2025 23:23:37 -0700 Subject: [PATCH 2/5] --Validaciones cobro clientes -- obligar siempre tener corte --- Ventas/ClientesAbonar.aspx.vb | 31 ++++++++++++++++++++++++++++++- Ventas/PVCobranza.aspx.vb | 8 +++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/Ventas/ClientesAbonar.aspx.vb b/Ventas/ClientesAbonar.aspx.vb index 32fa60b0e..184fd643b 100644 --- a/Ventas/ClientesAbonar.aspx.vb +++ b/Ventas/ClientesAbonar.aspx.vb @@ -4,7 +4,6 @@ Imports System.Data Imports ADSTimbrado Imports Extensiones -Imports Org.BouncyCastle.Ocsp Partial Class Ventas_ClientesAbonar Inherits ClsPaginas @@ -743,6 +742,36 @@ Partial Class Ventas_ClientesAbonar Exit Sub End If + If UsuarioActual.Empresa.Funcionalidad(382) = "1" AndAlso RblTipoPago.SelectedValue = "3" Then + Dim DtSaldo As DataTable = Nothing + Dim ObjMovto As New ClsMovimientos + If ObjMovto.GetIngresosSaldosDetalle(CveCliente, -1, UsuarioActual.CveEmpresa) Then + DtSaldo = ObjMovto.DtResultados.FiltraParametros($"CveIE={DdlIngreso.SelectedValue.ToEntero()}") + End If + ObjMovto.Dispose() + + If DtSaldo IsNot Nothing AndAlso DtSaldo.Rows.Count = 1 Then + Dim ImporteRef As Decimal = DtSaldo.SUM("Saldo", $"CveIE={DdlIngreso.SelectedValue.ToEntero()}") + Dim ImporteAbonar As Decimal = 0 + + For Each gvr As GridViewRow In GvCxC.Rows + If gvr.FCCheckBox("Chk").Checked Then + ImporteAbonar += gvr.FCTextBox("TxtAbonar").Text.ToDecimal() + End If + Next + ImporteAbonar += TxtAnticipo.Text.ToDecimal() + + If ImporteRef.RoundSQL(2) <> ImporteAbonar.RoundSQL(2) Then + Alert("El importe abonado es diferente al saldo del ingreso", TipoMensaje.MsgAdvertencia) + Exit Sub + End If + Else + Alert("No se pudieron validar los saldos", TipoMensaje.MsgError) + Exit Sub + End If + + End If + Dim Cuenta As String = "" Dim CuentaDeposito As String = "" diff --git a/Ventas/PVCobranza.aspx.vb b/Ventas/PVCobranza.aspx.vb index 81e465ba8..a787c990a 100644 --- a/Ventas/PVCobranza.aspx.vb +++ b/Ventas/PVCobranza.aspx.vb @@ -674,6 +674,12 @@ Partial Class Ventas_PVCobranza End If Dim tCveCorte As Integer = CveCorte + + If tCveCorte <= 0 Then + Alert("No se puede realizar el pago. Debe tener un corte activo", TipoMensaje.MsgAdvertencia) + Exit Sub + End If + Dim CveVenta As Integer = HdnCveVenta.Value.ToEntero Dim CveVentaRemision As Integer = -1 @@ -712,7 +718,7 @@ Partial Class Ventas_PVCobranza Dim PedidoContrato = DbRowVenta("PedidoContrato").ToString() Dim OrdenCompra = DbRowVenta("OrdenCompra").ToString() - If tCveCorte <= 0 AndAlso DbRowVenta("CveCorte").ToString.ToEntero > 0 Then tCveCorte = DbRowVenta("CveCorte").ToString.ToEntero + 'If tCveCorte <= 0 AndAlso DbRowVenta("CveCorte").ToString.ToEntero > 0 Then tCveCorte = DbRowVenta("CveCorte").ToString.ToEntero Dim CvePrePoliza As Integer = -1 Dim Fecha As Date = DbRowVenta("Fecha").ToString.ToDate 'NowADS() From 9f2b8a6bea66430cc74d1b0efb7b3f2c50375186 Mon Sep 17 00:00:00 2001 From: rrene Date: Wed, 23 Apr 2025 08:01:01 -0700 Subject: [PATCH 3/5] - --- Contabilidad/RepGastosCC.aspx | 2 -- 1 file changed, 2 deletions(-) diff --git a/Contabilidad/RepGastosCC.aspx b/Contabilidad/RepGastosCC.aspx index 46c288faa..9f918e6a6 100644 --- a/Contabilidad/RepGastosCC.aspx +++ b/Contabilidad/RepGastosCC.aspx @@ -223,8 +223,6 @@ table.adssigscroll { - - From 97063dc656afa212536fd09a9b057b037c700edd Mon Sep 17 00:00:00 2001 From: rrene Date: Wed, 23 Apr 2025 11:04:42 -0700 Subject: [PATCH 4/5] =?UTF-8?q?--=20permitir=20vac=C3=ADo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Empresas/186/Formatos/EtiquetaDeRecepcion.rdlc | 1 + 1 file changed, 1 insertion(+) diff --git a/Empresas/186/Formatos/EtiquetaDeRecepcion.rdlc b/Empresas/186/Formatos/EtiquetaDeRecepcion.rdlc index 66e9b3b1a..59ee6a556 100644 --- a/Empresas/186/Formatos/EtiquetaDeRecepcion.rdlc +++ b/Empresas/186/Formatos/EtiquetaDeRecepcion.rdlc @@ -244,6 +244,7 @@ String ReportParameter1 + true String From 471a607e0cf9b795da7bab2c6980311465bd5ac1 Mon Sep 17 00:00:00 2001 From: Jonathan Alexis Perez Morales Date: Wed, 23 Apr 2025 18:50:16 -0700 Subject: [PATCH 5/5] --CveCorte a generar venta --- Ventas/PVCobranza.aspx.vb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Ventas/PVCobranza.aspx.vb b/Ventas/PVCobranza.aspx.vb index d1958d9ca..f4754e316 100644 --- a/Ventas/PVCobranza.aspx.vb +++ b/Ventas/PVCobranza.aspx.vb @@ -747,7 +747,7 @@ Partial Class Ventas_PVCobranza CveVentaRemision = HdnCveVenta.Value.ToEntero - respFactura = GenerarFactura(CveVendedor, VentaActual, ObjVentas2, ObjClientes, ObservacionesAlmacen, VentaContado, PlazoCobranza, Observaciones, PedidoContrato, OrdenCompra) + respFactura = GenerarFactura(tCveCorte, CveVendedor, VentaActual, ObjVentas2, ObjClientes, ObservacionesAlmacen, VentaContado, PlazoCobranza, Observaciones, PedidoContrato, OrdenCompra) If respFactura Is Nothing Then MsgError = "Ocurrió un error al generar la factura" @@ -1281,7 +1281,7 @@ Partial Class Ventas_PVCobranza UpL.Update() End Sub - Private Function GenerarFactura(CveVendedor As Integer, ByRef VentaRemision As Venta, ByRef ObjVentas As ClsVentas, ByRef ObjClientes As ClsClientes, ObservacionesAlmacen As String, VentaConta As Boolean, PlazoCobranza As Integer, Observaciones As String, PedidoContrato As String, OrdenCompra As String) As Modelos.Factura.MMensajeFactura + Private Function GenerarFactura(CveCorte As Integer, CveVendedor As Integer, ByRef VentaRemision As Venta, ByRef ObjVentas As ClsVentas, ByRef ObjClientes As ClsClientes, ObservacionesAlmacen As String, VentaConta As Boolean, PlazoCobranza As Integer, Observaciones As String, PedidoContrato As String, OrdenCompra As String) As Modelos.Factura.MMensajeFactura Dim Retorno As Modelos.Factura.MMensajeFactura = Nothing Dim SbAlert As New StringBuilder() Dim SBAmortizaciones As New StringBuilder @@ -1466,6 +1466,8 @@ Partial Class Ventas_PVCobranza End If End If + ObjFactura.CveCorte = CveCorte + Retorno = ObjFactura.EmitirFactura(False, Transac:=ObjVentas.IniciaTransacSQL(), Modulo:="Cobranza/GuardarVenta", MostrarURL:=True) Retorno.Factura = ObjFactura