diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java
index f7fef9a4b..339481632 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java
@@ -150,7 +150,7 @@ public class RelatorioBPe extends Relatorio {
 		} else if (status != null && status.equals("S")) {//Substituidos
 			sql.append(" AND bpe.CODSTAT IN ('100', '102') AND bpeSub.BPE_ID IS NOT NULL AND bol.ACTIVO = 1 ");
 		} else if (status != null && status.equals("SB")) {//Substituicao
-			sql.append(" AND bpe.CODSTAT IN ('100', '102','150') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 and bpeSub.CODSTAT IN('150','100','102') ");
+			sql.append(" AND  ((bpe.CODSTAT IN ('100', '102', '150') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 and  bpeSub.CODSTAT IN ('100', '102', '150')) or (bpe.CODSTAT IN ('100', '102', '150') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 ))  ");
 		} else if (status != null && status.equals("NE")) {//Nao Embarcado
 			sql.append(" AND bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110115' AND bol.ACTIVO = 1 ");
 		} else if (status != null && status.equals("R")) {//Rejeitado
@@ -188,11 +188,12 @@ public class RelatorioBPe extends Relatorio {
 	}
 
 	private String opcaoTodas() {
+		
 		StringBuilder sql = new StringBuilder();
 
 		sql.append(" AND ((bpe.CODSTAT = '100' AND bol.ACTIVO = 1) OR (bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110111' AND bol.ACTIVO = 1 ) ");
 		sql.append(" OR (bpe.CODSTAT IN ('100', '102') AND bpeSub.BPE_ID IS NOT NULL AND bol.ACTIVO = 1) ");
-		sql.append(" OR (bpe.CODSTAT IN ('100', '102','150') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 and bpeSub.CODSTAT IN('150','100','102')) ");
+		sql.append(" OR ((bpe.CODSTAT IN ('100', '102', '150') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 and  bpeSub.CODSTAT IN ('100', '102', '150')) or (bpe.CODSTAT IN ('100', '102', '150') AND bpe.TIPOSUBSTITUICAO IS NOT NULL AND bol.ACTIVO = 1 )) ");
 		sql.append(" OR (bpe.CODSTAT = '135' AND bpe.TIPOEVENTO = '110115' AND bol.ACTIVO = 1) ");
 		sql.append(" OR (bpe.CODSTAT NOT IN ('100','135','102','150','-1','-2')) ");
 		sql.append(" OR (bpe.CODSTAT IN ('100', '150') AND bpe.INDCONTINGENCIA = 1 AND bol.ACTIVO = 1) ");
@@ -237,7 +238,7 @@ public class RelatorioBPe extends Relatorio {
 		sql.append("                  case ");
 		sql.append("                    when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 0 then 'Autorizado' ");
 		sql.append("                    when bpe.tiposubstituicao is null and bpeSub.bpe_id is null and bpe.indcontingencia = 1 then 'Aut.Conting.' ");
-		sql.append("                    when bpe.tiposubstituicao is not null then 'Autorizado/Substitução' ");
+		sql.append("                    when bpe.tiposubstituicao is not null then 'Autorizado/Substituição' ");
 		sql.append("                    when bpeSub.bpe_id is not null then 'Autorizado/Substituído' ");
 		sql.append("                    else 'Autorizado' ");
 		sql.append("                  end ");
@@ -245,7 +246,7 @@ public class RelatorioBPe extends Relatorio {
 		
 		sql.append("  when '102' then ( ");
 		sql.append("                case ");
-		sql.append("                    when bpe.tiposubstituicao is not null then 'Substitução' ");
+		sql.append("                    when bpe.tiposubstituicao is not null then 'Substituição' ");
 		sql.append("                    when bpeSub.bpe_id is not null then 'Substituído' ");
 		sql.append("                end ");
 		sql.append("                ) ");
@@ -271,7 +272,7 @@ public class RelatorioBPe extends Relatorio {
 		sql.append("  bpe.QRCODE, bpe.errocontingencia ");
 
 		sql.append(" FROM BPE bpe ");
-		sql.append(" LEFT JOIN BPE bpeSub ON bpe.BPESUBSTITUICAO_ID = bpeSub.BPE_ID AND bpeSub.activo = 1 ");
+		sql.append(" LEFT JOIN BPE bpeSub on (bpeSub.bpesubstituicao_id = bpe.bpe_id and bpeSub.activo = 1) ");
 		sql.append(" LEFT JOIN BOLETO bol ON bol.BOLETO_ID = bpe.BOLETO_ID and bpe.activo = 1  ");
 		sql.append(" LEFT JOIN estado e ON e.CODIBGE = bpe.UF  ");
 		sql.append(" LEFT JOIN marca ma ON bol.MARCA_ID = ma.MARCA_ID  ");