diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb index 2b3255f1e..ff0a320d9 100644 --- a/Compras/Compras.aspx.vb +++ b/Compras/Compras.aspx.vb @@ -1284,6 +1284,32 @@ Partial Class Compras_Compras End Property + Private Property ObsOC As String + Get + If ViewState("ObsOC") Is Nothing Then + ViewState("ObsOC") = "" + End If + + Return ViewState("ObsOC").ToString + End Get + Set(value As String) + ViewState("ObsOC") = value + End Set + End Property + + Private Property AplicarObsOC As Boolean + Get + If ViewState("AplicarObsOC") Is Nothing Then + ViewState("AplicarObsOC") = False + End If + + Return Boolean.Parse(ViewState("AplicarObsOC").ToString) + End Get + Set(value As Boolean) + ViewState("AplicarObsOC") = value + End Set + End Property + Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load @@ -5789,6 +5815,10 @@ Partial Class Compras_Compras Dim ObsGDiaz As String = If(EsGrupoDiaz, TxtObsFact.Text, "") + If AplicarObsOC Then + ObsGDiaz = ObsOC + End If + For Each tCveAlmacen As Integer In ListAlmacenes If GvInv.Rows(indice).FCDropDownList("DdlRecibirInv").SelectedValue = "1" Then Continue For @@ -15050,7 +15080,18 @@ Partial Class Compras_Compras + Dim ObsOCAsignado As Boolean = False + For Each CveOCItem As String In ArrayCveOC.Distinct + + + If Not ObsOCAsignado Then + If ObjOC.GetOC(CveOCItem.ToEntero, UsuarioActual.CveEmpresa) Then + ObsOC = ObjOC.Descripcion + End If + ObsOCAsignado = True + End If + If ObjOC.GetOrdenesDetalle(CveOCItem.ToEntero, UsuarioActual.CveEmpresa) AndAlso ObjOC.DtResultados.Rows.Count > 0 Then If IsNothing(DTOCTemp) Then DTOCTemp = ObjOC.DtResultados.Copy @@ -15933,6 +15974,8 @@ Partial Class Compras_Compras End If + AplicarObsOC = True + CalculaTotales() End Sub