diff --git a/App_Code/ClsClientes.vb b/App_Code/ClsClientes.vb
index 3373f9526..7a14674f8 100644
--- a/App_Code/ClsClientes.vb
+++ b/App_Code/ClsClientes.vb
@@ -1022,22 +1022,22 @@ Public Class ClsClientes
End Function
- Public Function GetEstados(Optional ClaveSATPais As String = "-1") As Boolean
- Dim Retorno As Boolean = False
+ 'Public Function GetEstados(Optional ClaveSATPais As String = "-1") As Boolean
+ ' Dim Retorno As Boolean = False
- DataAdapter("PA_ClientesEstadosGet")
+ ' DataAdapter("PA_ClientesEstadosGet")
- SqlAdapter.SelectCommand.Parameters.Add("@ClaveSATPais", SqlDbType.VarChar).Value = ClaveSATPais
+ ' SqlAdapter.SelectCommand.Parameters.Add("@ClaveSATPais", SqlDbType.VarChar).Value = ClaveSATPais
- Try
- SqlAdapter.Fill(Data)
- Retorno = True
- Catch ex As Exception
- OnError("Ocurrió un error al obtener el los estados.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
- End Try
+ ' Try
+ ' SqlAdapter.Fill(Data)
+ ' Retorno = True
+ ' Catch ex As Exception
+ ' OnError("Ocurrió un error al obtener el los estados.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo())
+ ' End Try
- Return Retorno
- End Function
+ ' Return Retorno
+ 'End Function
@@ -1596,8 +1596,8 @@ Public Class ClsClientes
Return Retorno
End Function
- Public Function AgregarClienteNoFrecuente(Nombre As String, Direccion As String, NoExt As String, NoInt As String, Colonia As String, Localidad As String, Ciudad As String, Estado As String,
- Pais As String, RFC As String, CP As String, Telefono As String, Mail As String, CveSubProyecto As Integer, CveUsuario As Integer, CveEmpresa As Integer,
+ Public Function AgregarClienteNoFrecuente(Nombre As String, Direccion As String, NoExt As String, NoInt As String, Colonia As String, Localidad As String, Ciudad As String, CveEstado As Integer,
+ RFC As String, CP As String, Telefono As String, Mail As String, CveSubProyecto As Integer, CveUsuario As Integer, CveEmpresa As Integer,
NumCuentaPago As String, CveMetodoPago33 As Integer, CveFormaPago33 As Integer, Optional CvePrecioLista As Integer = -1) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_ClientesNoFrecuenteAdd")
@@ -1610,8 +1610,8 @@ Public Class ClsClientes
.Add("@Colonia", SqlDbType.VarChar).Value = Colonia
.Add("@Localidad", SqlDbType.VarChar).Value = Localidad
.Add("@Ciudad", SqlDbType.VarChar).Value = Ciudad
- .Add("@Estado", SqlDbType.VarChar).Value = Estado
- .Add("@Pais", SqlDbType.VarChar).Value = Pais
+ .Add("@CveEstado", SqlDbType.Int).Value = CveEstado
+ ' .Add("@Pais", SqlDbType.VarChar).Value = Pais
.Add("@RFC", SqlDbType.VarChar).Value = RFC
.Add("@CP", SqlDbType.VarChar).Value = CP
.Add("@Telefono", SqlDbType.VarChar).Value = Telefono
diff --git a/App_Code/ClsFISConfiguracion.vb b/App_Code/ClsFISConfiguracion.vb
index 3ee63918e..a1d8ddf32 100644
--- a/App_Code/ClsFISConfiguracion.vb
+++ b/App_Code/ClsFISConfiguracion.vb
@@ -16,6 +16,7 @@ Public Class ClsFISConfiguracion
Private SqlConexion As SqlConnection
Private SqlAdapter As SqlDataAdapter
Private SqlCommand As SqlCommand
+ Private SqlTransacc As SqlTransaction
Private Data As DataTable
'Atributos de la clase
@@ -23,6 +24,7 @@ Public Class ClsFISConfiguracion
Private disposedValue As Boolean = False ' Para detectar llamadas redundantes
'REGISTRAR CONEXIONES ABIERTAS
Private CveConexion As Integer = 0
+ Private EsTransaccionCompartida As Boolean = False
#End Region
#Region "Propiedades"
@@ -42,20 +44,38 @@ Public Class ClsFISConfiguracion
#End Region
- Sub New()
- SqlConexion = New SqlConnection
- SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString
- Try
- SqlConexion.Open()
- Catch ex As Exception
- Me.OnError("Ocurrió un error al intentar conectarse a la base de datos.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
- End Try
+ Sub New(Optional TransaccionCompartida As SqlTransaction = Nothing)
+
+ If TransaccionCompartida Is Nothing Then
+ SqlConexion = New SqlConnection
+ SqlConexion.ConnectionString = ConfigurationManager.ConnectionStrings("Conexion").ConnectionString
+ Try
+ SqlConexion.Open()
+ Catch ex As Exception
+ OnError("Ocurrió un error al intentar conectarse a la base de datos.", ex)
+ End Try
+ Else
+ SqlConexion = TransaccionCompartida.Connection
+ SqlTransacc = TransaccionCompartida
+ EsTransaccionCompartida = True
+ End If
+ SqlAdapter = New SqlDataAdapter("", SqlConexion)
ConexionAdd()
+
+ End Sub
+ Private Sub DataAdapter(ByVal pStrSQL As String, Optional ByVal TipoComando As CommandType = CommandType.StoredProcedure)
+ With SqlAdapter.SelectCommand
+ .Parameters.Clear()
+ .CommandText = pStrSQL
+ .CommandType = TipoComando
+ End With
+ If Not SqlTransacc Is Nothing Then SqlAdapter.SelectCommand.Transaction = SqlTransacc
+ Data = New DataTable
End Sub
#Region "Conexiones"
Private Sub ConexionAdd()
- If ConfigurationManager.AppSettings("RegistraConexion") IsNot Nothing AndAlso ConfigurationManager.AppSettings("RegistraConexion").ToString() = "1" Then
+ If Not EsTransaccionCompartida AndAlso ConfigurationManager.AppSettings("RegistraConexion") IsNot Nothing AndAlso ConfigurationManager.AppSettings("RegistraConexion").ToString() = "1" Then
Try
DataAdapter("PA_Sis_RegistrarConexion")
With SqlAdapter.SelectCommand.Parameters
@@ -87,21 +107,14 @@ Public Class ClsFISConfiguracion
End If
End Sub
- Private Sub DataAdapter(StrSQL As String, Optional TipoComando As CommandType = CommandType.StoredProcedure)
- With SqlAdapter.SelectCommand
- .Parameters.Clear()
- .CommandText = StrSQL
- .CommandType = TipoComando
- End With
- Data = New DataTable
- End Sub
+
#End Region
Public Function GetConfiguracion(CveEmpresa As Integer) As Boolean
Dim Retorno As Boolean = False
- Data = New DataTable
- SqlAdapter = New SqlDataAdapter("PA_Fis_CuentaContablesGet", SqlConexion)
- SqlAdapter.SelectCommand.CommandType = CommandType.StoredProcedure
+
+ DataAdapter("PA_Fis_CuentaContablesGet")
+
SqlAdapter.SelectCommand.Parameters.Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
Try
SqlAdapter.Fill(Data)
@@ -117,16 +130,15 @@ Public Class ClsFISConfiguracion
Catch ex As SqlException
OnError("Ocurrió un error al consultar las Configuraciones.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
End Try
- SqlAdapter.Dispose()
+
Return Retorno
End Function
Public Function AddConfiguracion(ActIVAAcreditable As Integer, ActIVAxAcreditar As Integer, PasIVAPagar As Integer, PasIVAxPagar As Integer,
EROtrosIngresos As Integer, ERDSV As Integer, CveEmpresa As Integer) As Boolean
Dim Retorno As Boolean = False
- Data = New DataTable
- SqlAdapter = New SqlDataAdapter("PA_Fis_CuentaContablesAdd", SqlConexion)
- SqlAdapter.SelectCommand.CommandType = CommandType.StoredProcedure
+
+ DataAdapter("PA_Fis_CuentaContablesAdd")
With SqlAdapter.SelectCommand.Parameters
.Add("@ActIVAAcreditable", SqlDbType.VarChar).Value = ActIVAAcreditable
@@ -150,7 +162,7 @@ Public Class ClsFISConfiguracion
Catch ex As Exception
OnError("Ocurrió un error al Guardar la Configuración.", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
End Try
- SqlAdapter.Dispose()
+
Return Retorno
End Function
diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index 2a66e9236..92bcf5399 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -1627,7 +1627,7 @@ Public Class ClsPaginas
'sino existe, recarga los datos
If Application(AppNombre) Is Nothing Then
Dim ObjVendedores As New ClsVtaVendedores
- If ObjVendedores.GetVendedores(-1) Then Application(AppNombre) = ObjVendedores.DtResultados
+ If ObjVendedores.GetVendedores(CveEmpresa) Then Application(AppNombre) = ObjVendedores.DtResultados
ObjVendedores.Dispose()
End If
If CveEmpresa <> -1 Then
@@ -3351,7 +3351,7 @@ Public Class ClsPaginas
Application("GlobalDTClasificacionPorcentaje") = value
End Set
End Property
- Property GlobalDTPaqueterias(CveEmpresa As Integer, Optional TipoPaquteria As Integer = -1) As DataTable
+ Property GlobalDTPaqueterias(CveEmpresa As Integer, Optional TipoPaqueteria As Integer = -1) As DataTable
Get
Dim AppNombre As String = String.Format("GlobalDTPaqueterias-{0}", CveEmpresa)
If Application(AppNombre) Is Nothing Then
@@ -3361,7 +3361,7 @@ Public Class ClsPaginas
End If
Dim Str As StringBuilder = New StringBuilder()
- If TipoPaquteria <> -1 Then Str.AppendFormat("TipoPaqueteria = {0}", TipoPaquteria)
+ If TipoPaqueteria <> -1 Then Str.AppendFormat("TipoPaqueteria = {0}", TipoPaqueteria)
Dim Dv As New DataView(DirectCast(Application(AppNombre), DataTable), Str.ToString, "", DataViewRowState.CurrentRows)
GlobalDTPaqueterias = Dv.ToTable
diff --git a/App_Code/ClsVentas.vb b/App_Code/ClsVentas.vb
index 45cb0773d..f5ac79de9 100644
--- a/App_Code/ClsVentas.vb
+++ b/App_Code/ClsVentas.vb
@@ -4505,11 +4505,11 @@ Public Class ClsVentas
Return retorno
End Function
- Public Function GetOCRelacionadas(CveVentasDetalles As String) As Boolean
+ Public Function GetOCRelacionadas(CveVenta As Integer) As Boolean
Dim retorno As Boolean = False
DataAdapter("PA_Vta_OrdenCompraRelacionada", CommandType.StoredProcedure)
With SqlAdapter.SelectCommand.Parameters
- .Add("@CveVentasDetalles", SqlDbType.NVarChar).Value = CveVentasDetalles
+ .Add("@CveVenta", SqlDbType.Int).Value = CveVenta
End With
Try
SqlAdapter.Fill(Data)
diff --git a/Ashx/SIGWeb.ashx b/Ashx/SIGWeb.ashx
index 17e401ead..0f7b199d5 100644
--- a/Ashx/SIGWeb.ashx
+++ b/Ashx/SIGWeb.ashx
@@ -585,7 +585,7 @@ Public Class SIGWeb : Implements IHttpHandler, IRequiresSessionState
'verifica existencias
- If Pagina.Contiene("ventas/ventas", "oc/oc", "inv/traspaso") AndAlso CveEmpresa.Contiene(72, 80, 119, 140, 141) Then
+ If Pagina.Contiene("ventas/ventas", "oc/oc", "inv/traspaso") AndAlso CveEmpresa.Contiene(72, 80, 119, 140, 141, 152) Then
UsaGlobal = False
Dim objInv As New ClsInventarios
diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb
index ce6ccabce..9092932ce 100644
--- a/Compras/Compras.aspx.vb
+++ b/Compras/Compras.aspx.vb
@@ -1227,7 +1227,6 @@ Partial Class Compras_Compras
ClavesBorradas = New ArrayList()
TxtFecha.Text = Now.ToShortDateString
TxtFechaEjecucion.Text = Now.ToShortDateString
- ViewState("CveCompra") = "0"
ViewState("CveFactura") = "0"
ViewState("IdPoliza") = "0"
ViewState("CveCompra") = -1
@@ -10761,7 +10760,7 @@ Partial Class Compras_Compras
e.Row.FCLinkButton("ImgD").Visible = False
End If
- If e.Row.DBCampo("CvePS").ToEntero > 0 AndAlso e.Row.DBCampo("IEPSPSPorcentaje").ToDouble > 0 Then
+ If CveCompra <= 0 AndAlso e.Row.DBCampo("CvePS").ToEntero > 0 AndAlso e.Row.DBCampo("IEPSPSPorcentaje").ToDouble > 0 Then
If GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=e.Row.DBCampo("CvePS").ToEntero).Rows.Count > 0 Then
Dim DrPS As DataRow = GlobalDTPS(UsuarioActual.CveEmpresa, CvePS:=e.Row.DBCampo("CvePS").ToEntero).Rows(0)
If DrPS IsNot Nothing Then
@@ -10773,6 +10772,11 @@ Partial Class Compras_Compras
End If
End If
+ If e.Row.DBCampo("CvePS").ToEntero > 0 AndAlso e.Row.DBCampo("NoDeducible") = "True" Then
+ e.Row.FCLabel("LblIVAPorcentaje").ToolTip = "IVA NO Deducible"
+ e.Row.FCLabel("LblIVAPorcentaje").ForeColor = Drawing.Color.Red
+ End If
+
'CargaPresupuestosEgresos
If UsuarioActual.Empresa.UsaAC Then
e.Row.Cells(13).Visible = True
diff --git a/Compras/ReembolsosComprobaciones.aspx.vb b/Compras/ReembolsosComprobaciones.aspx.vb
index 001743e8f..592f5814e 100644
--- a/Compras/ReembolsosComprobaciones.aspx.vb
+++ b/Compras/ReembolsosComprobaciones.aspx.vb
@@ -745,7 +745,7 @@ Partial Class Compras_ReembolsosComprobaciones
Dim ImporteNOIVA As Decimal = gvr.DataKey("IVANoDeducible").ToDecimal * PorcentajePago
- If Not ObjMov.AddPrePolizasDetalle(CvePrePolizaPago, False, ImporteNOIVA, Referencia, 280, ConceptoMovimiento, gvr.FCLiteral("LtlFecha").Text.ToDate, If(IdCtaContIVANoAcreditable > 0, IdCtaContIVANoAcreditable, IdCtaIVAAcreditable), -1, CveIE:=CveIEPago, CveCompra:=gvr.FCHyperLink("HplF2").Text.ToEntero, CveProveedor:=gvr.FCHyperLink("HLProv").Text.ToEntero, ImporteME:=If(tipoCambio = 1, 0, gvr.DataKey("IVA").ToDecimal * PorcentajePago), ImporteMX:=(gvr.DataKey("IVA").ToDecimal * PorcentajePago) * tipoCambio, CveCuenta:=CveCuentaIVAAcreditable, CvePrePolizaOriginal:=CvePrePolizaPagoOriginal, CvePersonal:=CvePersonal, PorcentajeImpuesto:=PorcentajeIVA) Then
+ If Not ObjMov.AddPrePolizasDetalle(CvePrePolizaPago, False, ImporteNOIVA, Referencia, 280, ConceptoMovimiento, gvr.FCLiteral("LtlFecha").Text.ToDate, If(IdCtaContIVANoAcreditable > 0, IdCtaContIVANoAcreditable, IdCtaIVAAcreditable), -1, CveIE:=CveIEPago, CveCompra:=gvr.FCHyperLink("HplF2").Text.ToEntero, CveProveedor:=gvr.FCHyperLink("HLProv").Text.ToEntero, ImporteME:=If(tipoCambio = 1, 0, ImporteNOIVA), ImporteMX:=(ImporteNOIVA) * tipoCambio, CveCuenta:=CveCuentaIVAAcreditable, CvePrePolizaOriginal:=CvePrePolizaPagoOriginal, CvePersonal:=CvePersonal, PorcentajeImpuesto:=PorcentajeIVA) Then
MsgError = "Detalle"
End If
End If
diff --git a/Inventarios/EntregaAlmacen.aspx.vb b/Inventarios/EntregaAlmacen.aspx.vb
index 6eb9ba7a5..d2acbfd5f 100644
--- a/Inventarios/EntregaAlmacen.aspx.vb
+++ b/Inventarios/EntregaAlmacen.aspx.vb
@@ -2653,7 +2653,7 @@ Partial Class Inventarios_EntregaAlmacen
'Paqueterias guias
If RbEntregaInterna.Checked AndAlso Not ErrorMovInv Then
Dim CveEstatus As Integer = 1 ' DdlEstatus.SelectedValue.ToEntero()
- Dim Fecha As String = "-1" 'TxtFechaPaqInterna.Text
+ Dim Fecha As String = Now.ToString 'TxtFechaPaqInterna.Text
Dim FechaEstimada As String = "-1" 'If(TxtFechaEstimada.Text = "", "-1", TxtFechaEstimada.Text)
Dim NoCajas As Integer = 0 'TxtNoCajas.Text.ToEntero()
Dim Observaciones As String = "" 'TxtObservacionesPaqInterna.Text
@@ -3123,7 +3123,7 @@ Partial Class Inventarios_EntregaAlmacen
'Paqueterias Guias
If RbEntregaInterna.Checked AndAlso Not ErrorMovInv Then
Dim CveEstatus As Integer = 0 ' DdlEstatus.SelectedValue.ToEntero()
- Dim Fecha As String = "-1" 'TxtFechaPaqInterna.Text
+ Dim Fecha As String = Now.ToString 'TxtFechaPaqInterna.Text
Dim FechaEstimada As String = "-1" 'If(TxtFechaEstimada.Text = "", "-1", TxtFechaEstimada.Text)
Dim NoCajas As Integer = 0 'TxtNoCajas.Text.ToEntero()
Dim Observaciones As String = "" 'TxtObservacionesPaqInterna.Text
diff --git a/Inventarios/RecepcionAlmacen.aspx.vb b/Inventarios/RecepcionAlmacen.aspx.vb
index b93c5b5f8..9cf5cae5f 100644
--- a/Inventarios/RecepcionAlmacen.aspx.vb
+++ b/Inventarios/RecepcionAlmacen.aspx.vb
@@ -2459,9 +2459,9 @@ Partial Class Inventarios_RecepcionAlmacen
Dim TotalPorDevengar = 0.0
TotalPorDevengar += GvInv.Rows.Cast(Of GridViewRow)().Sum(Function(Gvr) Math.Round(Gvr.DataKey("PU").ToString.ToDouble, 4) * Math.Round(Gvr.DataKey("CantidadF").ToString.ToDouble, 4))
TotalPorDevengar = Math.Round(TotalPorDevengar, 4)
- If ObjContaContPAQ Is Nothing Then
- ObjContaContPAQ = New ClsContPAQi(UsuarioActual.Empresa)
- ObjContaContPAQ.IniciaTransacSQL()
+ If ObjContaAC Is Nothing Then
+ ObjContaAC = New ClsContPAQi(UsuarioActual.Empresa)
+ ObjContaAC.IniciaTransacSQL()
End If
IDPoliza = ObjContaAC.AddPoliza(4, "Devengado", TotalPorDevengar * 2, TotalPorDevengar * 2, UsuarioActual.CveUsuario, FechaMovto)
diff --git a/Inventarios/RepEntregasForaneas.aspx.vb b/Inventarios/RepEntregasForaneas.aspx.vb
index 19e7d2694..23cb7c449 100644
--- a/Inventarios/RepEntregasForaneas.aspx.vb
+++ b/Inventarios/RepEntregasForaneas.aspx.vb
@@ -204,12 +204,12 @@ Partial Class Inventarios_RepEntregasForaneas
DTEstatus = ObjInv.DtResultados
DdlEstatusFiltro.DataSource = DTEstatus
End If
+ ObjInv.Dispose()
- DdlPaqueteria.DataSource = GlobalDTPaqueterias
+ DdlPaqueteria.DataSource = GlobalDTPaqueterias(UsuarioActual.CveEmpresa)
DdlPaqueteria.DataBind()
DdlEstatusFiltro.DataBind()
- ObjInv.Dispose()
CargaSucursales()
@@ -334,7 +334,7 @@ Partial Class Inventarios_RepEntregasForaneas
e.Row.FCDropDownList("DdlEstatus").DataBind()
e.Row.FCDropDownList("DdlEstatus").SelectedValueExist(e.Row.DBCampo("CveEntregaForaneaEstatus"))
- e.Row.FCDropDownList("DdlPaqueteria").DataSource = GlobalDTPaqueterias
+ e.Row.FCDropDownList("DdlPaqueteria").DataSource = GlobalDTPaqueterias(UsuarioActual.CveEmpresa)
e.Row.FCDropDownList("DdlPaqueteria").DataBind()
e.Row.FCDropDownList("DdlPaqueteria").SelectedValueExist(e.Row.DBCampo("CvePaqueteria"))
diff --git a/Inventarios/TrasladoSolicitud.aspx.vb b/Inventarios/TrasladoSolicitud.aspx.vb
index 9d8f8a66b..515063e12 100644
--- a/Inventarios/TrasladoSolicitud.aspx.vb
+++ b/Inventarios/TrasladoSolicitud.aspx.vb
@@ -85,7 +85,7 @@ Partial Class Inventarios_TrasladoSolicitud
TempDT.Columns.Add()
End Sub
Private Sub CargaPaqueterias()
- DdlPaqueteria.DataSource = GlobalDTPaqueterias()
+ DdlPaqueteria.DataSource = GlobalDTPaqueterias(UsuarioActual.CveEmpresa)
DdlPaqueteria.DataBind()
DdlPaqueteria.Items.Insert(0, New ListItem("-", "-1"))
End Sub
diff --git a/OC/PopUpBuscarReq.aspx.vb b/OC/PopUpBuscarReq.aspx.vb
index 118f8aa6a..f4d2d40c4 100644
--- a/OC/PopUpBuscarReq.aspx.vb
+++ b/OC/PopUpBuscarReq.aspx.vb
@@ -126,12 +126,15 @@ Partial Class OC_PopUpBuscarReq
ViewState("CveProveedor") = Request("P")
UPFiltros.Visible = False
- Dim ObjPro As New ClsCompProveedores
- ObjPro.GetProveedores(ClsCompProveedores.TipoConsulta.ParaUsoEnEmpresa, ViewState("CveProveedor").ToString.ToEntero, "-1", "-1", "-1", "-1", "-1", "-1", "-1", -1, UsuarioActual.CveEmpresa)
- If ObjPro.DtResultados.Rows.Count > 0 Then
- LbTitulo.Text = String.Format("Órdenes de Compra - {0}", ObjPro.DtResultados.Rows(0)("RazonSocial").ToString)
- End If
- ObjPro.Dispose()
+ Dim NombreProv As String = GlobalDTCompProveedores(UsuarioActual.CveEmpresa, ViewState("CveProveedor").ToString.ToEntero).FiltroPrimeroValor("RazonSocial")
+ LbTitulo.Text = String.Format("Órdenes de Compra - {0}", NombreProv)
+
+ 'Dim ObjPro As New ClsCompProveedores
+ 'ObjPro.GetProveedores(ClsCompProveedores.TipoConsulta.ParaUsoEnEmpresa, ViewState("CveProveedor").ToString.ToEntero, "-1", "-1", "-1", "-1", "-1", "-1", "-1", -1, UsuarioActual.CveEmpresa)
+ 'If ObjPro.DtResultados.Rows.Count > 0 Then
+ ' LbTitulo.Text = String.Format("Órdenes de Compra - {0}", ObjPro.DtResultados.Rows(0)("RazonSocial").ToString)
+ 'End If
+ 'ObjPro.Dispose()
'Cargar Datos
Dim ObjOC As New ClsOC
diff --git a/RMA/Garantias.aspx.vb b/RMA/Garantias.aspx.vb
index 61bf19f23..178f130fa 100644
--- a/RMA/Garantias.aspx.vb
+++ b/RMA/Garantias.aspx.vb
@@ -27,7 +27,7 @@ Partial Class Ventas_Garantias
DdlProveedores.DataSource = GlobalDTCompProveedores(UsuarioActual.CveEmpresa)
DdlProveedores.DataBind()
- DdlPaqueteria.DataSource = GlobalDTPaqueterias
+ DdlPaqueteria.DataSource = GlobalDTPaqueterias(UsuarioActual.CveEmpresa)
DdlPaqueteria.DataBind()
diff --git a/Sistemas/Empresa.aspx b/Sistemas/Empresa.aspx
index 505dbd406..d2d0a61c7 100644
--- a/Sistemas/Empresa.aspx
+++ b/Sistemas/Empresa.aspx
@@ -326,12 +326,21 @@