diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java index 921fd582a..23839da59 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBPe.java @@ -63,6 +63,7 @@ public class RelatorioBPe extends Relatorio { dataResult.put("dtviagem", rset.getString("dtviagem")); dataResult.put("vlbpe", rset.getBigDecimal("vlbpe")); dataResult.put("chbpe", rset.getString("chbpe")); + dataResult.put("protocolo", rset.getString("protocolo")); dataResult.put("num_bpe", rset.getString("num_bpe")); dataResult.put("numserie_bpe", rset.getString("numserie_bpe")); dataResult.put("status", rset.getString("status")); @@ -124,6 +125,7 @@ public class RelatorioBPe extends Relatorio { sql.append(" COALESCE(bol.IMPORTEOUTROS,0) as valoroutros, "); sql.append(" bpe.CHBPE, "); + sql.append(" bpe.nprot as protocolo, "); sql.append(" bol.NUM_BPE as num_bpe, "); sql.append(" COALESCE(bol.NUMSERIE_BPE, '1') as numserie_bpe, "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties index bd52b3988..287e32078 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties @@ -24,6 +24,7 @@ label.valorpedagio=Ped label.valorseguro=Seguro label.valoroutros=Outros label.chaveAcesso=Chave Acesso +label.protocolo=Protocolo label.numBPe=Núm. BPe label.serie=Série label.status=Status diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties index 6eae3ae00..c0d722dd0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties @@ -25,6 +25,7 @@ label.valorpedagio=Ped label.valorseguro=Seguro label.valoroutros=Outros label.chaveAcesso=Chave Acesso +label.protocolo=Protocolo label.numBPe=Núm. BPe label.serie=Série label.status=Status diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper index 6a0bcd572..2e8732db5 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml index 1cc589ec1..b559e35ff 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml @@ -1,7 +1,7 @@ - + @@ -34,6 +34,7 @@ + @@ -59,7 +60,7 @@ - <band height="79" splitType="Stretch"> + <band height="93" splitType="Stretch"> <textField pattern="" isBlankWhenNull="false"> <reportElement uuid="da52f710-3882-4beb-ba6f-870e03f6800d" mode="Transparent" x="0" y="0" width="1021" height="41" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> @@ -123,7 +124,7 @@ </band> - + @@ -160,7 +161,7 @@ - + @@ -244,6 +245,14 @@ + + + + + + + + @@ -291,7 +300,7 @@ - + @@ -369,6 +378,15 @@ + + + + + + + + +