diff --git a/App_Code/ClsCompras.vb b/App_Code/ClsCompras.vb
index d51086b15..280bd41ec 100644
--- a/App_Code/ClsCompras.vb
+++ b/App_Code/ClsCompras.vb
@@ -2147,13 +2147,14 @@ Public Class ClsCompras
Return Retorno
End Function
- Public Function UpdateEstatusAlmacenDetalle(CveCompraDetalle As Integer, ValorEstatus As Integer) As Boolean
+ Public Function UpdateEstatusAlmacenDetalle(CveCompraDetalle As Integer, ValorEstatus As Integer, Optional CveUsuarioModificoDetalle As Integer = -1) As Boolean
Dim Retorno As Boolean = False
DataAdapter("PA_Comp_ComprasDetalleEstatusAlmacenUpdate")
With SqlAdapter.SelectCommand.Parameters
.Add("@CveCompraDetalle", SqlDbType.Int).Value = CveCompraDetalle
- .Add("@Estatus", SqlDbType.Int).Value = ValorEstatus
+ .Add("@Estatus", SqlDbType.Int).Value = ValorEstatus
+ .Add("@CveUsuarioModifico", SqlDbType.Int).Value = CveUsuarioModificoDetalle
End With
Try
@@ -2164,10 +2165,10 @@ Public Class ClsCompras
End Try
Return Retorno
- End Function
-
+ End Function
+
#End Region
-
+
#Region " DEVOLUCIONES COMPRAS - IPP FEBRERO 2018 "
Public Function ComprasDetalleDevolucionesAdd(CveCompraDetalle As Integer, CveCompraNC As Integer, Cantidad As Double, CveEmpresa As Integer) As Boolean
Dim Retorno As Boolean = False
diff --git a/Compras/Compras.aspx b/Compras/Compras.aspx
index 85648f022..14e5aeef9 100644
--- a/Compras/Compras.aspx
+++ b/Compras/Compras.aspx
@@ -3467,6 +3467,7 @@
+
diff --git a/Inventarios/RepNotasSinAlmacen.aspx b/Inventarios/RepNotasSinAlmacen.aspx
index ca3940eef..2d23b5ed5 100644
--- a/Inventarios/RepNotasSinAlmacen.aspx
+++ b/Inventarios/RepNotasSinAlmacen.aspx
@@ -184,7 +184,7 @@
-
+
@@ -192,7 +192,9 @@
-
+
+
+
diff --git a/Inventarios/RepNotasSinAlmacen.aspx.vb b/Inventarios/RepNotasSinAlmacen.aspx.vb
index 87672139d..9c54911f7 100644
--- a/Inventarios/RepNotasSinAlmacen.aspx.vb
+++ b/Inventarios/RepNotasSinAlmacen.aspx.vb
@@ -278,10 +278,11 @@ Partial Class RepNotasSinAlmacen
e.Row.Cells(1).Text = e.Row.DBCampo("Fecha").ToDate.ToShortDateString
e.Row.Cells(1).HorizontalAlign = HorizontalAlign.Center
e.Row.Cells(2).Text = "" & e.Row.DBCampo("RazonSocial") & ""
- Else
+
If GvCompras.Columns(4).Visible Then
e.Row.Cells(4).Text = ""
End If
+
End If
End If
End Sub
@@ -290,11 +291,11 @@ Partial Class RepNotasSinAlmacen
If UsuarioActual.TienePermisoProceso(278) Then
Dim GvRow As GridViewRow = DirectCast(DirectCast(sender, LinkButton).NamingContainer, GridViewRow)
- Dim CveCompra As Integer = GvRow.DataKey("CveCompra")
+ Dim CveCompraDetalle As Integer = GvRow.DataKey("CveCompraDetalle")
Dim ObjCompras As New ClsCompras
- If ObjCompras.UpdateEstatusAlmacen(CveCompra, 1) Then
- Alert("La compra se desmarco correctamente.")
+ If ObjCompras.UpdateEstatusAlmacenDetalle(CveCompraDetalle, 1, UsuarioActual.CveUsuario) Then
+ Alert("El producto se desmarco correctamente.")
End If
ObjCompras.Dispose()
diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index d9c1a511a..a75896214 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -12567,7 +12567,8 @@ Partial Class Ventas
DdlUnidadMedida.SelectedValue = "-1"
DdlUnidadMedida.DataBind()
DdlUnidadMedida.SelectedValueExist(drPS("CveUnidadMedida").ToString)
- DdlMoneda.SelectedValueExist(drPS("CveMoneda").ToString)
+ DdlMoneda.SelectedValueExist(drPS("CveMoneda").ToString)
+ CambiaMoneda()
'SUGIERE PRECIO
Dim PrecioSugerido = 0.0
PrecioSugerido = drPS("Precio").ToString.ToDouble