fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fixes bug#AL-4146' (!533) from AL-4146 into master 

Reviewed-on: adm/VentaBoletosAdm#533
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>
master 1.79.1
Gleison da Cruz 2024-05-28 15:02:30 +00:00
parent 9182e307fd 5f33fc3aff
commit 9e65b36eee
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.79.0</version> <version>1.79.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinhaPorDataEmissao.jasper
View File

Binary file not shown.

58
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTaxasLinhaPorDataEmissao.jrxml
View File

@ -184,7 +184,7 @@
<textFieldExpression><![CDATA[$V{EMBARQUE_VENDIDOS_1}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{EMBARQUE_VENDIDOS_1}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="e6546467-4251-4025-a0b8-e6502bc5b141" x="286" y="1" width="25" height="11"> <reportElement uuid="e6546467-4251-4025-a0b8-e6502bc5b141" x="286" y="1" width="30" height="11">
<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
@ -384,28 +384,28 @@
</graphicElement> </graphicElement>
</line> </line>
<staticText> <staticText>
<reportElement uuid="9c579f27-ee14-4804-b73d-64994a6e41ec" x="0" y="1" width="31" height="11"/> <reportElement uuid="9c579f27-ee14-4804-b73d-64994a6e41ec" x="0" y="1" width="31" height="11" isPrintWhenDetailOverflows="true"/>
<textElement> <textElement>
<font size="7"/> <font size="7"/>
</textElement> </textElement>
<text><![CDATA[Prefixo]]></text> <text><![CDATA[Prefixo]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="7b8a8f38-e513-4a8c-a82b-a9c6ffd21f6f" x="31" y="1" width="61" height="11"/> <reportElement uuid="7b8a8f38-e513-4a8c-a82b-a9c6ffd21f6f" x="31" y="1" width="61" height="11" isPrintWhenDetailOverflows="true"/>
<textElement> <textElement>
<font size="7"/> <font size="7"/>
</textElement> </textElement>
<text><![CDATA[Origem]]></text> <text><![CDATA[Origem]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="4f8fcbb3-73e7-4b15-9687-30ff12bb1526" x="93" y="1" width="61" height="11"/> <reportElement uuid="4f8fcbb3-73e7-4b15-9687-30ff12bb1526" x="93" y="1" width="61" height="11" isPrintWhenDetailOverflows="true"/>
<textElement> <textElement>
<font size="7"/> <font size="7"/>
</textElement> </textElement>
<text><![CDATA[Destino]]></text> <text><![CDATA[Destino]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="7b817589-f754-49f1-bf53-856be52946fb" mode="Transparent" x="186" y="1" width="25" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="7b817589-f754-49f1-bf53-856be52946fb" mode="Transparent" x="186" y="1" width="25" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -415,7 +415,7 @@
<text><![CDATA[Emb.]]></text> <text><![CDATA[Emb.]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="93a5880a-7547-4e53-85f4-09a6c22d5699" mode="Transparent" x="211" y="1" width="25" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="93a5880a-7547-4e53-85f4-09a6c22d5699" mode="Transparent" x="211" y="1" width="25" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -425,7 +425,7 @@
<text><![CDATA[Ped.]]></text> <text><![CDATA[Ped.]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="1d4f5650-a014-468d-a9b2-c58887492ace" mode="Transparent" x="236" y="1" width="25" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="1d4f5650-a014-468d-a9b2-c58887492ace" mode="Transparent" x="236" y="1" width="25" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -435,7 +435,7 @@
<text><![CDATA[Seg.]]></text> <text><![CDATA[Seg.]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="9b724ccc-0e90-4271-9e51-54128161d074" mode="Transparent" x="341" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="9b724ccc-0e90-4271-9e51-54128161d074" mode="Transparent" x="341" y="1" width="30" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -445,7 +445,7 @@
<text><![CDATA[T. Emb.]]></text> <text><![CDATA[T. Emb.]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="88be8133-60fd-45a5-9c81-363647bb3002" mode="Transparent" x="371" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="88be8133-60fd-45a5-9c81-363647bb3002" mode="Transparent" x="371" y="1" width="30" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -455,7 +455,7 @@
<text><![CDATA[T. Ped.]]></text> <text><![CDATA[T. Ped.]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="bb5f610e-adc6-4f73-ba16-11ce1ec169a3" mode="Transparent" x="401" y="1" width="30" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="bb5f610e-adc6-4f73-ba16-11ce1ec169a3" mode="Transparent" x="401" y="1" width="30" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -465,7 +465,7 @@
<text><![CDATA[T. Seg.]]></text> <text><![CDATA[T. Seg.]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="c41834a6-5ca0-4bba-a5ac-0cc2dd7a35b5" mode="Transparent" x="261" y="1" width="25" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="c41834a6-5ca0-4bba-a5ac-0cc2dd7a35b5" mode="Transparent" x="261" y="1" width="25" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_TX_EMBARQUE}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -475,7 +475,7 @@
<text><![CDATA[Q. Emb]]></text> <text><![CDATA[Q. Emb]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="88257609-1874-4558-b57a-bc6f811f7896" mode="Transparent" x="286" y="1" width="25" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="88257609-1874-4558-b57a-bc6f811f7896" mode="Transparent" x="286" y="1" width="30" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -485,7 +485,7 @@
<text><![CDATA[Q. Ped]]></text> <text><![CDATA[Q. Ped]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="276a9b95-f7ce-44e7-a3a9-65f7fd6944fd" mode="Transparent" x="316" y="1" width="25" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="276a9b95-f7ce-44e7-a3a9-65f7fd6944fd" mode="Transparent" x="316" y="1" width="25" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -495,7 +495,7 @@
<text><![CDATA[Q. Seg]]></text> <text><![CDATA[Q. Seg]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="b5fde6f7-0dce-4379-bd51-9ca891f2ee64" mode="Transparent" x="433" y="1" width="27" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="b5fde6f7-0dce-4379-bd51-9ca891f2ee64" mode="Transparent" x="433" y="1" width="27" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -505,7 +505,7 @@
<text><![CDATA[Q. SO.C]]></text> <text><![CDATA[Q. SO.C]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="8234630e-a75c-41eb-8bdf-5f4741e30a18" mode="Transparent" x="461" y="1" width="33" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="8234630e-a75c-41eb-8bdf-5f4741e30a18" mode="Transparent" x="461" y="1" width="33" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -515,7 +515,7 @@
<text><![CDATA[T. SO.C]]></text> <text><![CDATA[T. SO.C]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="8ec41c30-637d-47bf-9034-7bf2325a340c" mode="Transparent" x="495" y="1" width="25" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="8ec41c30-637d-47bf-9034-7bf2325a340c" mode="Transparent" x="495" y="1" width="25" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
@ -525,7 +525,7 @@
<text><![CDATA[Q. SO]]></text> <text><![CDATA[Q. SO]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="24525295-120f-4704-bc9a-ea2fdd548246" mode="Transparent" x="520" y="1" width="34" height="11" forecolor="#000000" backcolor="#FFFFFF"> <reportElement uuid="24525295-120f-4704-bc9a-ea2fdd548246" mode="Transparent" x="520" y="1" width="34" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF">
<printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGUROOPCIONAL}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
@ -535,7 +535,7 @@
<text><![CDATA[T. SO]]></text> <text><![CDATA[T. SO]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="8f6976c6-bd48-447f-a07f-f6bbbc33b8f6" mode="Transparent" x="154" y="1" width="32" height="11" forecolor="#000000" backcolor="#FFFFFF"/> <reportElement uuid="8f6976c6-bd48-447f-a07f-f6bbbc33b8f6" mode="Transparent" x="154" y="1" width="32" height="11" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="7" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -614,7 +614,7 @@
<textFieldExpression><![CDATA[$F{EMBARQUE_VENDIDOS}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{EMBARQUE_VENDIDOS}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="049ba79a-5ee9-4ee2-80d7-d498ad7d7125" x="286" y="0" width="25" height="11"> <reportElement uuid="049ba79a-5ee9-4ee2-80d7-d498ad7d7125" x="286" y="1" width="30" height="11">
<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
</reportElement> </reportElement>
<textElement textAlignment="Right"/> <textElement textAlignment="Right"/>
@ -711,15 +711,6 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{EMBARQUE_VENDIDOS_2}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{EMBARQUE_VENDIDOS_2}]]></textFieldExpression>
</textField> </textField>
<textField>
<reportElement uuid="96bd08a5-5321-4938-8d4b-5260faa9a283" x="286" y="0" width="25" height="11">
<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$V{PEDAGIO_VENDIDOS_2}]]></textFieldExpression>
</textField>
<textField> <textField>
<reportElement uuid="c090f6cf-7340-4990-92d0-101fbf056cb7" x="316" y="0" width="25" height="11"> <reportElement uuid="c090f6cf-7340-4990-92d0-101fbf056cb7" x="316" y="0" width="25" height="11">
<printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression> <printWhenExpression><![CDATA[$P{IS_SEGURO}]]></printWhenExpression>
@ -765,12 +756,21 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{totalValorseguroOpcionalVendido_2}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalValorseguroOpcionalVendido_2}]]></textFieldExpression>
</textField> </textField>
<textField>
<reportElement uuid="96bd08a5-5321-4938-8d4b-5260faa9a283" x="291" y="0" width="25" height="11">
<printWhenExpression><![CDATA[$P{IS_PEDAGIO}]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right">
<font size="5"/>
</textElement>
<textFieldExpression><![CDATA[$V{PEDAGIO_VENDIDOS_2}]]></textFieldExpression>
</textField>
</band> </band>
</lastPageFooter> </lastPageFooter>
<noData> <noData>
<band height="39"> <band height="39">
<textField> <textField>
<reportElement uuid="a640c0eb-ead8-4a2a-bda4-675165e8bc7d" x="198" y="8" width="530" height="20"/> <reportElement uuid="a640c0eb-ead8-4a2a-bda4-675165e8bc7d" x="1" y="0" width="553" height="39"/>
<textElement markup="none"> <textElement markup="none">
<font size="11" isBold="true"/> <font size="11" isBold="true"/>
</textElement> </textElement>