diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
index c25c7cfa5..d27594579 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
@@ -284,10 +284,13 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 		sql.append("LEFT JOIN AIDF AIDF ON AIDF.AIDF_ID = B.AIDF_ID AND B.TIPOVENTA_ID = 3 ");
 		sql.append("LEFT JOIN ESTADO ESAIDF ON ESAIDF.ESTADO_ID = AIDF.ESTADO_ID ");
 		sql.append("LEFT JOIN BOLETO BORI ON BORI.BOLETO_ID = B.BOLETOORIGINAL_ID ");
-		sql.append(isBpe ? "LEFT JOIN BPE BPE ON BPE.BOLETO_ID = B.BOLETO_ID " : "");
-		sql.append("WHERE B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) ");
-		sql.append("AND B.INDSTATUSBOLETO = 'C' ");
-		sql.append("AND B.INDCANCELACION = 1 ");
+		sql.append(isBpe ? "INNER JOIN BPE BPE ON BPE.BOLETO_ID = B.BOLETO_ID " : "");
+		sql.append("WHERE  ");
+		sql.append(isBpe ? "B.MOTIVOCANCELACION_ID IN (31,32,10,23,37,99,36) " : " B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) ");
+		
+		sql.append(isBpe ? " AND B.INDSTATUSBOLETO in ('C', 'T') " : " AND B.INDSTATUSBOLETO = 'C' ");
+		
+		sql.append(isBpe ? " " : " AND B.INDCANCELACION = 1 ");
 		
 		if(isApenasBilhetesImpressos) {
 			sql.append("AND B.NUMFOLIOPREIMPRESO IS NOT NULL ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper
index 3991834df..416295fa0 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml
index 952b5eeac..41a8e0615 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioDevolucaoBilhetes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
 	<property name="ireport.zoom" value="1.9965000000000006"/>
-	<property name="ireport.x" value="48"/>
-	<property name="ireport.y" value="95"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="bpeStyle" isDefault="true" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
+		<conditionalStyle>
+			<conditionExpression><![CDATA[$F{chbpe} != null ? Boolean.TRUE : Boolean.FALSE]]></conditionExpression>
+			<style fontSize="4"/>
+		</conditionalStyle>
+		<conditionalStyle>
+			<conditionExpression><![CDATA[$F{chbpe} != null ? Boolean.TRUE : Boolean.FALSE]]></conditionExpression>
+			<style fontSize="6"/>
+		</conditionalStyle>
+	</style>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
 		<box>
@@ -253,7 +263,7 @@
 	<pageHeader>
 		<band height="78" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement mode="Transparent" x="1" y="1" width="577" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="2ed4524d-5c06-487c-a8f1-abc59a8ef7fc"/>
+				<reportElement mode="Transparent" x="2" y="16" width="577" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="2ed4524d-5c06-487c-a8f1-abc59a8ef7fc"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -411,11 +421,11 @@
 				</graphicElement>
 			</line>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="215" y="1" width="56" height="14" isPrintWhenDetailOverflows="true" uuid="1835789f-f3ff-4d8d-ba10-12c6d693b270"/>
+				<reportElement stretchType="RelativeToTallestObject" x="215" y="1" width="113" height="14" isPrintWhenDetailOverflows="true" uuid="1835789f-f3ff-4d8d-ba10-12c6d693b270"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="6" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.aidf}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{chbpe} != null ? $R{label.chaveBpe} : $R{label.aidf}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="487" y="1" width="40" height="14" isPrintWhenDetailOverflows="true" uuid="d6813bb4-94c3-4f9b-af61-54e3676c31bb"/>
@@ -507,29 +517,22 @@
 				<textFieldExpression><![CDATA[$R{label.outras}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="271" y="1" width="72" height="14" isPrintWhenDetailOverflows="true" uuid="2467ecd3-3996-42c6-a2a6-2fc4b5cc1952"/>
+				<reportElement stretchType="RelativeToTallestObject" x="328" y="1" width="105" height="14" isPrintWhenDetailOverflows="true" uuid="ba1b92a2-ea24-4e4d-b265-dab785c370b0"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
 					<font size="6" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$R{label.chaveBpe}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="343" y="1" width="90" height="14" isPrintWhenDetailOverflows="true" uuid="ba1b92a2-ea24-4e4d-b265-dab785c370b0"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
-					<font size="6" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$R{label.chaveSubstituicaoBpe}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{chbpe} != null ? $R{label.chaveSubstituicaoBpe} : ""]]></textFieldExpression>
 			</textField>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="14">
 			<textField isBlankWhenNull="true">
-				<reportElement x="215" y="0" width="56" height="14" uuid="a34502fa-62b7-44b6-9218-90034054b7ac"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<reportElement style="bpeStyle" x="215" y="0" width="113" height="14" uuid="a34502fa-62b7-44b6-9218-90034054b7ac"/>
+				<textElement textAlignment="Justified" verticalAlignment="Middle">
 					<font size="6"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{aidf}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{chbpe} != null ? $F{chbpe} : $F{aidf}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement x="487" y="0" width="40" height="14" uuid="73fc6712-d370-49e2-ac39-55e2fa5ce9e2"/>
@@ -616,18 +619,11 @@
 				<textFieldExpression><![CDATA[$F{valorOutras}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="271" y="0" width="72" height="14" uuid="39cb41d3-74fe-40fc-9e7b-df47b1e70e3c"/>
-				<textElement verticalAlignment="Middle">
-					<font size="6"/>
+				<reportElement x="328" y="0" width="105" height="14" uuid="55b3e473-a704-4928-a52a-f71221094b21"/>
+				<textElement textAlignment="Justified" verticalAlignment="Middle">
+					<font size="4"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{chbpe}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="343" y="0" width="90" height="14" uuid="55b3e473-a704-4928-a52a-f71221094b21"/>
-				<textElement verticalAlignment="Middle">
-					<font size="6"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{chbpeSubstituicao}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{chbpe} != null ? $F{chbpeSubstituicao} : ""]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>