From e0c788e85f03a911ef7269f5c2cd02b1d5b3adce Mon Sep 17 00:00:00 2001
From: Rakcsle Supertramp <rakcsle@outlook.com>
Date: Wed, 21 Oct 2020 08:47:07 -0700
Subject: [PATCH] Compras corrrecion, no igualar poliza si no se unifico

---
 App_Code/ClsContabilidad.vb | 20 ++++++++++++++++++++
 Compras/Compras.aspx.vb     |  6 +++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/App_Code/ClsContabilidad.vb b/App_Code/ClsContabilidad.vb
index a3e36c05a..64f7f20dc 100644
--- a/App_Code/ClsContabilidad.vb
+++ b/App_Code/ClsContabilidad.vb
@@ -68,6 +68,11 @@ Public Class ClsContabilidad
     Public Property ValorPolizaDescuadre As Integer
     Public Property MensajePolizaDescuadre As String
     Public Property ValorDiferencia As String
+
+    Public Property SeUnifico As Boolean = False
+    Public Property YaEstabaUnifida As Boolean = False
+    Public Property EstaContabilizada As Boolean = False
+
 #End Region
 
     Public Function IniciaTransacSQL() As SqlTransaction
@@ -756,16 +761,30 @@ Public Class ClsContabilidad
 
         Dim Retorno As Boolean = False
 
+        SeUnifico = False
+        YaEstabaUnifida = False
+        EstaContabilizada = False
+
         DataAdapter("PA_Conta_PrePolizaUnificacion")
 
         With SqlAdapter.SelectCommand.Parameters
             .Add("@CvePrePoliza", SqlDbType.Int).Value = CvePrePoliza
             .Add("@CvePrePolizaVieja", SqlDbType.Int).Value = CvePrePolizaVieja
+            .Add("@SeUnifico", SqlDbType.Bit).Direction = ParameterDirection.Output
+            .Add("@YaEstabaUnifida", SqlDbType.Bit).Direction = ParameterDirection.Output
+            .Add("@EstaContabilizada", SqlDbType.Bit).Direction = ParameterDirection.Output
         End With
 
         Try
+
             SqlAdapter.Fill(Data)
+
+            SeUnifico = Boolean.Parse(SqlAdapter.SelectCommand.Parameters("@SeUnifico").Value.ToString)
+            YaEstabaUnifida = Boolean.Parse(SqlAdapter.SelectCommand.Parameters("@YaEstabaUnifida").Value.ToString)
+            EstaContabilizada = Boolean.Parse(SqlAdapter.SelectCommand.Parameters("@EstaContabilizada").Value.ToString)
+
             Retorno = True
+
         Catch ex1 As SqlException
             OnError("Ocurrió un error al actualizar la Poliza Original", ex1, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
         Catch ex As Exception
@@ -773,6 +792,7 @@ Public Class ClsContabilidad
         End Try
 
         Return Retorno
+
     End Function
 
     Public Function PrePolizaSimplificacion(CvePrePoliza As Integer, CveEmpresa As Integer) As Boolean
diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb
index 6109d4080..b32f4197b 100644
--- a/Compras/Compras.aspx.vb
+++ b/Compras/Compras.aspx.vb
@@ -9340,7 +9340,11 @@ Partial Class Compras_Compras
                                 ErrorMovtosCxP = 1
                                 Alert("No se pudo unificar la prepoliza", TipoMensaje.MsgError)
                             End If
-                            CvePrePolizaNueva = CvePrepolizaPadre 'para que se unifique siempre la prepolizanueva
+
+                            If ObjConta.SeUnifico Then
+                                CvePrePolizaNueva = CvePrepolizaPadre 'para que se unifique siempre la prepolizanueva
+                            End If
+
                         End If
 
                         'Simplificacion de PrePolizas