From cff37448245627b9d1138f63f80edc3a4686c290 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 18 Apr 2024 19:43:17 -0700 Subject: [PATCH 01/12] =?UTF-8?q?--=20preparaci=C3=B3n=20para=20cambio=20e?= =?UTF-8?q?n=20redireccionamiento=20sobre=20la=20base=20de=20datos.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App_Code/ClsAC.vb | 2 +- App_Code/ClsAF.vb | 2 +- App_Code/ClsAIMMGM.vb | 2 +- App_Code/ClsAcarreos.vb | 2 +- App_Code/ClsBancos.vb | 2 +- App_Code/ClsBase.vb | 6 ++-- App_Code/ClsCGame.vb | 2 +- App_Code/ClsCRM.vb | 2 +- App_Code/ClsClaseBase.vb | 2 +- App_Code/ClsClasificaciones.vb | 2 +- App_Code/ClsClientes.vb | 2 +- App_Code/ClsCompEstatusFactura.vb | 2 +- App_Code/ClsCompProveedores.vb | 2 +- App_Code/ClsCompras.vb | 2 +- App_Code/ClsContabilidad.vb | 2 +- App_Code/ClsContratos.vb | 2 +- App_Code/ClsDesarrollo.vb | 2 +- App_Code/ClsEdoc.vb | 2 +- App_Code/ClsEdocumentacion.vb | 2 +- App_Code/ClsEncuestas.vb | 2 +- App_Code/ClsEsquemasComisiones.vb | 2 +- App_Code/ClsEstatusFactura.vb | 2 +- App_Code/ClsEventos.vb | 2 +- App_Code/ClsFISConfiguracion.vb | 2 +- App_Code/ClsFinanzas.vb | 2 +- App_Code/ClsFlotillas.vb | 2 +- App_Code/ClsGPS.vb | 2 +- App_Code/ClsGPSHerramientas.vb | 2 +- App_Code/ClsGenerales.vb | 2 +- App_Code/ClsGralFolios.vb | 2 +- ...lsGralProductosServiciosCaracteristicas.vb | 2 +- App_Code/ClsImpuestos.vb | 2 +- App_Code/ClsIndicadores.vb | 2 +- App_Code/ClsInventarios.vb | 2 +- App_Code/ClsLeyendasFiscales.vb | 2 +- App_Code/ClsMF.vb | 2 +- App_Code/ClsMetodosPagos.vb | 30 +++++++++---------- App_Code/ClsModulos.vb | 2 +- App_Code/ClsMonedas.vb | 2 +- App_Code/ClsMovimientos.vb | 2 +- App_Code/ClsNominas.vb | 4 +-- App_Code/ClsOC.vb | 2 +- App_Code/ClsOIEventos.vb | 2 +- App_Code/ClsOS.vb | 2 +- App_Code/ClsPV.vb | 2 +- App_Code/ClsPaginas.vb | 18 +++++++++-- App_Code/ClsPresupuestos.vb | 2 +- App_Code/ClsProductosServicios.vb | 4 +-- App_Code/ClsProsEncuestas.vb | 2 +- App_Code/ClsProspectos.vb | 2 +- App_Code/ClsProyectos.vb | 2 +- App_Code/ClsPruebasJJMQ.vb | 2 +- App_Code/ClsPuntoVenta.vb | 2 +- App_Code/ClsRH.vb | 2 +- App_Code/ClsRMA.vb | 2 +- App_Code/ClsRutas.vb | 2 +- App_Code/ClsSAT.vb | 2 +- App_Code/ClsSCTLicencias.vb | 4 +-- App_Code/ClsSeguimiento.vb | 2 +- App_Code/ClsSisEmpresas.vb | 4 +-- App_Code/ClsSisNotificaciones.vb | 2 +- App_Code/ClsSisParametros.vb | 2 +- App_Code/ClsSisProcesos.vb | 2 +- App_Code/ClsSisRoles.vb | 2 +- App_Code/ClsSisUsuarios.vb | 6 ++-- App_Code/ClsStiReports.vb | 2 +- App_Code/ClsSubProyectos.vb | 2 +- App_Code/ClsSucursales.vb | 2 +- App_Code/ClsSucursales.vb.exclude | 2 +- App_Code/ClsTemporal.vb | 2 +- App_Code/ClsTiposEventos.vb | 2 +- App_Code/ClsUnidadesMedida.vb | 4 +-- App_Code/ClsVentas.vb | 22 ++++++++++++-- App_Code/ClsVtaPromociones.vb | 2 +- App_Code/ClsVtaVendedores.vb | 4 +-- App_Code/Empresa.vb | 1 + LogIn.aspx.vb | 13 ++++---- MQ/ClsAF.vb | 2 +- 78 files changed, 141 insertions(+), 109 deletions(-) diff --git a/App_Code/ClsAC.vb b/App_Code/ClsAC.vb index 7cfe17261..947830fc4 100644 --- a/App_Code/ClsAC.vb +++ b/App_Code/ClsAC.vb @@ -41,7 +41,7 @@ Public Class ClsAC If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsAF.vb b/App_Code/ClsAF.vb index a1197aa13..eb935027b 100644 --- a/App_Code/ClsAF.vb +++ b/App_Code/ClsAF.vb @@ -100,7 +100,7 @@ Public Class ClsAF If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsAIMMGM.vb b/App_Code/ClsAIMMGM.vb index 70a4b2ddb..e3521eb2a 100644 --- a/App_Code/ClsAIMMGM.vb +++ b/App_Code/ClsAIMMGM.vb @@ -50,7 +50,7 @@ Public Class ClsAIMMGM If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection SqlCommand = New SqlCommand("", SqlConexion) - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsAcarreos.vb b/App_Code/ClsAcarreos.vb index e192b5e48..447932c3b 100644 --- a/App_Code/ClsAcarreos.vb +++ b/App_Code/ClsAcarreos.vb @@ -35,7 +35,7 @@ Public Class ClsAcarreos If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsBancos.vb b/App_Code/ClsBancos.vb index 871e4c4b8..9e1e30aa8 100644 --- a/App_Code/ClsBancos.vb +++ b/App_Code/ClsBancos.vb @@ -176,7 +176,7 @@ Public Class ClsBancos If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsBase.vb b/App_Code/ClsBase.vb index 88069ab6c..4092ccec9 100644 --- a/App_Code/ClsBase.vb +++ b/App_Code/ClsBase.vb @@ -35,7 +35,7 @@ Public Class ClsBase SqlConexion = New SqlConnection SqlAdapter = New SqlDataAdapter("", SqlConexion) sqlCommand = New SqlCommand("", SqlConexion) - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception @@ -48,11 +48,11 @@ Public Class ClsBase If SqlConexion Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB End If If SqlConexion.ConnectionString = "" Then - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB End If If SqlConexion.State <> ConnectionState.Open Then diff --git a/App_Code/ClsCGame.vb b/App_Code/ClsCGame.vb index bea872334..753dfe152 100644 --- a/App_Code/ClsCGame.vb +++ b/App_Code/ClsCGame.vb @@ -49,7 +49,7 @@ Public Class ClsCGame If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsCRM.vb b/App_Code/ClsCRM.vb index 866c58dfa..a0fb2d0c7 100644 --- a/App_Code/ClsCRM.vb +++ b/App_Code/ClsCRM.vb @@ -38,7 +38,7 @@ Public Class ClsCRM If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsClaseBase.vb b/App_Code/ClsClaseBase.vb index 026d983d0..b607febca 100644 --- a/App_Code/ClsClaseBase.vb +++ b/App_Code/ClsClaseBase.vb @@ -34,7 +34,7 @@ Public Class ClsClaseBase EsTransaccion = True Else SqlConexion = New SqlConnection() - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() SqlAdapter = New SqlDataAdapter("", SqlConexion) diff --git a/App_Code/ClsClasificaciones.vb b/App_Code/ClsClasificaciones.vb index bb1535594..fb2c585bf 100644 --- a/App_Code/ClsClasificaciones.vb +++ b/App_Code/ClsClasificaciones.vb @@ -40,7 +40,7 @@ Public Class ClsClasificaciones If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb index 0addaf0c1..5764b4f20 100644 --- a/App_Code/ClsClientes.vb +++ b/App_Code/ClsClientes.vb @@ -168,7 +168,7 @@ Public Class ClsClientes If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsCompEstatusFactura.vb b/App_Code/ClsCompEstatusFactura.vb index 1d25c41b5..6f5547957 100644 --- a/App_Code/ClsCompEstatusFactura.vb +++ b/App_Code/ClsCompEstatusFactura.vb @@ -36,7 +36,7 @@ Public Class ClsCompEstatusFactura If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsCompProveedores.vb b/App_Code/ClsCompProveedores.vb index 51cb4c675..d30f714a2 100644 --- a/App_Code/ClsCompProveedores.vb +++ b/App_Code/ClsCompProveedores.vb @@ -96,7 +96,7 @@ Public Class ClsCompProveedores If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsCompras.vb b/App_Code/ClsCompras.vb index c3f151af4..83ee9fe20 100644 --- a/App_Code/ClsCompras.vb +++ b/App_Code/ClsCompras.vb @@ -56,7 +56,7 @@ Public Class ClsCompras If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsContabilidad.vb b/App_Code/ClsContabilidad.vb index 86a7d6533..9afc08dcc 100644 --- a/App_Code/ClsContabilidad.vb +++ b/App_Code/ClsContabilidad.vb @@ -94,7 +94,7 @@ Public Class ClsContabilidad If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsContratos.vb b/App_Code/ClsContratos.vb index 60795a215..a5899031b 100644 --- a/App_Code/ClsContratos.vb +++ b/App_Code/ClsContratos.vb @@ -63,7 +63,7 @@ Public Class ClsContratos If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsDesarrollo.vb b/App_Code/ClsDesarrollo.vb index d796cb2cb..7095490ea 100644 --- a/App_Code/ClsDesarrollo.vb +++ b/App_Code/ClsDesarrollo.vb @@ -36,7 +36,7 @@ Public Class ClsDesarrollo Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsEdoc.vb b/App_Code/ClsEdoc.vb index 82e6cf1e7..9e05e4671 100644 --- a/App_Code/ClsEdoc.vb +++ b/App_Code/ClsEdoc.vb @@ -92,7 +92,7 @@ Public Class ClsEdoc #End Region Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsEdocumentacion.vb b/App_Code/ClsEdocumentacion.vb index d9ea682f3..d2f56e68f 100644 --- a/App_Code/ClsEdocumentacion.vb +++ b/App_Code/ClsEdocumentacion.vb @@ -47,7 +47,7 @@ Public Class ClsEdocumentacion If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsEncuestas.vb b/App_Code/ClsEncuestas.vb index d7a8e0a51..061eb3349 100644 --- a/App_Code/ClsEncuestas.vb +++ b/App_Code/ClsEncuestas.vb @@ -31,7 +31,7 @@ Public Class ClsEncuestas If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() ConexionAdd() diff --git a/App_Code/ClsEsquemasComisiones.vb b/App_Code/ClsEsquemasComisiones.vb index c5343c3af..4f1197bb7 100644 --- a/App_Code/ClsEsquemasComisiones.vb +++ b/App_Code/ClsEsquemasComisiones.vb @@ -51,7 +51,7 @@ Public Class ClsEsquemasComisiones If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsEstatusFactura.vb b/App_Code/ClsEstatusFactura.vb index 11c8ad64a..6a02b1340 100644 --- a/App_Code/ClsEstatusFactura.vb +++ b/App_Code/ClsEstatusFactura.vb @@ -36,7 +36,7 @@ Public Class ClsEstatusFactura If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsEventos.vb b/App_Code/ClsEventos.vb index 02fccac02..be21fb262 100644 --- a/App_Code/ClsEventos.vb +++ b/App_Code/ClsEventos.vb @@ -49,7 +49,7 @@ Public Class ClsEventos Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsFISConfiguracion.vb b/App_Code/ClsFISConfiguracion.vb index e59bed34d..f37d6d0da 100644 --- a/App_Code/ClsFISConfiguracion.vb +++ b/App_Code/ClsFISConfiguracion.vb @@ -46,7 +46,7 @@ Public Class ClsFISConfiguracion If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsFinanzas.vb b/App_Code/ClsFinanzas.vb index a5d52f0f9..1b1921f60 100644 --- a/App_Code/ClsFinanzas.vb +++ b/App_Code/ClsFinanzas.vb @@ -99,7 +99,7 @@ Public Class ClsFinanzas If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsFlotillas.vb b/App_Code/ClsFlotillas.vb index 569737e73..b6afc7a94 100644 --- a/App_Code/ClsFlotillas.vb +++ b/App_Code/ClsFlotillas.vb @@ -53,7 +53,7 @@ Public Class ClsFlotillas If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsGPS.vb b/App_Code/ClsGPS.vb index 2a38bb5aa..d9b6bad0b 100644 --- a/App_Code/ClsGPS.vb +++ b/App_Code/ClsGPS.vb @@ -52,7 +52,7 @@ Public Class ClsGPS If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsGPSHerramientas.vb b/App_Code/ClsGPSHerramientas.vb index 94a74b82c..770a1a6b0 100644 --- a/App_Code/ClsGPSHerramientas.vb +++ b/App_Code/ClsGPSHerramientas.vb @@ -30,7 +30,7 @@ Public Class ClsGPSHerramientas Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsGenerales.vb b/App_Code/ClsGenerales.vb index 27998c296..ef9e785c4 100644 --- a/App_Code/ClsGenerales.vb +++ b/App_Code/ClsGenerales.vb @@ -76,7 +76,7 @@ Public Class ClsGenerales If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsGralFolios.vb b/App_Code/ClsGralFolios.vb index 44608558c..37b91f2c2 100644 --- a/App_Code/ClsGralFolios.vb +++ b/App_Code/ClsGralFolios.vb @@ -62,7 +62,7 @@ Public Class ClsGralFolios If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsGralProductosServiciosCaracteristicas.vb b/App_Code/ClsGralProductosServiciosCaracteristicas.vb index 593903c4f..82d8d90a9 100644 --- a/App_Code/ClsGralProductosServiciosCaracteristicas.vb +++ b/App_Code/ClsGralProductosServiciosCaracteristicas.vb @@ -43,7 +43,7 @@ Public Class ClsGralProductosServiciosCaracteristicas Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsImpuestos.vb b/App_Code/ClsImpuestos.vb index 8f410fac2..2a4e5a556 100644 --- a/App_Code/ClsImpuestos.vb +++ b/App_Code/ClsImpuestos.vb @@ -33,7 +33,7 @@ Public Class ClsImpuestos If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsIndicadores.vb b/App_Code/ClsIndicadores.vb index c9d8275aa..3b2e685a2 100644 --- a/App_Code/ClsIndicadores.vb +++ b/App_Code/ClsIndicadores.vb @@ -37,7 +37,7 @@ Public Class ClsIndicadores If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsInventarios.vb b/App_Code/ClsInventarios.vb index 2baabb88f..e1327629c 100644 --- a/App_Code/ClsInventarios.vb +++ b/App_Code/ClsInventarios.vb @@ -162,7 +162,7 @@ Public Class ClsInventarios If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsLeyendasFiscales.vb b/App_Code/ClsLeyendasFiscales.vb index 14da05f6f..33a8e1582 100644 --- a/App_Code/ClsLeyendasFiscales.vb +++ b/App_Code/ClsLeyendasFiscales.vb @@ -33,7 +33,7 @@ Public Class ClsLeyendasFiscales Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsMF.vb b/App_Code/ClsMF.vb index 518bbc842..946f78045 100644 --- a/App_Code/ClsMF.vb +++ b/App_Code/ClsMF.vb @@ -32,7 +32,7 @@ Public Class ClsMF If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsMetodosPagos.vb b/App_Code/ClsMetodosPagos.vb index fb55322f8..f6bf0b888 100644 --- a/App_Code/ClsMetodosPagos.vb +++ b/App_Code/ClsMetodosPagos.vb @@ -35,7 +35,7 @@ Public Class ClsMetodosPagos Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception @@ -88,20 +88,20 @@ Public Class ClsMetodosPagos Data = New DataTable End Sub #End Region - Public Function GetMetodosPago() As Boolean - Dim Retorno As Boolean = False - Data = New DataTable - SqlAdapter = New SqlDataAdapter("PA_MetodosPagosGet", SqlConexion) - SqlAdapter.SelectCommand.CommandType = CommandType.StoredProcedure - Try - SqlAdapter.Fill(Data) - Retorno = True - Catch ex As SqlException - OnError("Ocurrió un error al consultar los Métodos de Pago.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - End Try - SqlAdapter.Dispose() - Return Retorno - End Function + 'Public Function GetMetodosPago() As Boolean + ' Dim Retorno As Boolean = False + ' Data = New DataTable + ' SqlAdapter = New SqlDataAdapter("PA_MetodosPagosGet", SqlConexion) + ' SqlAdapter.SelectCommand.CommandType = CommandType.StoredProcedure + ' Try + ' SqlAdapter.Fill(Data) + ' Retorno = True + ' Catch ex As SqlException + ' OnError("Ocurrió un error al consultar los Métodos de Pago.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + ' End Try + ' SqlAdapter.Dispose() + ' Return Retorno + 'End Function #Region "IDisposable Support" diff --git a/App_Code/ClsModulos.vb b/App_Code/ClsModulos.vb index 19610b9bd..fe0b0c94b 100644 --- a/App_Code/ClsModulos.vb +++ b/App_Code/ClsModulos.vb @@ -134,7 +134,7 @@ Public Class ClsModulos Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsMonedas.vb b/App_Code/ClsMonedas.vb index 3a4ac8dcd..ab4a9a58c 100644 --- a/App_Code/ClsMonedas.vb +++ b/App_Code/ClsMonedas.vb @@ -38,7 +38,7 @@ Public Class ClsMonedas If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsMovimientos.vb b/App_Code/ClsMovimientos.vb index de0fa63dd..90618ea70 100644 --- a/App_Code/ClsMovimientos.vb +++ b/App_Code/ClsMovimientos.vb @@ -46,7 +46,7 @@ Public Class ClsMovimientos Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsNominas.vb b/App_Code/ClsNominas.vb index 0f868dd15..c44001a64 100644 --- a/App_Code/ClsNominas.vb +++ b/App_Code/ClsNominas.vb @@ -165,7 +165,7 @@ Public Class ClsNominas End Sub Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() @@ -178,7 +178,7 @@ Public Class ClsNominas If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsOC.vb b/App_Code/ClsOC.vb index 28f1d50fd..029912473 100644 --- a/App_Code/ClsOC.vb +++ b/App_Code/ClsOC.vb @@ -157,7 +157,7 @@ Public Class ClsOC If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsOIEventos.vb b/App_Code/ClsOIEventos.vb index 37c61db00..0e19ccc6d 100644 --- a/App_Code/ClsOIEventos.vb +++ b/App_Code/ClsOIEventos.vb @@ -157,7 +157,7 @@ Public Class ClsOIEventos If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsOS.vb b/App_Code/ClsOS.vb index 1f1c44696..1263b38d9 100644 --- a/App_Code/ClsOS.vb +++ b/App_Code/ClsOS.vb @@ -101,7 +101,7 @@ Public Class ClsOS If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsPV.vb b/App_Code/ClsPV.vb index 0e44deb77..e08ddaa83 100644 --- a/App_Code/ClsPV.vb +++ b/App_Code/ClsPV.vb @@ -52,7 +52,7 @@ Public Class ClsPV If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index dac906bd5..8de66f377 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -77,7 +77,7 @@ Public Class ClsPaginas Usuario.CerrarSession() Return Nothing Else - Return CType(Context.Session("UsuarioSIG"), Usuario) + Return DirectCast(Context.Session("UsuarioSIG"), Usuario) End If Catch ex As Exception Usuario.CerrarSession() @@ -85,6 +85,20 @@ Public Class ClsPaginas End Try End Get End Property + + Public Shared ReadOnly Property UsuarioActualRutaDB() As String + Get + Try + If HttpContext.Current.Session("UsuarioSIG") Is Nothing Then + Return "" + Else + Return DirectCast(HttpContext.Current.Session("UsuarioSIG"), Usuario).Empresa.RutaDB + End If + Catch ex As Exception + Return "" + End Try + End Get + End Property Public Property CveModulo As Integer Get Try @@ -1171,7 +1185,7 @@ Public Class ClsPaginas Get Dim AppNombre As String = "GlobalDTMetodosPago" If DirectCast(HttpContext.Current.Application(AppNombre), DataTable) Is Nothing Then - Dim ObjMetodoPago As New ClsMetodosPagos + Dim ObjMetodoPago As New ClsVentas If ObjMetodoPago.GetMetodosPago() Then HttpContext.Current.Application(AppNombre) = ObjMetodoPago.DtResultados ObjMetodoPago.Dispose() End If diff --git a/App_Code/ClsPresupuestos.vb b/App_Code/ClsPresupuestos.vb index b920feb35..ba7e03dfb 100644 --- a/App_Code/ClsPresupuestos.vb +++ b/App_Code/ClsPresupuestos.vb @@ -52,7 +52,7 @@ Public Class ClsPresupuestos If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsProductosServicios.vb b/App_Code/ClsProductosServicios.vb index c9bcb106e..17d7860aa 100644 --- a/App_Code/ClsProductosServicios.vb +++ b/App_Code/ClsProductosServicios.vb @@ -112,7 +112,7 @@ Public Class ClsProductosServicios Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() @@ -139,7 +139,7 @@ Public Class ClsProductosServicios If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsProsEncuestas.vb b/App_Code/ClsProsEncuestas.vb index f15472b0d..dbe9fb6ea 100644 --- a/App_Code/ClsProsEncuestas.vb +++ b/App_Code/ClsProsEncuestas.vb @@ -38,7 +38,7 @@ Public Class ClsProsEncuestas If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsProspectos.vb b/App_Code/ClsProspectos.vb index 08aa72f85..dc09ffca4 100644 --- a/App_Code/ClsProspectos.vb +++ b/App_Code/ClsProspectos.vb @@ -151,7 +151,7 @@ Public Class ClsProspectos If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsProyectos.vb b/App_Code/ClsProyectos.vb index e5b3fe7a3..d108c8f74 100644 --- a/App_Code/ClsProyectos.vb +++ b/App_Code/ClsProyectos.vb @@ -42,7 +42,7 @@ Public Class ClsProyectos If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsPruebasJJMQ.vb b/App_Code/ClsPruebasJJMQ.vb index 1a812e2b5..4a6abd8f7 100644 --- a/App_Code/ClsPruebasJJMQ.vb +++ b/App_Code/ClsPruebasJJMQ.vb @@ -36,7 +36,7 @@ Public Class ClsPruebasJJMQ Sub New(Optional TransaccionCompartida As SqlTransaction = Nothing) If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsPuntoVenta.vb b/App_Code/ClsPuntoVenta.vb index 6bbffe680..cc16fe654 100644 --- a/App_Code/ClsPuntoVenta.vb +++ b/App_Code/ClsPuntoVenta.vb @@ -74,7 +74,7 @@ Public Class ClsPuntoVenta If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsRH.vb b/App_Code/ClsRH.vb index eeb1d6249..c9290bf53 100644 --- a/App_Code/ClsRH.vb +++ b/App_Code/ClsRH.vb @@ -67,7 +67,7 @@ Public Class ClsRH If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsRMA.vb b/App_Code/ClsRMA.vb index 25726a92e..1b2244b6e 100644 --- a/App_Code/ClsRMA.vb +++ b/App_Code/ClsRMA.vb @@ -46,7 +46,7 @@ Public Class ClsRMA If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsRutas.vb b/App_Code/ClsRutas.vb index bde0252dc..bdafc4943 100644 --- a/App_Code/ClsRutas.vb +++ b/App_Code/ClsRutas.vb @@ -39,7 +39,7 @@ Public Class ClsRutas If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsSAT.vb b/App_Code/ClsSAT.vb index b7eb261df..35de3e019 100644 --- a/App_Code/ClsSAT.vb +++ b/App_Code/ClsSAT.vb @@ -62,7 +62,7 @@ Public Class ClsSAT 'ValidaDepurarConexiones(TransaccionCompartida) If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsSCTLicencias.vb b/App_Code/ClsSCTLicencias.vb index 7ae89385a..41c2b9c4a 100644 --- a/App_Code/ClsSCTLicencias.vb +++ b/App_Code/ClsSCTLicencias.vb @@ -47,7 +47,7 @@ Public Class ClsSCTLicencias Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try @@ -413,7 +413,7 @@ End Class ' Sub New() ' SqlConexion = New SqlConnection -' SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString +' SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB ' Try ' SqlConexion.Open() ' Catch ex As Exception diff --git a/App_Code/ClsSeguimiento.vb b/App_Code/ClsSeguimiento.vb index d3359629a..089a3b2df 100644 --- a/App_Code/ClsSeguimiento.vb +++ b/App_Code/ClsSeguimiento.vb @@ -29,7 +29,7 @@ Public Class ClsSeguimiento Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsSisEmpresas.vb b/App_Code/ClsSisEmpresas.vb index c92c3b19a..a417989b0 100644 --- a/App_Code/ClsSisEmpresas.vb +++ b/App_Code/ClsSisEmpresas.vb @@ -204,11 +204,11 @@ Public Class ClsSisEmpresas 'Public Property PwdContPAQi As String #End Region - Sub New(Optional TransaccionCompartida As SqlTransaction = Nothing) + Sub New(Optional TransaccionCompartida As SqlTransaction = Nothing, Optional NombreCadena As String = "Conexion") If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings(NombreCadena).ConnectionString Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsSisNotificaciones.vb b/App_Code/ClsSisNotificaciones.vb index 26574baba..d4f4ec8be 100644 --- a/App_Code/ClsSisNotificaciones.vb +++ b/App_Code/ClsSisNotificaciones.vb @@ -89,7 +89,7 @@ Public Class ClsSisNotificaciones #End Region Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsSisParametros.vb b/App_Code/ClsSisParametros.vb index 5773f5b29..0f4d8ae89 100644 --- a/App_Code/ClsSisParametros.vb +++ b/App_Code/ClsSisParametros.vb @@ -75,7 +75,7 @@ Public Class ClsSisParametros Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsSisProcesos.vb b/App_Code/ClsSisProcesos.vb index 5f7e1fd78..9f877382a 100644 --- a/App_Code/ClsSisProcesos.vb +++ b/App_Code/ClsSisProcesos.vb @@ -67,7 +67,7 @@ Public Class ClsSisProcesos Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsSisRoles.vb b/App_Code/ClsSisRoles.vb index c6777a6eb..6cc5d759b 100644 --- a/App_Code/ClsSisRoles.vb +++ b/App_Code/ClsSisRoles.vb @@ -37,7 +37,7 @@ Public Class ClsSisRoles If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsSisUsuarios.vb b/App_Code/ClsSisUsuarios.vb index fcebdda87..9ce9d0deb 100644 --- a/App_Code/ClsSisUsuarios.vb +++ b/App_Code/ClsSisUsuarios.vb @@ -63,11 +63,11 @@ Public Class ClsSisUsuarios Public Property DescuentoAutorizado As Double #End Region - Sub New(Optional TransaccionCompartida As SqlTransaction = Nothing) + Sub New(Optional TransaccionCompartida As SqlTransaction = Nothing, Optional NombreCadena As String = "Conexion") If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings(NombreCadena).ConnectionString Try SqlConexion.Open() Catch ex As Exception @@ -3171,7 +3171,7 @@ End Class ' Sub New() ' SqlConexion = New SqlConnection -' SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString +' SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB ' Try ' SqlConexion.Open() ' Catch ex As Exception diff --git a/App_Code/ClsStiReports.vb b/App_Code/ClsStiReports.vb index 8d000882f..28563b8e4 100644 --- a/App_Code/ClsStiReports.vb +++ b/App_Code/ClsStiReports.vb @@ -43,7 +43,7 @@ Public Class ClsStiReports Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsSubProyectos.vb b/App_Code/ClsSubProyectos.vb index 2215fda48..bf6419ecc 100644 --- a/App_Code/ClsSubProyectos.vb +++ b/App_Code/ClsSubProyectos.vb @@ -36,7 +36,7 @@ Public Class ClsSubProyectos If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsSucursales.vb b/App_Code/ClsSucursales.vb index de03554ce..57407d3c7 100644 --- a/App_Code/ClsSucursales.vb +++ b/App_Code/ClsSucursales.vb @@ -99,7 +99,7 @@ Public Class ClsSucursales If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsSucursales.vb.exclude b/App_Code/ClsSucursales.vb.exclude index b7d3f0f00..9dcdcf579 100644 --- a/App_Code/ClsSucursales.vb.exclude +++ b/App_Code/ClsSucursales.vb.exclude @@ -101,7 +101,7 @@ Public Class ClsSucursales If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsTemporal.vb b/App_Code/ClsTemporal.vb index 75e1af8bf..642e06bb7 100644 --- a/App_Code/ClsTemporal.vb +++ b/App_Code/ClsTemporal.vb @@ -36,7 +36,7 @@ Public Class ClsTemporal If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsTiposEventos.vb b/App_Code/ClsTiposEventos.vb index 9da834644..b1f8a4e09 100644 --- a/App_Code/ClsTiposEventos.vb +++ b/App_Code/ClsTiposEventos.vb @@ -36,7 +36,7 @@ Public Class ClsTiposEventos Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsUnidadesMedida.vb b/App_Code/ClsUnidadesMedida.vb index ce7dd2a8b..d65865b1d 100644 --- a/App_Code/ClsUnidadesMedida.vb +++ b/App_Code/ClsUnidadesMedida.vb @@ -34,7 +34,7 @@ Public Class ClsUnidadesMedida Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() @@ -59,7 +59,7 @@ Public Class ClsUnidadesMedida If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb index 1f852c7c0..ff6047d0b 100644 --- a/App_Code/ClsVentas.vb +++ b/App_Code/ClsVentas.vb @@ -80,7 +80,7 @@ Public Class ClsVentas If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception @@ -275,6 +275,20 @@ Public Class ClsVentas Return Retorno End Function + + Public Function GetMetodosPago() As Boolean + Dim Retorno As Boolean = False + + DataAdapter("PA_MetodosPagosGet") + Try + SqlAdapter.Fill(Data) + Retorno = True + Catch ex As SqlException + OnError("Ocurrió un error al consultar los Métodos de Pago.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) + End Try + SqlAdapter.Dispose() + Return Retorno + End Function Public Function GetVentas(CveEmpresa As Integer, TipoDocto As String, Serie As String, Folio As Integer, Codigo As String, CveCliente As Integer, CveSubProyecto As Integer, CveEstatus As Integer, CveUsuario As Integer, FechaI As String, FechaF As String, FolioFiscal As String, Optional CveClienteSucursal As Integer = -1, Optional CvePS As Integer = -1, Optional PedidoContrato As String = "-1", Optional OrdenCompra As String = "-1", Optional CveUsuarioConsulta As Integer = -1, Optional ClienteRFC As String = "-1", @@ -1620,7 +1634,7 @@ Public Class ClsVentas CveVendedor As String, CveUsuario As Integer, CveEstatus As String, IVA As String, CveEmpresa As Integer, Gpo As Integer, Optional TipoDocto As String = "-1", Optional CveProyecto As Integer = -1, Optional CveSubProyecto As String = "-1", Optional TipoCambio As Integer = 1, Optional TCEspecifico As Decimal = -1, Optional CveUsuarioConsulta As Integer = -1, Optional CveClienteClasificacion As Integer = -1, Optional CveCondicionesPago As Integer = -1, Optional TipoCliente As Integer = -1, Optional ModalidadContable As Boolean = False, - Optional EsDistribuidor As Integer = -1, Optional CveTipoRelacion As Integer = -1, Optional ServicioDomicilio As Integer = -1) As Boolean + Optional EsDistribuidor As Integer = -1, Optional CveTipoRelacion As Integer = -1, Optional ServicioDomicilio As Integer = -1, Optional EsFacturaGlobal As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_VentasGetRep") @@ -1651,6 +1665,7 @@ Public Class ClsVentas .Add("@ModalidadContable", SqlDbType.Bit).Value = ModalidadContable .Add("@CveTipoRelacion", SqlDbType.Int).Value = CveTipoRelacion .Add("@ServicioDomicilio", SqlDbType.Int).Value = ServicioDomicilio + .Add("@EsFacturaGlobal", SqlDbType.Int).Value = EsFacturaGlobal End With Try @@ -1757,7 +1772,7 @@ Public Class ClsVentas CveSubProyectoEjecucion As Integer, CveEmpresa As Integer, FechaIEjec As Date, FechaFEjec As Date, Optional CveProyecto As Integer = -1, Optional CveSubProyecto As String = "-1", Optional TipoCambio As Integer = 1, Optional TCEspecifico As Decimal = -1, Optional CveMoneda As Integer = -1, Optional CveUsuarioConsulta As Integer = -1, Optional CveClienteClasificacion As Integer = -1, Optional CveCondicionesPago As Integer = -1, Optional TipoCliente As Integer = -1, Optional ModalidadContable As Boolean = False, - Optional EsDistribuidor As Integer = -1, Optional CveTipoRelacion As Integer = -1, Optional ServicioDomicilio As Integer = -1) As Boolean + Optional EsDistribuidor As Integer = -1, Optional CveTipoRelacion As Integer = -1, Optional ServicioDomicilio As Integer = -1, Optional EsFacturaGlobal As Integer = -1) As Boolean Dim Retorno As Boolean = False DataAdapter("PA_Vta_VentasGetRepDetalle") @@ -1793,6 +1808,7 @@ Public Class ClsVentas .Add("@ModalidadContable", SqlDbType.Bit).Value = ModalidadContable .Add("@CveTipoRelacion", SqlDbType.Int).Value = CveTipoRelacion .Add("@ServicioDomicilio", SqlDbType.Int).Value = ServicioDomicilio + .Add("@EsFacturaGlobal", SqlDbType.Int).Value = EsFacturaGlobal End With Try diff --git a/App_Code/ClsVtaPromociones.vb b/App_Code/ClsVtaPromociones.vb index 1df18d9a2..8b88f74e9 100644 --- a/App_Code/ClsVtaPromociones.vb +++ b/App_Code/ClsVtaPromociones.vb @@ -34,7 +34,7 @@ Public Class ClsVtaPromociones Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() diff --git a/App_Code/ClsVtaVendedores.vb b/App_Code/ClsVtaVendedores.vb index e6bd8101b..a4e7dfc10 100644 --- a/App_Code/ClsVtaVendedores.vb +++ b/App_Code/ClsVtaVendedores.vb @@ -29,7 +29,7 @@ Public Class ClsVtaVendedores Sub New() SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB SqlAdapter = New SqlDataAdapter("", SqlConexion) Try SqlConexion.Open() @@ -43,7 +43,7 @@ Public Class ClsVtaVendedores If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception diff --git a/App_Code/Empresa.vb b/App_Code/Empresa.vb index 2b0d41c6f..5431ad41a 100644 --- a/App_Code/Empresa.vb +++ b/App_Code/Empresa.vb @@ -97,6 +97,7 @@ Public Class Empresa Public Property Timbres As Integer Public Property _RutaArchivos As String Public Property ContaFormatoCuenta As String + Public Property RutaDB As String Public ReadOnly Property Ruta As String Get diff --git a/LogIn.aspx.vb b/LogIn.aspx.vb index db5fa348b..3cafc0939 100644 --- a/LogIn.aspx.vb +++ b/LogIn.aspx.vb @@ -1,7 +1,6 @@ Imports System.Data Imports System.IdentityModel.Tokens.Jwt -Imports System.Security.Claims -Imports ADSNetLibrary.Application.Conexiones.Api +Imports System.Security.Claims Imports ADSSession Imports Extensiones Imports Microsoft.IdentityModel.Tokens @@ -208,10 +207,11 @@ Partial Class LogIn If BtnLogIn_Clickenter = 0 Then 'esta variable se recicla con cada postaback BtnLogIn_Clickenter = 1 Dim tGrupoEmpresa As String = "" + Dim NombreCadena As String = "Conexion" If Request.Url.Host.ToUpper().Contains("EMD".ToUpper()) Then tGrupoEmpresa = "EMD" If Request.Url.Host.ToUpper().Contains("BDH".ToUpper()) Then tGrupoEmpresa = "BDH" - If Request.Url.Host.ToUpper().Contains("ECONOLLANTAS".ToUpper()) Then tGrupoEmpresa = "ECONOLLANTAS" + If Request.Url.Host.ToUpper().Contains("ECONOLLANTAS".ToUpper()) Then tGrupoEmpresa = "ECONOLLANTAS" : NombreCadena = "Conexion" If Request.Url.Host.ToUpper().Contains("JAM".ToUpper()) Then tGrupoEmpresa = "JAM" If Request.Url.Host.ToUpper().Contains("CITRUS".ToUpper()) Then tGrupoEmpresa = "CITRUS" If Request.Url.Host.ToUpper().Contains("KINO".ToUpper()) Then tGrupoEmpresa = "KINO" @@ -224,7 +224,7 @@ Partial Class LogIn If Request.Url.Host.ToUpper().Contains("GRUPODIAZ".ToUpper()) Then tGrupoEmpresa = "GRUPODIAZ" If Request.Url.Host.ToUpper().Contains("FERRETERA".ToUpper()) Then tGrupoEmpresa = "FERRETERA" - Dim ObjUsuario As New ClsSisUsuarios + Dim ObjUsuario As New ClsSisUsuarios(NombreCadena:=NombreCadena) Dim Usuario As Usuario = Nothing Dim isgps As Boolean = Request.Url.Host.ToUpper().Contains("SIGNALSGPS".ToUpper()) @@ -240,7 +240,7 @@ Partial Class LogIn If Usuario IsNot Nothing Then If Not Usuario.AutorizadoxIP OrElse (HddAdsCodex.Text.Length > 0 AndAlso Usuario.CodigoAutorizado = HddAdsCodex.Text) Then - CreaObjetoEmpresa(Usuario) + CreaObjetoEmpresa(Usuario, NombreCadena) ADSSessionConfig.sessionUser.MultipleEmpresa = True Dim x As New ADSSessionObj(Usuario.CveUsuario, Usuario.CveEmpresa) @@ -343,7 +343,7 @@ Partial Class LogIn End If End Function - Private Sub CreaObjetoEmpresa(ByRef UsuarioActual As Usuario) + Private Sub CreaObjetoEmpresa(ByRef UsuarioActual As Usuario, Optional NombreCadena As String = "Conexion") Dim ObjEmpresa As New ClsSisEmpresas() If ObjEmpresa.GetEmpresas(UsuarioActual.CveEmpresa, "-1", "-1", "-1", "-1") Then @@ -358,6 +358,7 @@ Partial Class LogIn End If UsuarioActual.Empresa = ObjEmpresa.Empresa + If UsuarioActual.Empresa.RutaDB = "" Then UsuarioActual.Empresa.RutaDB = ConfigurationManager.ConnectionStrings(NombreCadena).ConnectionString Else End If ObjEmpresa.Dispose() diff --git a/MQ/ClsAF.vb b/MQ/ClsAF.vb index 43efb1c7c..2d7c2dfb6 100644 --- a/MQ/ClsAF.vb +++ b/MQ/ClsAF.vb @@ -147,7 +147,7 @@ Public Class ClsAF ValidaDepurarConexiones(TransaccionCompartida) If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString + SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB Try SqlConexion.Open() Catch ex As Exception From 1ba150f8ebd94e52ec3dd42a74d742ace643c62f Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 18 Apr 2024 19:43:41 -0700 Subject: [PATCH 02/12] -- mejora en RNC --- Compras/Compras.aspx.vb | 2 +- Contabilidad/RegPrePolizaS.aspx.vb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb index 21147d7f7..ace5f8509 100644 --- a/Compras/Compras.aspx.vb +++ b/Compras/Compras.aspx.vb @@ -20931,7 +20931,7 @@ Partial Class Compras_Compras CompraRNCProntoPago.ConfiguraRegistroRapido(CvePS_RNC, CveUM, UM, CveClasificacion, Clasificacion, PS, CveSubProyectoPrincipal, SubProyecto, ImporteRNCProntoPago, (ImporteRNCProntoPago + IVARNCProntoPago), IVARNCProntoPago, PorcentajeIVA) If CompraRNCProntoPago.AddCompra(sqltransaccion) Then - Dim tImporteRNCProntoPago = ImporteRNCProntoPago + IVARNC ' le agrego el importe del iva + Dim tImporteRNCProntoPago = ImporteRNCProntoPago + IVARNCProntoPago ' le agrego el importe del iva Dim Pago As New CompraPago Pago.ImportePago = tImporteRNCProntoPago Pago.CveMonedaPago = CompraActual.CveMoneda diff --git a/Contabilidad/RegPrePolizaS.aspx.vb b/Contabilidad/RegPrePolizaS.aspx.vb index d3f7770d9..bbf936287 100644 --- a/Contabilidad/RegPrePolizaS.aspx.vb +++ b/Contabilidad/RegPrePolizaS.aspx.vb @@ -451,7 +451,7 @@ Partial Class ContabilidadC_RegPrePolizaS TxtFolio.Text = dr("FolioPoliza").ToString TxtUsuarioElaboro.Text = dr("Usuario").ToString TxtFechaelaboracion.Text = dr("FechaIng").ToString.ToDate.ToString("dd/MM/yyyy") - TxtFechaelaboracion.ToolTip = dr("FechaIng").ToString.ToDate.ToShortTimeString + TxtFechaelaboracion.ToolTip = dr("FechaIng").ToString.ToDate.ToString("HH:mm:ss") CvePlantillaPoliza = dr("CvePlantillaPoliza").ToString.ToEntero DdlPlantilla.SelectedValueExist(CvePlantillaPoliza) HplImprimirPDF.NavigateUrl = $"/Compras/PopUpVerFactura.aspx?P={Encripta($"OP=PREPO&CvePrePoliza={CvePrePoliza}")}" From 1a52123f5241ae6e2972f422f0cc2a540106e50e Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 18 Apr 2024 19:43:55 -0700 Subject: [PATCH 03/12] =?UTF-8?q?-=20nuevo=20par=C3=A1metro=20de=20factura?= =?UTF-8?q?global?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ventas/RepVentas.aspx | 9 ++++++++- Ventas/RepVentas.aspx.vb | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Ventas/RepVentas.aspx b/Ventas/RepVentas.aspx index 15ca9b94b..5b1465d50 100644 --- a/Ventas/RepVentas.aspx +++ b/Ventas/RepVentas.aspx @@ -342,7 +342,14 @@ No - + Factura Global: +
+ + Todos + Solo Globales + Sin Globales + +
diff --git a/Ventas/RepVentas.aspx.vb b/Ventas/RepVentas.aspx.vb index a36e18d48..5c09aaab2 100644 --- a/Ventas/RepVentas.aspx.vb +++ b/Ventas/RepVentas.aspx.vb @@ -138,6 +138,11 @@ Partial Class Ventas_RepVentas DdlEstatus.ClearSelection() End If End If + If UsuarioActual.Empresa.Funcionalidad(109) = "1" Then + LblFacturaGlobal.Visible = True + DivFacturaGlobal.Visible = True + End If + PrePersonalizacion() CargaPersonalizacion() @@ -265,7 +270,7 @@ Partial Class Ventas_RepVentas If ObjVentas.GetRepVentas(FechaI, FechaF, FechaIEjec, FechaFEjec, CveCliente, DdlSubProyectoEjecucion.SelectedValue.ToEntero, Vendedores, DdlUsuario.SelectedValue.ToEntero, Estatus, "-1", UsuarioActual.CveEmpresa, DdlGrupo.SelectedValue.ToEntero, TipoComprobante, DdlProyecto.SelectedValue.ToEntero, Sucursales, RblTipoCambio.SelectedValue.ToEntero, TCEspecifico, CveUsuarioConsulta:=UsuarioActual.CveUsuario, CveClienteClasificacion:=DdlClienteClasificacion.SelectedValue.ToEntero, CveCondicionesPago:=DdlCondicionesPago.SelectedValue.ToEntero, TipoCliente:=DdlTipoCliente.SelectedValue.ToEntero, ModalidadContable:=ModalidadContable, - EsDistribuidor:=DdlDistribuidor.SelectedValue.ToEntero, CveTipoRelacion:=DdlTipoRelacion.SelectedValue.ToEntero(), ServicioDomicilio:=DdlServicioDomicilio.SelectedValue.ToEntero) Then + EsDistribuidor:=DdlDistribuidor.SelectedValue.ToEntero, CveTipoRelacion:=DdlTipoRelacion.SelectedValue.ToEntero(), ServicioDomicilio:=DdlServicioDomicilio.SelectedValue.ToEntero, EsFacturaGlobal:=DdlFacturaGlobal.SelectedValue.ToEntero) Then GvDatos.DataSource = ObjVentas.DtResultados DtVentas = ObjVentas.DtResultados Else From 7bb7a6cc6fbfff738dbca26059fa1a2b0a070ed4 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 18 Apr 2024 19:44:10 -0700 Subject: [PATCH 04/12] - ocultar el registro de PS --- OC/OC.aspx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OC/OC.aspx b/OC/OC.aspx index f6003cce7..c754747cb 100644 --- a/OC/OC.aspx +++ b/OC/OC.aspx @@ -26,7 +26,7 @@ Solicitar Anticipo
  • - Agregar PS + Agregar PS
  • Importar Listado From 675831027782520be7686cfe428082fa8a87e6c0 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 18 Apr 2024 19:44:50 -0700 Subject: [PATCH 05/12] -- mejora en visual --- Sistemas/Usuarios.aspx | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Sistemas/Usuarios.aspx b/Sistemas/Usuarios.aspx index 5e27abb3f..574e98fb5 100644 --- a/Sistemas/Usuarios.aspx +++ b/Sistemas/Usuarios.aspx @@ -42,15 +42,6 @@ -
    -
    - Empresa: -
    -
    - -
    -
    - From 4628c35a7a5eb37ecc3e81ede8830f88c7809672 Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 18 Apr 2024 20:11:30 -0700 Subject: [PATCH 06/12] -- mejora en direccionamiento de conexion string --- App_Code/ClsPaginas.vb | 2 +- App_Code/ClsSisUsuarios.vb | 3 +++ App_Code/Empresa.vb | 2 -- App_Code/Usuario.vb | 9 ++------- Ashx/E119.ashx | 1 + LogIn.aspx.vb | 1 - 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb index 8de66f377..ae4459a62 100644 --- a/App_Code/ClsPaginas.vb +++ b/App_Code/ClsPaginas.vb @@ -92,7 +92,7 @@ Public Class ClsPaginas If HttpContext.Current.Session("UsuarioSIG") Is Nothing Then Return "" Else - Return DirectCast(HttpContext.Current.Session("UsuarioSIG"), Usuario).Empresa.RutaDB + Return DirectCast(HttpContext.Current.Session("UsuarioSIG"), Usuario).RutaDB End If Catch ex As Exception Return "" diff --git a/App_Code/ClsSisUsuarios.vb b/App_Code/ClsSisUsuarios.vb index 9ce9d0deb..be5aa595a 100644 --- a/App_Code/ClsSisUsuarios.vb +++ b/App_Code/ClsSisUsuarios.vb @@ -22,6 +22,7 @@ Public Class ClsSisUsuarios Private disposedValue As Boolean = False ' Para detectar llamadas redundantes 'PARA REGISTRAR CONEXION Private CveConexion As Integer = 0 + Private ConnStr As String = "" #End Region @@ -68,6 +69,7 @@ Public Class ClsSisUsuarios If TransaccionCompartida Is Nothing Then SqlConexion = New SqlConnection SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings(NombreCadena).ConnectionString + ConnStr = ConfigurationManager.ConnectionStrings(NombreCadena).ConnectionString Try SqlConexion.Open() Catch ex As Exception @@ -235,6 +237,7 @@ Public Class ClsSisUsuarios Retorno.CodigoAutorizado = Data.Rows(0)("CodigoAutorizado").ToString() Dim autoip As String = Data.Rows(0)("AutorizadoxIP").ToString().ToUpper() Retorno.AutorizadoxIP = (autoip = "1" OrElse autoip = "TRUE") + Retorno.RutaDB = ConnStr ' Esto es parta el punto de venta Retorno.CveSucursal = Data.Rows(0)("CveSubProyecto").ToString().ToEntero diff --git a/App_Code/Empresa.vb b/App_Code/Empresa.vb index 5431ad41a..5a3da4e8d 100644 --- a/App_Code/Empresa.vb +++ b/App_Code/Empresa.vb @@ -97,8 +97,6 @@ Public Class Empresa Public Property Timbres As Integer Public Property _RutaArchivos As String Public Property ContaFormatoCuenta As String - Public Property RutaDB As String - Public ReadOnly Property Ruta As String Get If Not String.IsNullOrEmpty(_RutaArchivos) AndAlso ClsPaginas.EsProduccion Then diff --git a/App_Code/Usuario.vb b/App_Code/Usuario.vb index 465e618e6..4ddb1d980 100644 --- a/App_Code/Usuario.vb +++ b/App_Code/Usuario.vb @@ -50,23 +50,18 @@ Public Class Usuario Public Property ListaPersonalizacion As Hashtable Public Property Acceso As Integer Public Property TipoControl As Integer - Public Property CvePlataforma As Integer - Public Property DescuentoAutorizado As Double - Public Property AutorizadoxIP As Boolean Public Property CodigoAutorizado As String - Public Property UTCOffset As Integer Public Property PorcentajeMaximoAutorizacion As Decimal Public Property DiasMaximoAutorizacion As Integer - Public Property isLoginseted As Boolean = False - Public Property SesionBloqueada As Boolean = False Public Property ErrorDesbloqueo As Boolean = False - Public Property MsgErrorDesbloqueo As String = "" + Public Property MsgErrorDesbloqueo As String = "" + Public Property RutaDB As String Public ReadOnly Property FechaActualCliente As DateTime Get diff --git a/Ashx/E119.ashx b/Ashx/E119.ashx index 65c24e516..a774331de 100644 --- a/Ashx/E119.ashx +++ b/Ashx/E119.ashx @@ -79,6 +79,7 @@ Public Class E119 : Implements IHttpHandler End If UsuarioActual.Empresa = ObjEmpresa.Empresa + If UsuarioActual.Empresa.RutaDB = "" Then UsuarioActual.Empresa.RutaDB = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString End If ObjEmpresa.Dispose() End Sub diff --git a/LogIn.aspx.vb b/LogIn.aspx.vb index 3cafc0939..44f3d54ac 100644 --- a/LogIn.aspx.vb +++ b/LogIn.aspx.vb @@ -358,7 +358,6 @@ Partial Class LogIn End If UsuarioActual.Empresa = ObjEmpresa.Empresa - If UsuarioActual.Empresa.RutaDB = "" Then UsuarioActual.Empresa.RutaDB = ConfigurationManager.ConnectionStrings(NombreCadena).ConnectionString Else End If ObjEmpresa.Dispose() From 071de5481b6953cf8ea0baa9cbb709478ed6b29b Mon Sep 17 00:00:00 2001 From: rrene Date: Thu, 18 Apr 2024 20:23:17 -0700 Subject: [PATCH 07/12] =?UTF-8?q?--=20unificar=20y=20se=20elimin=C3=B3=20c?= =?UTF-8?q?lsmetodos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App_Code/ClsMetodosPagos.vb | 144 ----------------------------------- Sistemas/CatSesiones.aspx.vb | 2 +- asmx/WS_PuntoVenta.asmx | 2 +- 3 files changed, 2 insertions(+), 146 deletions(-) delete mode 100644 App_Code/ClsMetodosPagos.vb diff --git a/App_Code/ClsMetodosPagos.vb b/App_Code/ClsMetodosPagos.vb deleted file mode 100644 index f6bf0b888..000000000 --- a/App_Code/ClsMetodosPagos.vb +++ /dev/null @@ -1,144 +0,0 @@ -Option Explicit On -Option Strict On - -Imports System.Data -Imports System.Data.SqlClient -Imports Extensiones - -Public Class ClsMetodosPagos - Implements IDisposable - -#Region "Campos" - - 'SQL - Private SqlConexion As SqlConnection - Private SqlAdapter As SqlDataAdapter - Private SqlCommand As SqlCommand - Private Data As DataTable - - 'Atributos de la clase - Private disposedValue As Boolean = False ' Para detectar llamadas redundantes - 'REGISTRAR CONEXIONES ABIERTAS - Private CveConexion As Integer = 0 - -#End Region - -#Region "Propiedades" - - Public ReadOnly Property DtResultados() As DataTable - Get - DtResultados = Data - End Get - End Property - -#End Region - - Sub New() - SqlConexion = New SqlConnection - SqlConexion.ConnectionString = ClsPaginas.UsuarioActualRutaDB - Try - SqlConexion.Open() - Catch ex As Exception - Me.OnError("Ocurrió un error al intentar conectarse a la base de datos.", ex) - End Try - SqlAdapter = New SqlDataAdapter("", SqlConexion) - ConexionAdd() - End Sub -#Region "Conexiones" - - Private Sub ConexionAdd() - If ConfigurationManager.AppSettings("RegistraConexion") IsNot Nothing AndAlso ConfigurationManager.AppSettings("RegistraConexion").ToString() = "1" Then - Try - DataAdapter("PA_Sis_RegistrarConexion") - With SqlAdapter.SelectCommand.Parameters - .Add("@Clase", SqlDbType.VarChar).Value = Me.GetType().Name - .Add("@Modulo", SqlDbType.VarChar).Value = String.Format("{0}?{1}", HttpContext.Current.Request.Url.AbsolutePath.ToString, HttpContext.Current.Request.QueryString.ToString) - .Add("@IDConexion", SqlDbType.Int).Direction = ParameterDirection.Output - End With - SqlAdapter.Fill(Data) - CveConexion = SqlAdapter.SelectCommand.Parameters("@IDConexion").Value.ToString.ToEntero - Catch ex As Exception - OnError("Ocurrió un error registrar la conexión.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - End Try - - End If - End Sub - - Private Sub ConexionClose() - If CveConexion > 0 AndAlso ConfigurationManager.AppSettings("RegistraConexion") IsNot Nothing AndAlso ConfigurationManager.AppSettings("RegistraConexion").ToString() = "1" Then - - DataAdapter(String.Format("UPDATE Sis_Conexiones SET FechaCierre = GETDATE() WHERE CveConexion = {0}", CveConexion), CommandType.Text) - - Try - SqlAdapter.Fill(Data) - - Catch ex As Exception - OnError("Ocurrió un error registrar la conexión.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - End Try - CveConexion = 0 - End If - - End Sub - Private Sub DataAdapter(pStrSQL As String, Optional TipoComando As CommandType = CommandType.StoredProcedure) - With SqlAdapter.SelectCommand - .Parameters.Clear() - .CommandText = pStrSQL - .CommandType = TipoComando - End With - Data = New DataTable - End Sub -#End Region - 'Public Function GetMetodosPago() As Boolean - ' Dim Retorno As Boolean = False - ' Data = New DataTable - ' SqlAdapter = New SqlDataAdapter("PA_MetodosPagosGet", SqlConexion) - ' SqlAdapter.SelectCommand.CommandType = CommandType.StoredProcedure - ' Try - ' SqlAdapter.Fill(Data) - ' Retorno = True - ' Catch ex As SqlException - ' OnError("Ocurrió un error al consultar los Métodos de Pago.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo) - ' End Try - ' SqlAdapter.Dispose() - ' Return Retorno - 'End Function - -#Region "IDisposable Support" - - - ' IDisposable - Protected Overridable Sub Dispose(disposing As Boolean) - If Not Me.disposedValue Then - If disposing Then - ' TODO: dispose managed state (managed objects). - If Not Data Is Nothing Then Data.Dispose() : Data = Nothing - If Not SqlAdapter Is Nothing Then SqlAdapter.Dispose() : SqlAdapter = Nothing - If Not SqlCommand Is Nothing Then SqlCommand.Dispose() : SqlCommand = Nothing - If SqlConexion.State <> ConnectionState.Closed Then SqlConexion.Close() - If Not SqlConexion Is Nothing Then SqlConexion.Dispose() : SqlConexion = Nothing - - End If - - ' TODO: free unmanaged resources (unmanaged objects) and override Finalize() below. - ' TODO: set large fields to null. - End If - Me.disposedValue = True - End Sub - - ' TODO: override Finalize() only if Dispose(disposing As Boolean) above has code to free unmanaged resources. - 'Protected Overrides Sub Finalize() - ' ' Do not change this code. Put cleanup code in Dispose(disposing As Boolean) above. - ' Dispose(False) - ' MyBase.Finalize() - 'End Sub - - ' This code added by Visual Basic to correctly implement the disposable pattern. - Public Sub Dispose() Implements IDisposable.Dispose - ' Do not change this code. Put cleanup code in Dispose(disposing As Boolean) above. - ConexionClose() - Dispose(True) - GC.SuppressFinalize(Me) - End Sub -#End Region - -End Class diff --git a/Sistemas/CatSesiones.aspx.vb b/Sistemas/CatSesiones.aspx.vb index 3211d4219..75c6fbe30 100644 --- a/Sistemas/CatSesiones.aspx.vb +++ b/Sistemas/CatSesiones.aspx.vb @@ -464,7 +464,7 @@ Partial Class Sistemas_CatSesiones 'End Sub Private Sub CargaMetodosPago() - Dim ObjMetodoPago As New ClsMetodosPagos() + Dim ObjMetodoPago As New ClsVentas() If ObjMetodoPago.GetMetodosPago() Then Application("GlobalDTMetodosPago") = ObjMetodoPago.DtResultados Else diff --git a/asmx/WS_PuntoVenta.asmx b/asmx/WS_PuntoVenta.asmx index f212cb3a5..26f317894 100644 --- a/asmx/WS_PuntoVenta.asmx +++ b/asmx/WS_PuntoVenta.asmx @@ -816,7 +816,7 @@ Public Class WS_PuntoVenta #Region "MetodosPago" Public Function GetMetodosPagos() As RespuestaWS - Dim objMetodoPago As New ClsMetodosPagos + Dim objMetodoPago As New ClsVentas Dim Respuesta As New RespuestaWS If objMetodoPago.GetMetodosPago() Then From 44c9edd60a304f0ce633e0d169d9264c2121d82d Mon Sep 17 00:00:00 2001 From: rrene Date: Fri, 19 Apr 2024 07:46:43 -0700 Subject: [PATCH 08/12] -- filtro de facturaglobal --- Ventas/RepVentaDetalle.aspx | 9 ++++++++- Ventas/RepVentaDetalle.aspx.vb | 7 ++++++- Ventas/RepVentas.aspx.vb | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Ventas/RepVentaDetalle.aspx b/Ventas/RepVentaDetalle.aspx index 0dcc648ac..4a72af537 100644 --- a/Ventas/RepVentaDetalle.aspx +++ b/Ventas/RepVentaDetalle.aspx @@ -322,7 +322,14 @@ No - + Factura Global: +
    + + Todos + Solo Globales + Sin Globales + +
    diff --git a/Ventas/RepVentaDetalle.aspx.vb b/Ventas/RepVentaDetalle.aspx.vb index 29b871eef..7850a1bcb 100644 --- a/Ventas/RepVentaDetalle.aspx.vb +++ b/Ventas/RepVentaDetalle.aspx.vb @@ -138,6 +138,10 @@ Partial Class RepVentaDetalle LblServicioDomicilioFiltro.Visible = True DVServicioDomicilio.Visible = True End If + If UsuarioActual.Empresa.Funcionalidad(109) = "1" Then + LblFacturaGlobal.Visible = True + DivFacturaGlobal.Visible = True + End If PrePersonalizacion() CargaPersonalizacion() @@ -218,6 +222,7 @@ Partial Class RepVentaDetalle DdlServicioDomicilio.SelectedValue = If(Request("ServicioDomicilio") IsNot Nothing, Request("ServicioDomicilio").ToString, "-1").ToString + DdlFacturaGlobal.SelectedValue = If(Request("EsFacturaGlobal") IsNot Nothing, Request("EsFacturaGlobal").ToString, "-1").ToString UPFiltros.Update() @@ -438,7 +443,7 @@ Partial Class RepVentaDetalle CveCorte.ToEntero, TipoComprobante, DdlSubProyectoEjecucion.SelectedValue.ToEntero, UsuarioActual.CveEmpresa, FechaIEjec, FechaFEjec, CveProyecto, Sucursales, TipoCambio, TCEspecifico, CveMoneda, CveUsuarioConsulta:=UsuarioActual.CveUsuario, CveClienteClasificacion:=DdlClienteClasificacion.SelectedValue.ToEntero, CveCondicionesPago:=CveCondicionesPago, TipoCliente:=DdlTipoCliente.SelectedValue.ToEntero, ModalidadContable:=Not ChkLecturaAdmin.Checked, CveTipoRelacion:=DdlTipoRelacion.SelectedValue.ToEntero(), - ServicioDomicilio:=DdlServicioDomicilio.SelectedValue.ToEntero) Then + ServicioDomicilio:=DdlServicioDomicilio.SelectedValue.ToEntero, EsFacturaGlobal:=DdlFacturaGlobal.SelectedValue.ToEntero) Then DtVentas = AddRows(ObjVentas.DtResultados) ImgImprimir.Enabled = True GvDatos.DataSource = AddRows(ObjVentas.DtResultados) diff --git a/Ventas/RepVentas.aspx.vb b/Ventas/RepVentas.aspx.vb index 5c09aaab2..2adae64a3 100644 --- a/Ventas/RepVentas.aspx.vb +++ b/Ventas/RepVentas.aspx.vb @@ -479,7 +479,7 @@ Partial Class Ventas_RepVentas 'LIGA A DETALLE - Dim Liga As String = $"/Ventas/RepVentaDetalle.aspx?GPO={DdlGrupo.SelectedValue}&Anio={e.Row.DBCampo("Anio")}&Mes={e.Row.DBCampo("Mes")}&AnioMes={e.Row.DBCampo("AnioMes")}&Fecha={e.Row.DBCampo("Fecha")}&AnioEjec={e.Row.DBCampo("AnioEjec")}&MesEjec={e.Row.DBCampo("MesEjec")}&AnioMesEjec={e.Row.DBCampo("AnioMesEjec")}&FechaEjec={e.Row.DBCampo("FechaEjec")}&CveCliente={e.Row.DBCampo("CveCliente")}&CveVendedor={ e.Row.DBCampo("CveVendedor")}&CveUsuario={e.Row.DBCampo("CveUsuario")}&CveEstatusFactura={e.Row.DBCampo("CveEstatusFactura")}&FechaI={FechaInicial}&FechaF={FechaFinal}&FechaIEjec={FechaIEjec}&FechaFEjec={FechaFEjec}&IVA={e.Row.DBCampo("GPO_IVA")}&CveCorte={ e.Row.DBCampo("CveCorte")}&TipoDocto={ DdlTipoComprobante.GetSelectedValuesM}&CveSubProyectoEjecucion={e.Row.DBCampo("CveSubProyectoEjecucion")}&CveSubProyecto={CveSubProyecto}&CveProyecto={CveProyecto}&TipoCambio={TipoCambio}&TCEspecifico={TCEspecifico}&CveMoneda={CveMoneda}&CveClienteClasificacion={e.Row.DBCampo("CveClienteClasificacion")}&CveCondicionesPago={DdlCondicionesPago.SelectedValue}&TipoCliente={ If(DdlGrupo.SelectedValue.ToEntero = 20, e.Row.DBCampo("TipoCliente"), DdlTipoCliente.SelectedValue)}&ModalidadContable={If(ChkLecturaAdmin.Checked, 0, 1)}&CveTipoRelacion={DdlTipoRelacion.SelectedValue}&ServicioDomicilio={DdlServicioDomicilio.SelectedValue}" + Dim Liga As String = $"/Ventas/RepVentaDetalle.aspx?GPO={DdlGrupo.SelectedValue}&Anio={e.Row.DBCampo("Anio")}&Mes={e.Row.DBCampo("Mes")}&AnioMes={e.Row.DBCampo("AnioMes")}&Fecha={e.Row.DBCampo("Fecha")}&AnioEjec={e.Row.DBCampo("AnioEjec")}&MesEjec={e.Row.DBCampo("MesEjec")}&AnioMesEjec={e.Row.DBCampo("AnioMesEjec")}&FechaEjec={e.Row.DBCampo("FechaEjec")}&CveCliente={e.Row.DBCampo("CveCliente")}&CveVendedor={ e.Row.DBCampo("CveVendedor")}&CveUsuario={e.Row.DBCampo("CveUsuario")}&CveEstatusFactura={e.Row.DBCampo("CveEstatusFactura")}&FechaI={FechaInicial}&FechaF={FechaFinal}&FechaIEjec={FechaIEjec}&FechaFEjec={FechaFEjec}&IVA={e.Row.DBCampo("GPO_IVA")}&CveCorte={ e.Row.DBCampo("CveCorte")}&TipoDocto={ DdlTipoComprobante.GetSelectedValuesM}&CveSubProyectoEjecucion={e.Row.DBCampo("CveSubProyectoEjecucion")}&CveSubProyecto={CveSubProyecto}&CveProyecto={CveProyecto}&TipoCambio={TipoCambio}&TCEspecifico={TCEspecifico}&CveMoneda={CveMoneda}&CveClienteClasificacion={e.Row.DBCampo("CveClienteClasificacion")}&CveCondicionesPago={DdlCondicionesPago.SelectedValue}&TipoCliente={ If(DdlGrupo.SelectedValue.ToEntero = 20, e.Row.DBCampo("TipoCliente"), DdlTipoCliente.SelectedValue)}&ModalidadContable={If(ChkLecturaAdmin.Checked, 0, 1)}&CveTipoRelacion={DdlTipoRelacion.SelectedValue}&ServicioDomicilio={DdlServicioDomicilio.SelectedValue}&EsFacturaGlobal={DdlFacturaGlobal.SelectedValue}" e.Row.FCLiteral("LtlGrupo").Text = "" & e.Row.FCLiteral("LtlGrupo").Text & "" From cd62f9a238edfb9854b8312d786645b066efed15 Mon Sep 17 00:00:00 2001 From: rakcsle Date: Fri, 19 Apr 2024 08:41:30 -0700 Subject: [PATCH 09/12] Kardex siguiente siguiente PS con movimientos (Ajustes) --- Inventarios/Kardex.aspx.vb | 39 ++++++++++++++++++++++++-- Inventarios/KardexAlmacen.aspx.vb | 39 +++++++++++++++++++++++++- Inventarios/RepEntradasSalidas.aspx.vb | 38 ++++++++++++++++++++++++- 3 files changed, 112 insertions(+), 4 deletions(-) diff --git a/Inventarios/Kardex.aspx.vb b/Inventarios/Kardex.aspx.vb index 29b52f758..5811d25d8 100644 --- a/Inventarios/Kardex.aspx.vb +++ b/Inventarios/Kardex.aspx.vb @@ -2,9 +2,11 @@ Option Explicit On Imports System.Data +Imports System.Security.Cryptography.Pkcs Imports ADSNetLibrary.SIGAPI.Models.CGame Imports Extensiones Imports Microsoft.Reporting.WebForms +Imports Telerik.Web.UI Partial Class Inventarios_Kardex Inherits ClsPaginas @@ -569,7 +571,10 @@ Partial Class Inventarios_Kardex Dim CvePS As Integer = ddlProducto2.SelectedValue.ToEntero If Not CvePS > 0 Then - Exit Sub + CvePS = ObtenerInicioPSNavegacion(Siguiente:=Siguiente) + If Not CvePS > 0 Then + Exit Sub + End If End If Dim dt As DataTable = New DataTable @@ -609,6 +614,34 @@ Partial Class Inventarios_Kardex ObjInventarios.Dispose() If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + ddlProducto2.SelectedValue = dt.Rows(0)("CvePS").ToString + ddlProducto2.SelectedText = dt.Rows(0)("CodigoPS").ToString + ddlProducto2.txtValue.Value = dt.Rows(0)("CvePS").ToString + ddlProducto2.txtText.Value = dt.Rows(0)("CodigoPS").ToString + UPFiltros.Update() + UPDatos.Update() + End If + + End Sub + + Private Function ObtenerInicioPSNavegacion(Siguiente As Boolean) As Integer + + Dim CvePSRespuesta As Integer = -1 + Dim dt As DataTable = New DataTable + + If Siguiente Then + If TxtCodigoInicio.Text.Trim.Length > 0 Then + dt = GlobalDTPS(UsuarioActual.CveEmpresa, Codigo:=TxtCodigoInicio.Text.Trim) + End If + Else + If TxtCodigoFinal.Text.Trim.Length > 0 Then + dt = GlobalDTPS(UsuarioActual.CveEmpresa, Codigo:=TxtCodigoFinal.Text.Trim) + End If + End If + + + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + CvePSRespuesta = dt.Rows(0)("CvePS").ToString.ToEntero ddlProducto2.SelectedValue = dt.Rows(0)("CvePS").ToString ddlProducto2.SelectedText = dt.Rows(0)("CodigoPS").ToString ddlProducto2.txtValue.Value = dt.Rows(0)("CvePS").ToString @@ -617,7 +650,9 @@ Partial Class Inventarios_Kardex UPFiltros.Update() UPDatos.Update() End If - End Sub + Return CvePSRespuesta + + End Function End Class diff --git a/Inventarios/KardexAlmacen.aspx.vb b/Inventarios/KardexAlmacen.aspx.vb index f95e5c3b4..bfad31eaa 100644 --- a/Inventarios/KardexAlmacen.aspx.vb +++ b/Inventarios/KardexAlmacen.aspx.vb @@ -212,8 +212,12 @@ Partial Class Inventarios_KardexAlmacen Dim CvePS As Integer = ddlProducto2.SelectedValue.ToEntero If Not CvePS > 0 Then - Exit Sub + CvePS = ObtenerInicioPSNavegacion(Siguiente:=Siguiente) + If Not CvePS > 0 Then + Exit Sub + End If End If + Dim dt As DataTable = New DataTable Dim Entrada As Boolean = True @@ -261,4 +265,37 @@ Partial Class Inventarios_KardexAlmacen End If End Sub + Private Function ObtenerInicioPSNavegacion(Siguiente As Boolean) As Integer + + Dim CvePSRespuesta As Integer = -1 + Dim dt As DataTable = New DataTable + + If Siguiente Then + If TxtCodigoInicio.Text.Trim.Length > 0 Then + 'CvePSRespuesta = GlobalDTPS(UsuarioActual.CveEmpresa, Codigo:=TxtCodigoInicio.Text.Trim).FiltroPrimeroValor("CvePS").ToEntero + dt = GlobalDTPS(UsuarioActual.CveEmpresa, Codigo:=TxtCodigoInicio.Text.Trim) + End If + Else + If TxtCodigoFinal.Text.Trim.Length > 0 Then + 'CvePSRespuesta = GlobalDTPS(UsuarioActual.CveEmpresa, Codigo:=TxtCodigoFinal.Text.Trim).FiltroPrimeroValor("CvePS").ToEntero + dt = GlobalDTPS(UsuarioActual.CveEmpresa, Codigo:=TxtCodigoFinal.Text.Trim) + End If + End If + + + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + CvePSRespuesta = dt.Rows(0)("CvePS").ToString.ToEntero + ddlProducto2.SelectedValue = dt.Rows(0)("CvePS").ToString + ddlProducto2.SelectedText = dt.Rows(0)("CodigoPS").ToString + ddlProducto2.txtValue.Value = dt.Rows(0)("CvePS").ToString + ddlProducto2.txtText.Value = dt.Rows(0)("CodigoPS").ToString + UPFiltros.Update() + + End If + + + Return CvePSRespuesta + + End Function + End Class diff --git a/Inventarios/RepEntradasSalidas.aspx.vb b/Inventarios/RepEntradasSalidas.aspx.vb index 586d6d878..3e299a807 100644 --- a/Inventarios/RepEntradasSalidas.aspx.vb +++ b/Inventarios/RepEntradasSalidas.aspx.vb @@ -586,7 +586,10 @@ Partial Class Inventarios_ReporteEntradasSalidas Dim CvePS As Integer = DdlPS.SelectedValue.ToEntero If Not CvePS > 0 Then - Exit Sub + CvePS = ObtenerInicioPSNavegacion(Siguiente:=Siguiente) + If Not CvePS > 0 Then + Exit Sub + End If End If Dim dt As DataTable = New DataTable @@ -636,6 +639,39 @@ Partial Class Inventarios_ReporteEntradasSalidas End If End Sub + Private Function ObtenerInicioPSNavegacion(Siguiente As Boolean) As Integer + + Dim CvePSRespuesta As Integer = -1 + Dim dt As DataTable = New DataTable + + If Siguiente Then + If TxtCodigoInicio.Text.Trim.Length > 0 Then + 'CvePSRespuesta = GlobalDTPS(UsuarioActual.CveEmpresa, Codigo:=TxtCodigoInicio.Text.Trim).FiltroPrimeroValor("CvePS").ToEntero + dt = GlobalDTPS(UsuarioActual.CveEmpresa, Codigo:=TxtCodigoInicio.Text.Trim) + End If + Else + If TxtCodigoFinal.Text.Trim.Length > 0 Then + 'CvePSRespuesta = GlobalDTPS(UsuarioActual.CveEmpresa, Codigo:=TxtCodigoFinal.Text.Trim).FiltroPrimeroValor("CvePS").ToEntero + dt = GlobalDTPS(UsuarioActual.CveEmpresa, Codigo:=TxtCodigoFinal.Text.Trim) + End If + End If + + + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + CvePSRespuesta = dt.Rows(0)("CvePS").ToString.ToEntero + DdlPS.SelectedValue = dt.Rows(0)("CvePS").ToString + DdlPS.SelectedText = dt.Rows(0)("CodigoPS").ToString + DdlPS.txtValue.Value = dt.Rows(0)("CvePS").ToString + DdlPS.txtText.Value = dt.Rows(0)("CodigoPS").ToString + 'UPFiltros.Update() + UPPMov.Update() + End If + + + Return CvePSRespuesta + + End Function + 'Protected Sub Lnkcompuxlsinventarios_Click(sender As Object, e As EventArgs) ' Dim continuar = True ' Try From 3bc514ab667658c08a5fdb82fc5bb77fa7a17ab7 Mon Sep 17 00:00:00 2001 From: AbrahamCastilloV Date: Fri, 19 Apr 2024 16:49:55 -0700 Subject: [PATCH 10/12] =?UTF-8?q?--Se=20hicieron=20modificaciones=20al=20.?= =?UTF-8?q?mrt=20de=20contratos=20V&A=20y=20se=20agregaron=20otros=20campo?= =?UTF-8?q?s=20para=20su=20impresi=C3=B3n.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Transportes/RepContratoDetalle.aspx.vb | 34 ++++++++++++++++++++------ Transportes/RepContratos.aspx.vb | 2 +- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Transportes/RepContratoDetalle.aspx.vb b/Transportes/RepContratoDetalle.aspx.vb index 2a77ddaaf..946121897 100644 --- a/Transportes/RepContratoDetalle.aspx.vb +++ b/Transportes/RepContratoDetalle.aspx.vb @@ -1,6 +1,10 @@ Option Explicit On Option Strict On +Imports System.Data Imports System.IO +Imports Extensiones +Imports Microsoft.Reporting.WebForms + Partial Class RepContratoDetalle Inherits ClsPaginas @@ -85,6 +89,15 @@ Partial Class RepContratoDetalle ViewState("AsientoSeleccionado") = value End Set End Property + Private Property TelefonoEmpresa As String + Get + Return ViewState("TelefonoEmpresa").ToString() + End Get + Set(value As String) + ViewState("TelefonoEmpresa") = value + End Set + End Property + #End Region #Region "Carga Página" @@ -100,6 +113,7 @@ Partial Class RepContratoDetalle CveViajePasajero = 0 Session("FileExtension") = "" ArchivoUpdate = "" + TelefonoEmpresa = "" End If End Sub @@ -122,7 +136,6 @@ Partial Class RepContratoDetalle Dim Importe As Decimal = Contrato.Rows(0)("Importe").ToString.ToDecimal Dim Pesos As Decimal = Contrato.Rows(0)("ImporteMax").ToString.ToDecimal Dim Anticipo As Decimal = Contrato.Rows(0)("ImporteMin").ToString.ToDecimal - CveContratoTipo = Contrato.Rows(0)("CveContratoTipo").ToString.ToEntero SubProyecto = Contrato.Rows(0)("SubProyecto").ToString CveMasivo = Contrato.Rows(0)("CveMasivo").ToString.ToEntero @@ -132,6 +145,7 @@ Partial Class RepContratoDetalle DdlClientes.SelectedValue = Contrato.Rows(0)("CveCliente").ToString TxtDescripcion.Text = Contrato.Rows(0)("DescripcionContrato").ToString TxtObservaciones.Text = Contrato.Rows(0)("Observaciones").ToString + TelefonoEmpresa = Contrato.Rows(0)("Telefono").ToString TxtUbicacion.Text = Contrato.Rows(0)("Ubicacion").ToString TxtFechaSalida.Text = Contrato.Rows(0)("FechaInicial").ToString TxtFechaRegreso.Text = Contrato.Rows(0)("FechaFinal").ToString @@ -180,7 +194,7 @@ Partial Class RepContratoDetalle #Region "Información General" Protected Sub BtnGuardarArchivo_Click1(sender As Object, e As EventArgs) Handles BtnGuardarArchivo.Click Dim FileExtension As String = "-1" - Dim Filesgral As List(Of Archivo) = Anexo.getfiles().Archivos + Dim Filesgral As List(Of Extensiones.Archivo) = Anexo.getfiles().Archivos Dim Filename As String = "" Dim folderContratosPath As String = Path.Combine(UsuarioActual.Empresa.Ruta, "Contratos") @@ -253,7 +267,7 @@ Partial Class RepContratoDetalle Dim ObjContratos As New ClsContratos ObjContratos.IniciaTransacSQL() Try - If ObjContratos.UpdateContratos(CveContrato, LbFolio.Text, TxtDescripcion.Text, "", UsuarioActual.CveProveedor, DdlClientes.SelectedValue.ToEntero, -1, TxtFechaSalida.Text.ToDate, TxtFechaRegreso.Text.ToDate, TxtUbicacion.Text, "", LbCveSubProyecto.Text.ToEntero, -1, -1, -1, -1, ArchivoUpdate, "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, TxtAnticipo.Text.ToDecimal, -1, TxtImporte.Text.ToDecimal, DdlMoneda.SelectedValue.ToEntero, 0, CveContratoTipo:=CveContratoTipo, CveTipoAF:=DdlTipoAF.SelectedValue.ToEntero, CveContratosEstatus:=CveContratoEstatus) Then + If ObjContratos.UpdateContratos(CveContrato, LbFolio.Text, TxtDescripcion.Text, "", UsuarioActual.CveProveedor, DdlClientes.SelectedValue.ToEntero, -1, TxtFechaSalida.Text.ToDate, TxtFechaRegreso.Text.ToDate, TxtUbicacion.Text, "", LbCveSubProyecto.Text.ToEntero, -1, -1, -1, -1, ArchivoUpdate, "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, TxtAnticipo.Text.ToDecimal, -1, TxtImporte.Text.ToDecimal, DdlMoneda.SelectedValue.ToEntero, 0, CveContratoTipo:=CveContratoTipo, CveTipoAF:=DdlTipoAF.SelectedValue.ToEntero, CveContratosEstatus:=CveContratoEstatus, Observaciones:=TxtObservacion.Text) Then Alert("Contrato actualizado correctamente") End If ObjContratos.Commit() @@ -304,12 +318,16 @@ Partial Class RepContratoDetalle New ReportParameter("Servicio", TxtDescripcion.Text), New ReportParameter("Observaciones", TxtObservaciones.Text), New ReportParameter("Ubicacion", TxtUbicacion.Text), - New ReportParameter("FechaSalida", TxtFechaSalida.Text.ToDate.ToString("HH:mm")), - New ReportParameter("FechaRegreso", TxtFechaRegreso.Text.ToDate.ToString("HH:mm")), + New ReportParameter("FechaSalida", TxtFechaSalida.Text.ToDate.ToString("dd/MM/yyyy")), + New ReportParameter("FechaRegreso", TxtFechaRegreso.Text.ToDate.ToString("dd/MM/yyyy")), New ReportParameter("CantidadPasajeros", TxtCantidadPasajeros.Text), - New ReportParameter("TipoAF", DdlTipoAF.Text), - New ReportParameter("Importe", Math.Round(TxtImporte.Text.ToDecimal, 2).ToString), - New ReportParameter("Anticipo", (TxtAnticipo.Text.ToDecimal * 100).ToString) + New ReportParameter("TipoAF", DdlTipoAF.SelectedItem.ToString()), + New ReportParameter("Pesos", Math.Round(TxtImporte.Text.ToDecimal, 2).ToString), + New ReportParameter("Dolares", Math.Round((TxtImporte.Text.ToDecimal / 17.1), 2).ToString), + New ReportParameter("Anticipo", Math.Round((TxtAnticipo.Text.ToDecimal * TxtImporte.Text.ToDecimal) / 2).ToString), + New ReportParameter("Total", Math.Round((TxtImporte.Text.ToDecimal - (TxtAnticipo.Text.ToDecimal * TxtImporte.Text.ToDecimal)), 2).ToString), + New ReportParameter("DiaSalida", $"{TxtFechaSalida.Text.ToDate.Hour}:{TxtFechaSalida.Text.ToDate.Minute} "), + New ReportParameter("TelefonoEmpresa", TelefonoEmpresa) } ImprimirPDFStimul($"{UsuarioActual.Empresa.Ruta}Formatos\Contrato.mrt", dtResult, params, NombreArchivo:="Contrato") diff --git a/Transportes/RepContratos.aspx.vb b/Transportes/RepContratos.aspx.vb index 135ddb22d..4df1d60ee 100644 --- a/Transportes/RepContratos.aspx.vb +++ b/Transportes/RepContratos.aspx.vb @@ -100,7 +100,7 @@ Partial Class ListadoContratos 'Agregamos Contrato Dim ObjContratos As New ClsContratos ObjContratos.IniciaTransacSQL() - If ObjContratos.AddContratos(LbFolio.Text, TxtDescripcion.Text, "", UsuarioActual.CveProveedor, DdlClientes.SelectedValue.ToEntero, -1, TxtFechaSalida.Text.ToDateTime, TxtFechaRegreso.Text.ToDateTime, TxtUbicacion.Text, "", CveSubProyecto, -1, -1, -1, -1, LbArchivo.Text, "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, TxtAnticipo.Text.ToDecimal, -1, TxtImporte.Text.ToDecimal, DdlMoneda.SelectedValue.ToEntero, 0, CveContratoTipo:=34, CveContratosEstatus:=50, CveTipoAF:=DdlTipoAF.SelectedValue.ToEntero, CantidadPasajeros:=TxtCantidadPasajeros.Text.ToEntero, Observaciones:=TxtObservaciones.Text) > 0 Then + If ObjContratos.AddContratos(LbFolio.Text, TxtDescripcion.Text, "", UsuarioActual.CveProveedor, DdlClientes.SelectedValue.ToEntero, -1, TxtFechaSalida.Text.ToDateTime, TxtFechaRegreso.Text.ToDateTime, TxtUbicacion.Text, "", CveSubProyecto, -1, -1, -1, -1, LbArchivo.Text, "", -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, False, TxtAnticipo.Text.ToDecimal, -1, TxtImporte.Text.ToDecimal, DdlMoneda.SelectedValue.ToEntero, 0, CveContratoTipo:=34, CveContratosEstatus:=50, CveTipoAF:=DdlTipoAF.SelectedValue.ToEntero, CantidadPasajeros:=TxtCantidadPasajeros.Text.ToEntero, Observaciones:=TxtObservaciones.Text, CveVendedor:=UsuarioActual.CveVendedor) > 0 Then ObjContratos.Commit() Alert("Agregado Correctamente.") End If From 302d0694992085e8f45ed3283ed91e6e1938f634 Mon Sep 17 00:00:00 2001 From: rakcsle Date: Fri, 19 Apr 2024 17:21:22 -0700 Subject: [PATCH 11/12] Thread GeneraPDFFactura --- Ventas/Ventas.aspx | 2 +- Ventas/Ventas.aspx.vb | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx index 935689de9..81715ba2b 100644 --- a/Ventas/Ventas.aspx +++ b/Ventas/Ventas.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="Ventas - Facturación" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="Ventas.aspx.vb" Inherits="Ventas" EnableEventValidation="false" %> +<%@ Page Title="Ventas - Facturación" Language="VB" MasterPageFile="~/Site.master" AutoEventWireup="false" CodeFile="Ventas.aspx.vb" Inherits="Ventas" EnableEventValidation="false" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> <%@ Register Src="~/UserControl/AddMedico.ascx" TagPrefix="UserControl" TagName="AddMedico" %> diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index 0706e5dba..86e9bb18b 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -2898,6 +2898,7 @@ Partial Class Ventas End If End If + Else TxtFechaOS.Text = NowADS().ToDateTime.ToString("yyyy-MM-dd HH:mm").Replace(" ", "T") @@ -10770,8 +10771,9 @@ Partial Class Ventas If UsuarioActual.Empresa.Funcionalidad(109) = "1" Then GeneraPDFFactura(ChkEnviarFactura.Checked, Factura, UsuarioActual, "", UsarDescargaDesdePopUpVerFactura:=False) Else + Dim capturedContext = HttpContext.Current Dim strURLHOST As String = String.Format("{0}://{1}:{2}", HttpContext.Current.Request.Url.Scheme, HttpContext.Current.Request.Url.Host, HttpContext.Current.Request.Url.Port) - Dim Hilo As New System.Threading.Thread(Sub() GeneraPDFFactura(ChkEnviarFactura.Checked, Factura, UsuarioActual, strURLHOST)) + Dim Hilo As New System.Threading.Thread(Sub() GeneraPDFFactura(ChkEnviarFactura.Checked, Factura, UsuarioActual, strURLHOST, EsHilo:=True, Contexto:=capturedContext)) Hilo.Start() End If Catch ex As Exception @@ -16307,7 +16309,14 @@ Partial Class Ventas ''' ''' ''' - Private Sub GeneraPDFFactura(EnviaCorreo As Boolean, Factura As Modelos.Factura, UsuarioActual As Usuario, strURLHOST As String, Optional CorreoCRM As String = "", Optional UsarDescargaDesdePopUpVerFactura As Boolean = True) + Private Sub GeneraPDFFactura(EnviaCorreo As Boolean, Factura As Modelos.Factura, UsuarioActual As Usuario, strURLHOST As String, Optional CorreoCRM As String = "", Optional UsarDescargaDesdePopUpVerFactura As Boolean = True, + Optional EsHilo As Boolean = False, Optional Contexto As HttpContext = Nothing) + + If EsHilo Then + HttpContext.Current = Contexto + HttpContext.Current.Session("UsuarioSIG") = UsuarioActual + End If + 'GUARDA PDF Dim LocalSerieFolio As String = String.Empty Dim LocalTipoDocto As String = String.Empty @@ -16368,6 +16377,8 @@ Partial Class Ventas End If End If + + End Sub Private Sub GeneraPDFCotizacion(EnviaCorreo As Boolean, Optional CorreoContactoCRM As String = "", Optional pdfCRM As Byte() = Nothing, Optional SerieFolioCRM As String = "", Optional TipoDoctoCRM As String = "") @@ -17278,9 +17289,10 @@ Partial Class Ventas 'IMPRESION Try 'MANDA CORREO + Dim capturedContext = HttpContext.Current Dim strURLHOST As String = String.Format("{0}://{1}:{2}", HttpContext.Current.Request.Url.Scheme, HttpContext.Current.Request.Url.Host, HttpContext.Current.Request.Url.Port) Dim Factura As New Modelos.Factura(UsuarioActual, CveVenta, UsuarioActual.CveEmpresa, EsCancelacion:=False, CargaDTDetalle:=False, CargaDatosCliente:=False, CargaDatosRelacionados:=False, VerificaAlmacen:=False) - Dim Hilo As New System.Threading.Thread(Sub() GeneraPDFFactura(ChkEnviarFactura.Checked, Factura, UsuarioActual, strURLHOST)) + Dim Hilo As New System.Threading.Thread(Sub() GeneraPDFFactura(ChkEnviarFactura.Checked, Factura, UsuarioActual, strURLHOST, EsHilo:=True, Contexto:=capturedContext)) Hilo.Start() Catch ex As Exception OnError("Ocurrió un error al enviar el PDF", ex) @@ -38113,5 +38125,10 @@ Partial Class Ventas End If End Sub + + + + + End Class From 7d92ef383185c736976e0eccfe81970d09bb7497 Mon Sep 17 00:00:00 2001 From: AbrahamCastilloV Date: Fri, 19 Apr 2024 17:45:21 -0700 Subject: [PATCH 12/12] --Ajustes al tipo de moneda del contrato --- Transportes/RepContratoDetalle.aspx.vb | 3 ++- packages.config | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Transportes/RepContratoDetalle.aspx.vb b/Transportes/RepContratoDetalle.aspx.vb index 946121897..39150edd3 100644 --- a/Transportes/RepContratoDetalle.aspx.vb +++ b/Transportes/RepContratoDetalle.aspx.vb @@ -143,6 +143,7 @@ Partial Class RepContratoDetalle LbCveSubProyecto.Text = Contrato.Rows(0)("CveSubProyecto").ToString DdlClientes.SelectedText = Contrato.Rows(0)("NombreComercial").ToString DdlClientes.SelectedValue = Contrato.Rows(0)("CveCliente").ToString + DdlMoneda.SelectedValue = Contrato.Rows(0)("CveMoneda").ToString TxtDescripcion.Text = Contrato.Rows(0)("DescripcionContrato").ToString TxtObservaciones.Text = Contrato.Rows(0)("Observaciones").ToString TelefonoEmpresa = Contrato.Rows(0)("Telefono").ToString @@ -323,7 +324,7 @@ Partial Class RepContratoDetalle New ReportParameter("CantidadPasajeros", TxtCantidadPasajeros.Text), New ReportParameter("TipoAF", DdlTipoAF.SelectedItem.ToString()), New ReportParameter("Pesos", Math.Round(TxtImporte.Text.ToDecimal, 2).ToString), - New ReportParameter("Dolares", Math.Round((TxtImporte.Text.ToDecimal / 17.1), 2).ToString), + New ReportParameter("Moneda", DdlMoneda.SelectedItem.ToString), New ReportParameter("Anticipo", Math.Round((TxtAnticipo.Text.ToDecimal * TxtImporte.Text.ToDecimal) / 2).ToString), New ReportParameter("Total", Math.Round((TxtImporte.Text.ToDecimal - (TxtAnticipo.Text.ToDecimal * TxtImporte.Text.ToDecimal)), 2).ToString), New ReportParameter("DiaSalida", $"{TxtFechaSalida.Text.ToDate.Hour}:{TxtFechaSalida.Text.ToDate.Minute} "), diff --git a/packages.config b/packages.config index c3434bbfd..b08049006 100644 --- a/packages.config +++ b/packages.config @@ -63,6 +63,7 @@ +