diff --git a/pom.xml b/pom.xml
index 2fba9c96d..01898977b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
br.com.rjconsultores
ventaboletosadm
- 1.150.1
+ 1.151.0
war
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoDevolucao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoDevolucao.java
index e3da86547..efa20801c 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoDevolucao.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioRemarcacaoDevolucao.java
@@ -54,6 +54,7 @@ public class RelatorioRemarcacaoDevolucao extends Relatorio {
dataResult.put("documento", rset.getString("documento"));
dataResult.put("preco", rset.getBigDecimal("preco"));
dataResult.put("multa", rset.getBigDecimal("multa"));
+ dataResult.put("formaPagamento", rset.getString("formaPagamento"));
data.add(dataResult);
}
@@ -89,8 +90,12 @@ public class RelatorioRemarcacaoDevolucao extends Relatorio {
sql.append("CASE WHEN cliente.CLIENTE_ID IS NULL THEN boleto.NOMBPASAJERO ELSE cliente.NOMBCLIENTE END as passageiro, ");
sql.append("CASE WHEN cliente.CLIENTE_ID IS NULL THEN boleto.DESCNUMDOC ELSE cliente.NUMIDENTIFICAUNO END as documento, ");
sql.append("boleto.PRECIOPAGADO as preco, ");
- sql.append("COALESCE(eventoExtra.IMPINGRESO,0) as multa ");
-
+ sql.append("COALESCE(eventoExtra.IMPINGRESO,0) as multa, ");
+ sql.append("(SELECT distinct LISTAGG(fp.DESCPAGO, ',') WITHIN GROUP (ORDER BY fp.DESCPAGO) ");
+ sql.append("FROM boleto b ");
+ sql.append("INNER JOIN BOLETO_FORMAPAGO bf ON b.BOLETO_ID = bf.BOLETO_ID ");
+ sql.append("INNER JOIN FORMA_PAGO fp ON bf.FORMAPAGO_ID = fp.FORMAPAGO_ID ");
+ sql.append("WHERE boleto.BOLETO_ID = b.BOLETO_ID ) AS formaPagamento ");
sql.append("FROM BOLETO boleto ");
sql.append("INNER JOIN BOLETO boletoOriginal ON boletoOriginal.BOLETO_ID = boleto.BOLETOORIGINAL_ID ");
sql.append("INNER JOIN PARADA origem ON origem.PARADA_ID = boleto.ORIGEN_ID ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoDevolucao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoDevolucao_es.properties
index e5dda80ab..fc8165ed1 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoDevolucao_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoDevolucao_es.properties
@@ -23,3 +23,4 @@ detail.passageiro=Passageiro
detail.documento=Doc
detail.preco=Preço
detail.multa=Multa
+detail.formaPagamento=Forma Pago
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoDevolucao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoDevolucao_pt_BR.properties
index b78fa0039..d118b2b84 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoDevolucao_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioRemarcacaoDevolucao_pt_BR.properties
@@ -23,3 +23,4 @@ detail.passageiro=Passageiro
detail.documento=Doc
detail.preco=Preço
detail.multa=Multa
+detail.formaPagamento=Forma Pagamento
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoDevolucao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoDevolucao.jasper
index 595b46667..862bb23ca 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoDevolucao.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoDevolucao.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoDevolucao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoDevolucao.jrxml
index 0f9703cea..c2eea503a 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoDevolucao.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioRemarcacaoDevolucao.jrxml
@@ -1,5 +1,5 @@
-
+
@@ -120,6 +120,7 @@
+
@@ -142,66 +143,59 @@
+
<band height="94" splitType="Stretch">
<textField pattern="dd/MM/yyyy HH:mm">
- <reportElement uuid="1d25eae5-3bdd-4191-b928-a22eaf7e5a03" x="732" y="0" width="98" height="20"/>
+ <reportElement x="732" y="0" width="98" height="20" uuid="1d25eae5-3bdd-4191-b928-a22eaf7e5a03"/>
<textElement textAlignment="Left"/>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField>
- <reportElement uuid="be5f7ffc-da87-44a0-bfcc-84cd0f66f36a" x="676" y="0" width="56" height="20"/>
- <textElement/>
+ <reportElement x="676" y="0" width="56" height="20" uuid="be5f7ffc-da87-44a0-bfcc-84cd0f66f36a"/>
<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
</textField>
<textField>
- <reportElement uuid="d4b4816b-da66-4d25-9c22-d30bd55dc34c" x="781" y="20" width="27" height="20"/>
+ <reportElement x="781" y="20" width="27" height="20" uuid="d4b4816b-da66-4d25-9c22-d30bd55dc34c"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
</textField>
<textField evaluationTime="Report">
- <reportElement uuid="5f47e34e-efae-4d91-b7ca-04aecfc909f5" x="808" y="20" width="22" height="20"/>
+ <reportElement x="808" y="20" width="22" height="20" uuid="5f47e34e-efae-4d91-b7ca-04aecfc909f5"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
- <reportElement uuid="3329905a-f0cd-4788-8a38-722dc6d4f9a7" x="49" y="20" width="77" height="20"/>
- <textElement/>
+ <reportElement x="49" y="20" width="77" height="20" uuid="3329905a-f0cd-4788-8a38-722dc6d4f9a7"/>
<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
</textField>
<textField>
- <reportElement uuid="11d7e7d5-9128-40a8-ae73-406b86f9bee8" x="744" y="20" width="37" height="20"/>
- <textElement/>
+ <reportElement x="744" y="20" width="37" height="20" uuid="11d7e7d5-9128-40a8-ae73-406b86f9bee8"/>
<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
</textField>
<textField>
- <reportElement uuid="d0939e91-23cf-4ecf-9dce-272002419d19" x="0" y="0" width="231" height="20"/>
- <textElement/>
+ <reportElement x="0" y="0" width="231" height="20" uuid="d0939e91-23cf-4ecf-9dce-272002419d19"/>
<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
</textField>
<textField>
- <reportElement uuid="201503fc-95d2-4d13-a2f4-39e0a786fc57" x="0" y="20" width="49" height="20"/>
- <textElement/>
+ <reportElement x="0" y="20" width="49" height="20" uuid="201503fc-95d2-4d13-a2f4-39e0a786fc57"/>
<textFieldExpression><![CDATA[$R{header.periodo}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
- <reportElement uuid="8ba1afc9-cc5f-4947-ab31-cb7273ad8123" x="164" y="20" width="78" height="20"/>
- <textElement/>
+ <reportElement x="164" y="20" width="78" height="20" uuid="8ba1afc9-cc5f-4947-ab31-cb7273ad8123"/>
<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
</textField>
<textField>
- <reportElement uuid="9edd4bc8-ce45-47d4-90f5-59f0def26e72" x="126" y="20" width="38" height="20"/>
+ <reportElement x="126" y="20" width="38" height="20" uuid="9edd4bc8-ce45-47d4-90f5-59f0def26e72"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$R{msg.a}]]></textFieldExpression>
</textField>
<textField>
- <reportElement uuid="1340c66f-18a6-421d-905a-aa5c863b6192" x="49" y="74" width="742" height="20"/>
- <textElement/>
+ <reportElement x="49" y="74" width="941" height="20" uuid="1340c66f-18a6-421d-905a-aa5c863b6192"/>
<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
</textField>
<textField>
- <reportElement uuid="4c4004ee-7bb0-4438-81f8-86d8c7d2fefe" x="0" y="74" width="49" height="20"/>
- <textElement/>
+ <reportElement x="0" y="74" width="49" height="20" uuid="4c4004ee-7bb0-4438-81f8-86d8c7d2fefe"/>
<textFieldExpression><![CDATA[$R{header.filtro}]]></textFieldExpression>
</textField>
</band>
@@ -209,17 +203,17 @@
<detail>
<band height="220" splitType="Stretch">
<componentElement>
- <reportElement uuid="58f96b74-fd09-491b-8c94-36ea8b90b501" key="table 4" style="table 4" positionType="Float" x="0" y="0" width="830" height="110" isRemoveLineWhenBlank="true">
+ <reportElement key="table 4" style="table 4" positionType="Float" x="0" y="0" width="990" height="110" isRemoveLineWhenBlank="true" uuid="58f96b74-fd09-491b-8c94-36ea8b90b501">
<printWhenExpression><![CDATA[$P{IS_REMARCACAO}]]></printWhenExpression>
</reportElement>
<jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd">
<datasetRun subDataset="New Dataset 1" uuid="7ca3ac0c-e1ef-4128-876f-b3e7d8f3b6b5">
<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($P{data})]]></dataSourceExpression>
</datasetRun>
- <jr:column width="90" uuid="7c52851d-9ca3-466e-9a9a-9edbf5cb7722">
+ <jr:column width="83" uuid="7c52851d-9ca3-466e-9a9a-9edbf5cb7722">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="137da473-f682-4209-8fc7-bbc60a9851bb" x="0" y="0" width="90" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="83" height="30" isRemoveLineWhenBlank="true" uuid="137da473-f682-4209-8fc7-bbc60a9851bb">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -228,10 +222,9 @@
<textFieldExpression><![CDATA[$R{detail.dataVenta}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
- <reportElement uuid="3d1182a7-215f-4092-9896-0df2836dbd8c" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="83" height="20" uuid="3d1182a7-215f-4092-9896-0df2836dbd8c"/>
<textFieldExpression><![CDATA[$F{dataVenta}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -239,7 +232,7 @@
<jr:column width="61" uuid="73369793-0d88-43ab-9f2b-a7d82aea6557">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="287869c0-3b83-4be5-9a77-3a838e165e6b" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true" uuid="287869c0-3b83-4be5-9a77-3a838e165e6b">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -248,10 +241,9 @@
<textFieldExpression><![CDATA[$R{detail.origem}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="9e73afe1-281c-4dec-88fb-f3bd3f8acb55" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="9e73afe1-281c-4dec-88fb-f3bd3f8acb55"/>
<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -259,7 +251,7 @@
<jr:column width="61" uuid="31cc66ac-de74-4b6b-afc0-6c8446e70ec9">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="bcf47ee4-dde6-472e-a8ba-9dcb95ead828" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true" uuid="bcf47ee4-dde6-472e-a8ba-9dcb95ead828">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -268,10 +260,9 @@
<textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="bb88ab68-033d-4355-91aa-bac368ed2739" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="bb88ab68-033d-4355-91aa-bac368ed2739"/>
<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -279,7 +270,7 @@
<jr:column width="61" uuid="46fa6332-955c-49ad-a298-af0efdfb0521">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="b494236c-76c4-479b-b5b4-f2e99bf5e636" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true" uuid="b494236c-76c4-479b-b5b4-f2e99bf5e636">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -288,10 +279,9 @@
<textFieldExpression><![CDATA[$R{detail.agencia}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="f378c398-6530-4044-b63d-7f64dc60b036" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="f378c398-6530-4044-b63d-7f64dc60b036"/>
<textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -299,7 +289,7 @@
<jr:column width="61" uuid="f0564294-2879-457d-be66-2c65118f4805">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="63be6b99-a4b3-4820-8e03-4a91932fcd6f" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true" uuid="63be6b99-a4b3-4820-8e03-4a91932fcd6f">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -308,10 +298,9 @@
<textFieldExpression><![CDATA[$R{detail.linha}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="d9917c4c-5572-4492-a71f-d3a98d38528a" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="d9917c4c-5572-4492-a71f-d3a98d38528a"/>
<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -319,7 +308,7 @@
<jr:column width="61" uuid="84967c49-db8f-4cb5-bfd6-e191775555b8">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="943b0707-f849-42d5-afee-4f4523d5361a" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true" uuid="943b0707-f849-42d5-afee-4f4523d5361a">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -328,10 +317,9 @@
<textFieldExpression><![CDATA[$R{detail.servico}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="d33b7ccf-55da-4715-b2b1-3ff3f0927b3b" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="d33b7ccf-55da-4715-b2b1-3ff3f0927b3b"/>
<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -339,7 +327,7 @@
<jr:column width="61" uuid="a8cb0e77-2b52-4cf8-967a-e707e33102e7">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="3dcb6050-c6e1-4eb7-835d-5ef21e11c1ad" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true" uuid="3dcb6050-c6e1-4eb7-835d-5ef21e11c1ad">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -348,10 +336,9 @@
<textFieldExpression><![CDATA[$R{detail.passageiro}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="9cf2d41b-269b-44ea-a099-d57274ecd906" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="9cf2d41b-269b-44ea-a099-d57274ecd906"/>
<textFieldExpression><![CDATA[$F{passageiro}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -359,7 +346,7 @@
<jr:column width="61" uuid="c016b561-84f8-4004-b14c-f93e028b9a4e">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="54614ac3-b675-4f4b-b16e-a093c0938165" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true" uuid="54614ac3-b675-4f4b-b16e-a093c0938165">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -368,10 +355,9 @@
<textFieldExpression><![CDATA[$R{detail.documento}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="faf32da2-2f6d-424a-8c2a-456987dd017e" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="faf32da2-2f6d-424a-8c2a-456987dd017e"/>
<textFieldExpression><![CDATA[$F{documento}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -379,7 +365,7 @@
<jr:column width="90" uuid="a4c504bc-3120-455c-8e1f-145a72e327a8">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="83acdcd3-ea46-4df6-9504-c994bb10e925" x="0" y="0" width="90" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="90" height="30" isRemoveLineWhenBlank="true" uuid="83acdcd3-ea46-4df6-9504-c994bb10e925">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -388,10 +374,9 @@
<textFieldExpression><![CDATA[$R{detail.dataViagem}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
- <reportElement uuid="94cd1c11-c955-48a6-8e63-bfc0dc10cf6a" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20" uuid="94cd1c11-c955-48a6-8e63-bfc0dc10cf6a"/>
<textFieldExpression><![CDATA[$F{dataViagem}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -399,7 +384,7 @@
<jr:column width="90" uuid="b218d2fe-8df1-4c72-8bb1-e810f674d5d9">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="aa475f49-13f6-4101-859f-3d2f3402a260" x="0" y="0" width="90" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="90" height="30" isRemoveLineWhenBlank="true" uuid="aa475f49-13f6-4101-859f-3d2f3402a260">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -408,10 +393,9 @@
<textFieldExpression><![CDATA[$R{detail.dataViagemOriginal}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
- <reportElement uuid="577766d9-e68c-4553-a389-b31dcc441d84" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20" uuid="577766d9-e68c-4553-a389-b31dcc441d84"/>
<textFieldExpression><![CDATA[$F{dataViagemOriginal}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -419,7 +403,7 @@
<jr:column width="90" uuid="d5e189c1-875b-402b-940e-20d8e254e085">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="dec4d559-0a21-4a7c-a854-f1a55a2c3f31" x="0" y="0" width="90" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="90" height="30" isRemoveLineWhenBlank="true" uuid="dec4d559-0a21-4a7c-a854-f1a55a2c3f31">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -428,10 +412,9 @@
<textFieldExpression><![CDATA[$R{detail.dataRemarcacao}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
- <reportElement uuid="3b7e0e6d-e79a-48a1-a54d-da6fce1b358b" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20" uuid="3b7e0e6d-e79a-48a1-a54d-da6fce1b358b"/>
<textFieldExpression><![CDATA[$F{dataRemarcacaoDevolucao}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -439,7 +422,7 @@
<jr:column width="61" uuid="f1ebd3b7-4c66-42b7-903a-6bf62cb2d34b">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="bc0152ce-9ebc-42cd-95de-88fd7679457f" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true" uuid="bc0152ce-9ebc-42cd-95de-88fd7679457f">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -448,10 +431,9 @@
<textFieldExpression><![CDATA[$R{detail.preco}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
- <reportElement uuid="34593c44-8428-4180-826a-5f52eda10e4f" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="34593c44-8428-4180-826a-5f52eda10e4f"/>
<textFieldExpression><![CDATA[$F{preco}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -459,7 +441,7 @@
<jr:column width="61" uuid="7a53b7d4-3bbc-494b-9f5f-8451efa5a158">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField isBlankWhenNull="true">
- <reportElement uuid="a24dc6d8-906a-4549-a372-2fb8c9f5cb49" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
+ <reportElement x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true" uuid="a24dc6d8-906a-4549-a372-2fb8c9f5cb49">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
</reportElement>
<textElement markup="none">
@@ -468,18 +450,36 @@
<textFieldExpression><![CDATA[$R{detail.multa}]]></textFieldExpression>
</textField>
</jr:columnHeader>
- <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
- <reportElement uuid="46175e6d-7ab4-475e-b5e1-885c87f5c565" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="46175e6d-7ab4-475e-b5e1-885c87f5c565"/>
<textFieldExpression><![CDATA[$F{multa}]]></textFieldExpression>
</textField>
</jr:detailCell>
</jr:column>
+ <jr:column width="109" uuid="7a53b7d4-3bbc-494b-9f5f-8451efa5a158">
+ <jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
+ <textField isBlankWhenNull="true">
+ <reportElement x="0" y="0" width="109" height="30" isRemoveLineWhenBlank="true" uuid="a24dc6d8-906a-4549-a372-2fb8c9f5cb49">
+ <printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
+ </reportElement>
+ <textElement markup="none">
+ <font isBold="true" pdfFontName="Helvetica-Bold"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{detail.formaPagamento}]]></textFieldExpression>
+ </textField>
+ </jr:columnHeader>
+ <jr:detailCell style="table 4_TD" height="30" rowSpan="1">
+ <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="109" height="20" uuid="46175e6d-7ab4-475e-b5e1-885c87f5c565"/>
+ <textFieldExpression><![CDATA[$F{formaPagamento}]]></textFieldExpression>
+ </textField>
+ </jr:detailCell>
+ </jr:column>
</jr:table>
</componentElement>
<componentElement>
- <reportElement uuid="c740ab37-04eb-40a9-80a1-e3a3dd5c7ed7" key="table 4" style="table 4" positionType="Float" x="0" y="110" width="832" height="110" isRemoveLineWhenBlank="true">
+ <reportElement key="table 4" style="table 4" positionType="Float" x="0" y="110" width="990" height="110" isRemoveLineWhenBlank="true" uuid="c740ab37-04eb-40a9-80a1-e3a3dd5c7ed7">
<printWhenExpression><![CDATA[!$P{IS_REMARCACAO}]]></printWhenExpression>
</reportElement>
<jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd">
@@ -489,7 +489,7 @@
<jr:column width="90" uuid="f9ac65cb-5f28-42ab-ba30-9a36833f0b66">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
- <reportElement uuid="e85eadd5-58fd-4a3a-acdc-981a8ad74785" x="0" y="0" width="90" height="30"/>
+ <reportElement x="0" y="0" width="90" height="30" uuid="e85eadd5-58fd-4a3a-acdc-981a8ad74785"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@@ -498,8 +498,7 @@
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
- <reportElement uuid="8aa31f3e-3bfa-4e68-b43d-1d2a278bf3fd" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20" uuid="8aa31f3e-3bfa-4e68-b43d-1d2a278bf3fd"/>
<textFieldExpression><![CDATA[$F{dataVenta}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -507,7 +506,7 @@
<jr:column width="90" uuid="6913094e-406d-4225-95a8-575265ef01be">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
- <reportElement uuid="14cdcd85-b8b7-4e73-a05f-7e7ee87df3c3" x="0" y="0" width="90" height="30"/>
+ <reportElement x="0" y="0" width="90" height="30" uuid="14cdcd85-b8b7-4e73-a05f-7e7ee87df3c3"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@@ -516,8 +515,7 @@
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
- <reportElement uuid="0a02b65a-3ff1-4241-87b9-966f313c3574" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20" uuid="0a02b65a-3ff1-4241-87b9-966f313c3574"/>
<textFieldExpression><![CDATA[$F{dataViagem}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -525,7 +523,7 @@
<jr:column width="61" uuid="cf9c12ab-2e1b-4f80-af3b-58e805f07c17">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
- <reportElement uuid="2d02763a-7550-4bbb-b444-b6a8bb1bb8c5" x="0" y="0" width="61" height="30"/>
+ <reportElement x="0" y="0" width="61" height="30" uuid="2d02763a-7550-4bbb-b444-b6a8bb1bb8c5"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@@ -534,8 +532,7 @@
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="25b7a795-497d-4d2c-a2b2-259e3eb8e9e5" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="25b7a795-497d-4d2c-a2b2-259e3eb8e9e5"/>
<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -543,7 +540,7 @@
<jr:column width="61" uuid="b4498f40-4a3d-47f1-811c-a8dfbe3eb3ff">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
- <reportElement uuid="9d02e5bd-0c77-4de8-937e-83683d1a24f4" x="0" y="0" width="61" height="30"/>
+ <reportElement x="0" y="0" width="61" height="30" uuid="9d02e5bd-0c77-4de8-937e-83683d1a24f4"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@@ -552,8 +549,7 @@
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="85e7fa41-21bf-4045-9a06-446ce1be0f43" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="85e7fa41-21bf-4045-9a06-446ce1be0f43"/>
<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -561,7 +557,7 @@
<jr:column width="61" uuid="325894dd-a30b-47bf-b704-86ed6f53821c">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
- <reportElement uuid="36b379f4-8509-4ac1-b06c-2ef4230fe869" x="0" y="0" width="61" height="30"/>
+ <reportElement x="0" y="0" width="61" height="30" uuid="36b379f4-8509-4ac1-b06c-2ef4230fe869"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@@ -570,8 +566,7 @@
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="c94d985a-8512-4490-987c-028c5f8a4c35" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="c94d985a-8512-4490-987c-028c5f8a4c35"/>
<textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -579,7 +574,7 @@
<jr:column width="90" uuid="bd26312a-c242-4726-9588-12306d5cab07">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
- <reportElement uuid="a098eece-64a6-4535-9444-7044510d4891" x="0" y="0" width="90" height="30"/>
+ <reportElement x="0" y="0" width="90" height="30" uuid="a098eece-64a6-4535-9444-7044510d4891"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@@ -588,8 +583,7 @@
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="3f21db36-3758-4d82-81e7-3b60ee415d4c" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20" uuid="3f21db36-3758-4d82-81e7-3b60ee415d4c"/>
<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -597,7 +591,7 @@
<jr:column width="61" uuid="646acd43-a90c-4db2-98be-b5030af74b22">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
- <reportElement uuid="3abefbba-f547-4679-b46d-033069bfa3f0" x="0" y="0" width="61" height="30"/>
+ <reportElement x="0" y="0" width="61" height="30" uuid="3abefbba-f547-4679-b46d-033069bfa3f0"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@@ -606,8 +600,7 @@
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="02d0dc39-895c-473c-acc2-d9043510bb04" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="02d0dc39-895c-473c-acc2-d9043510bb04"/>
<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -615,7 +608,7 @@
<jr:column width="61" uuid="c5f20838-c6d2-4939-bffe-c4c4fb925150">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
- <reportElement uuid="e20c9100-2224-48ce-a7c4-8b93f71932b8" x="0" y="0" width="61" height="30"/>
+ <reportElement x="0" y="0" width="61" height="30" uuid="e20c9100-2224-48ce-a7c4-8b93f71932b8"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@@ -624,8 +617,7 @@
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="73cd59c9-2ef1-491e-9146-86fc2b6af605" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="73cd59c9-2ef1-491e-9146-86fc2b6af605"/>
<textFieldExpression><![CDATA[$F{passageiro}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -633,7 +625,7 @@
<jr:column width="61" uuid="7f35ff8d-ef6c-416b-b4e5-3c4368a4f7e8">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
- <reportElement uuid="8afd26a3-f97b-4097-ae84-dfa21b313dd1" x="0" y="0" width="61" height="30"/>
+ <reportElement x="0" y="0" width="61" height="30" uuid="8afd26a3-f97b-4097-ae84-dfa21b313dd1"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@@ -642,8 +634,7 @@
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
- <reportElement uuid="7dadc24c-24f3-4cfa-890f-fdb07b15bf02" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="61" height="20" uuid="7dadc24c-24f3-4cfa-890f-fdb07b15bf02"/>
<textFieldExpression><![CDATA[$F{documento}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -651,7 +642,7 @@
<jr:column width="90" uuid="44267c11-d4a4-422f-9ecb-ced2bd605986">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
- <reportElement uuid="1446b64b-5f3e-4c41-9b84-8165a008908f" x="0" y="0" width="90" height="30"/>
+ <reportElement x="0" y="0" width="90" height="30" uuid="1446b64b-5f3e-4c41-9b84-8165a008908f"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@@ -660,8 +651,7 @@
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
- <reportElement uuid="868e81e9-c0fa-46fa-a055-c412d5698739" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20" uuid="868e81e9-c0fa-46fa-a055-c412d5698739"/>
<textFieldExpression><![CDATA[$F{dataRemarcacaoDevolucao}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -669,7 +659,7 @@
<jr:column width="62" uuid="eb283198-934b-4c96-aaf4-792b99aa7377">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
- <reportElement uuid="619e0051-d9bc-4e09-9fa3-4982466a19e1" x="0" y="0" width="62" height="30"/>
+ <reportElement x="0" y="0" width="62" height="30" uuid="619e0051-d9bc-4e09-9fa3-4982466a19e1"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@@ -678,8 +668,7 @@
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
- <reportElement uuid="459899cc-95ba-4102-a684-5b2d0994f2d1" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="62" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="62" height="20" uuid="459899cc-95ba-4102-a684-5b2d0994f2d1"/>
<textFieldExpression><![CDATA[$F{preco}]]></textFieldExpression>
</textField>
</jr:detailCell>
@@ -687,7 +676,7 @@
<jr:column width="62" uuid="80c7a7d7-012f-4afb-851d-7d903edffe14">
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
<textField>
- <reportElement uuid="19b6d697-6adb-49a4-8be2-9c4d813c169c" x="0" y="0" width="62" height="30"/>
+ <reportElement x="0" y="0" width="62" height="30" uuid="19b6d697-6adb-49a4-8be2-9c4d813c169c"/>
<textElement markup="none">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
@@ -696,12 +685,28 @@
</jr:columnHeader>
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
- <reportElement uuid="efbac3b3-dbc2-40d0-8563-17367148f8c1" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="62" height="20"/>
- <textElement/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="62" height="20" uuid="efbac3b3-dbc2-40d0-8563-17367148f8c1"/>
<textFieldExpression><![CDATA[$F{multa}]]></textFieldExpression>
</textField>
</jr:detailCell>
</jr:column>
+ <jr:column width="116" uuid="80c7a7d7-012f-4afb-851d-7d903edffe14">
+ <jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
+ <textField>
+ <reportElement x="0" y="0" width="116" height="30" uuid="19b6d697-6adb-49a4-8be2-9c4d813c169c"/>
+ <textElement markup="none">
+ <font isBold="true" pdfFontName="Helvetica-Bold"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{detail.formaPagamento}]]></textFieldExpression>
+ </textField>
+ </jr:columnHeader>
+ <jr:detailCell style="table 4_TD" height="20" rowSpan="1">
+ <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="116" height="20" uuid="efbac3b3-dbc2-40d0-8563-17367148f8c1"/>
+ <textFieldExpression><![CDATA[$F{formaPagamento}]]></textFieldExpression>
+ </textField>
+ </jr:detailCell>
+ </jr:column>
</jr:table>
</componentElement>
</band>
@@ -709,8 +714,7 @@
<noData>
<band height="20">
<textField>
- <reportElement uuid="df5ce216-9162-49e8-a571-cac4ede62096" x="0" y="0" width="832" height="20"/>
- <textElement/>
+ <reportElement x="0" y="0" width="990" height="20" uuid="df5ce216-9162-49e8-a571-cac4ede62096"/>
<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
</textField>
</band>