diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper index 8876210ae..de54ad702 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml index af7eba719..80218f7e2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml @@ -50,7 +50,7 @@ - + @@ -99,158 +99,152 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - - + - - + - + - + - + - + - - + - - + - - + - + @@ -261,184 +255,182 @@ - + - + - + - + - + - + 0?new BigDecimal("100.00"):$V{sum_por_equivalente}]]> - + 0?new BigDecimal("100.00"):$V{sum_porc_abs}]]> - + - + - + - + - + - + - + - + - + - + - - + - - + - + - + - + - + - + - + - + - + - + @@ -448,84 +440,74 @@ - + - - + - - + - - + - - + - - + - - + - - + - + - - + - - + - - + - + @@ -538,51 +520,49 @@ <band height="83" splitType="Stretch"> <staticText> - <reportElement uuid="58b5b133-43e0-42f0-a904-5cc3645d3df3" x="0" y="0" width="301" height="20"/> + <reportElement x="0" y="0" width="301" height="20" uuid="58b5b133-43e0-42f0-a904-5cc3645d3df3"/> <textElement> <font size="14" isBold="true"/> </textElement> <text><![CDATA[ORIGEM/DESTINO OD]]></text> </staticText> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5" x="391" y="0" width="164" height="20"/> + <reportElement x="391" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/> <textElement textAlignment="Right"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3" x="0" y="20" width="301" height="20"/> + <reportElement x="0" y="20" width="301" height="20" uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3"/> <textElement> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA["Período: " + $P{DATA_DE} + " a " + $P{DATA_ATE}]]></textFieldExpression> </textField> <staticText> - <reportElement uuid="bb8d0dec-2060-456e-bca1-c69d7c272fa3" x="0" y="63" width="74" height="19"/> + <reportElement x="0" y="63" width="74" height="19" uuid="bb8d0dec-2060-456e-bca1-c69d7c272fa3"/> <textElement> <font isBold="true"/> </textElement> <text><![CDATA[Serviço(s):]]></text> </staticText> <line> - <reportElement uuid="3f36efc2-5272-4015-95bb-b8efdc893b89" x="0" y="82" width="555" height="1"/> + <reportElement x="0" y="82" width="555" height="1" uuid="3f36efc2-5272-4015-95bb-b8efdc893b89"/> </line> <staticText> - <reportElement uuid="3857502f-b69a-4362-97fe-6f7a7f6ee32b" x="0" y="43" width="74" height="20"/> + <reportElement x="0" y="43" width="74" height="20" uuid="3857502f-b69a-4362-97fe-6f7a7f6ee32b"/> <textElement> <font isBold="true"/> </textElement> <text><![CDATA[Empresa(s):]]></text> </staticText> <textField> - <reportElement uuid="7f31cdf0-886d-4eef-b64c-28bc94c05b77" x="74" y="43" width="471" height="20" isPrintWhenDetailOverflows="true"/> - <textElement/> + <reportElement x="74" y="43" width="471" height="20" isPrintWhenDetailOverflows="true" uuid="7f31cdf0-886d-4eef-b64c-28bc94c05b77"/> <textFieldExpression><![CDATA[$P{EMPRESAS}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="44b1c344-61df-4dd0-b661-cae5f2f8e699" x="74" y="63" width="471" height="19" isPrintWhenDetailOverflows="true"/> - <textElement/> + <reportElement x="74" y="63" width="471" height="19" isPrintWhenDetailOverflows="true" uuid="44b1c344-61df-4dd0-b661-cae5f2f8e699"/> <textFieldExpression><![CDATA[$P{CORRIDAS_SELECIONADAS}]]></textFieldExpression> </textField> </band> @@ -590,10 +570,10 @@ <pageHeader> <band height="21" splitType="Stretch"> <line> - <reportElement uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa" x="0" y="19" width="555" height="1"/> + <reportElement x="0" y="19" width="555" height="1" uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa"/> </line> <textField> - <reportElement uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec" x="391" y="0" width="164" height="20"/> + <reportElement x="391" y="0" width="164" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/> <textElement textAlignment="Right"> <font isBold="true"/> </textElement> @@ -607,57 +587,55 @@ <detail> <band height="21" splitType="Stretch"> <textField> - <reportElement uuid="bf929e3d-cad8-411d-ba89-1d9cb35c8c00" x="0" y="0" width="44" height="21"/> - <textElement/> + <reportElement x="0" y="0" width="44" height="21" uuid="bf929e3d-cad8-411d-ba89-1d9cb35c8c00"/> <textFieldExpression><![CDATA[$F{ORIGEM}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="eab5b297-016b-404a-8b09-db55f57f1bfe" x="44" y="0" width="50" height="21"/> - <textElement/> + <reportElement x="44" y="0" width="50" height="21" uuid="eab5b297-016b-404a-8b09-db55f57f1bfe"/> <textFieldExpression><![CDATA[$F{DESTINO}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="bdf4a2b0-f041-47c1-962c-10df1c9fbec2" x="133" y="0" width="48" height="21"/> + <reportElement x="133" y="0" width="48" height="21" uuid="bdf4a2b0-f041-47c1-962c-10df1c9fbec2"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{PRECIOBASE}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="c45c70fb-1c4e-46a8-9a39-f804605e85b5" x="181" y="0" width="45" height="21"/> + <reportElement x="181" y="0" width="45" height="21" uuid="c45c70fb-1c4e-46a8-9a39-f804605e85b5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{ABSOLUTOS}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="c88714a3-010d-4e26-801d-8982acc15a19" x="226" y="0" width="60" height="21"/> + <reportElement x="226" y="0" width="60" height="21" uuid="c88714a3-010d-4e26-801d-8982acc15a19"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{RECEITA}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="87a6161e-e6ed-4330-bbff-34a87a5fb1a6" x="94" y="0" width="39" height="21"/> + <reportElement x="94" y="0" width="39" height="21" uuid="87a6161e-e6ed-4330-bbff-34a87a5fb1a6"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{KM_TRAMO}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="5ad372c0-5127-4441-aae3-be6ca2949a93" x="334" y="0" width="60" height="21"/> + <reportElement x="334" y="0" width="60" height="21" uuid="5ad372c0-5127-4441-aae3-be6ca2949a93"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{equivalente}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="0fe8352f-f787-46b6-adcb-e8dda60b4d9d" x="286" y="0" width="48" height="21"/> + <reportElement x="286" y="0" width="48" height="21" uuid="0fe8352f-f787-46b6-adcb-e8dda60b4d9d"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{rec_abs}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="22d22d0b-ed49-44a7-8725-c4a62b7fbb41" x="463" y="0" width="44" height="21"/> + <reportElement x="463" y="0" width="44" height="21" uuid="22d22d0b-ed49-44a7-8725-c4a62b7fbb41"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{porc_abs}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="5ecd33c0-2648-482f-b87a-d5197d2f193e" x="507" y="0" width="48" height="21"/> + <reportElement x="507" y="0" width="48" height="21" uuid="5ecd33c0-2648-482f-b87a-d5197d2f193e"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{por_equivalente}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="0de4edf8-49c8-49d2-b2d6-0476fb8ab3ed" x="394" y="0" width="69" height="20"/> + <reportElement x="394" y="0" width="69" height="20" uuid="0de4edf8-49c8-49d2-b2d6-0476fb8ab3ed"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{pax_km}]]></textFieldExpression> </textField>