From 7cc6ff1dcf32f6a23e35ad346d0b704be05b0919 Mon Sep 17 00:00:00 2001
From: "eduardo.dicarde" <eduardo.dicarde@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 5 Sep 2016 20:05:59 +0000
Subject: [PATCH] fixes bug #7893

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@60026 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/ConferenciaComissaoHibernateDAO.java          | 2 +-
 .../rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
index ded8fcbb1..8ce452db1 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
@@ -799,7 +799,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
 					.append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.OCD_ID = O.OCD_ID AND LOG.ACTIVO = 1 ")
 					.append("INNER JOIN USUARIO U ON O.USUARIOPAGO_ID = U.USUARIO_ID ")
 					.append("LEFT JOIN COM_EMP_CONFERENCIA CEC ON CEC.EMPRESA_ID = M.EMPRESA_ID AND CEC.ACTIVO = 1 ")
-					.append("INNER JOIN MARCA m ON m.MARCA_ID = b.MARCA_ID ")
+					.append("INNER JOIN MARCA ON m.MARCA_ID = b.MARCA_ID ")
 					.append("WHERE O.ACTIVO = 1 ")
 					.append("AND O.FECPAGO BETWEEN TO_DATE(:dataMovimentoInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataMovimentoFinal, 'DD/MM/YYYY HH24:MI') ")
 					.append("AND O.INDPAGO = 1 ");
diff --git a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
index 707f499f1..f2e16f171 100644
--- a/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
+++ b/src/com/rjconsultores/ventaboletos/vo/comissao/BoletoComissao.java
@@ -617,8 +617,6 @@ public class BoletoComissao {
 
 	/** ABA BILHETE VENDIDO */
 	public boolean isBilheteNormalVendido() {
-		if (nombpasajero.startsWith("ABILIO"))
-			System.out.println("break point");
 
 		return (isVendaBilheteNormal(getTipoVenta()) && isSemMotivocancelacion()
 				&& isStatusVendido())  // Venda sem alteração