From b425ab8c194f34d5ccfac5bd8aa38f97eb154023 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 13 Sep 2016 13:09:14 +0000
Subject: [PATCH] fixes bug #7904

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@60236 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/vo/comissao/BoletoComissao.java      | 11 +++++++++++
 .../vo/comissao/EventosFinanceirosVO.java             | 11 +++++++++++
 .../rjconsultores/ventaboletos/vo/comissao/OcdVO.java | 11 +++++++++++
 3 files changed, 33 insertions(+)

diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
index 02c73e586..58724189d 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
@@ -922,5 +922,16 @@ public class BoletoComissao {
 				|| isBilheteGapTrocadoCancelado()
 				|| isBilheteGapTrocadoDevolvido();
 	}
+	
+	public String getOrderExigeConferencia() {
+		if(isExigeConferenciaAba() || isExigeConferencia() || isExigeConferenciaBoletoDevolvido()) {
+			if(!isConferido()) {
+				return "A";
+			} else if (isConferido()){
+				return "B";
+			}
+		}
+		return "C";
+	}
 
 }
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java b/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java
index b30ba8ff2..7b2e30b8c 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/EventosFinanceirosVO.java
@@ -191,4 +191,15 @@ public class EventosFinanceirosVO {
 		this.exigeConferenciaAba = exigeConferenciaAba;
 	}
 
+	public String getOrderExigeConferencia() {
+		if((getExigeConferenciaAba() != null && getExigeConferenciaAba()) || isExigeConferencia()) {
+			if(!isConferido()) {
+				return "A";
+			} else if (isConferido()){
+				return "B";
+			}
+		}
+		return "C";
+	}
+
 }
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java b/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java
index 8263dfe14..533296785 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/OcdVO.java
@@ -260,5 +260,16 @@ public class OcdVO {
 	public void setExigeConferenciaAba(boolean exigeConferenciaAba) {
 		this.exigeConferenciaAba = exigeConferenciaAba;
 	}
+	
+	public String getOrderExigeConferencia() {
+		if(isExigeConferenciaAba()) {
+			if(!isConferido()) {
+				return "A";
+			} else if (isConferido()){
+				return "B";
+			}
+		}
+		return "C";
+	}
 
 }