Merge pull request 'fixes bug#AL-4309' (!546) from AL-4309 into master
Reviewed-on: adm/VentaBoletosAdm#546 Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>master 1.83.0
commit
e466b192b8
4
pom.xml
4
pom.xml
|
|
@ -4,11 +4,11 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>br.com.rjconsultores</groupId>
|
||||
<artifactId>ventaboletosadm</artifactId>
|
||||
<version>1.82.1</version>
|
||||
<version>1.83.0</version>
|
||||
<packaging>war</packaging>
|
||||
|
||||
<properties>
|
||||
<modelWeb.version>1.62.1</modelWeb.version>
|
||||
<modelWeb.version>1.63.0</modelWeb.version>
|
||||
<flyway.version>1.47.1</flyway.version>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
</properties>
|
||||
|
|
|
|||
|
|
@ -28,5 +28,6 @@ label.valor = Valor
|
|||
label.formaPagamento1 =Forma pagamento1
|
||||
label.formaPagamento2 =Forma pagamento2
|
||||
label.formaPagamento3 =Forma pagamento3
|
||||
label.descricao = Descrição
|
||||
|
||||
msg.noData = N\u00E3o foi possivel obter dados com os par\u00E2metros informados.
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ label.operacaoDescricao = Descri\u00E7\u00E3o da Opera\u00E7\u00E3o
|
|||
label.serie = Serie
|
||||
label.total = Total
|
||||
label.valor = Valor
|
||||
label.descricao = Descrição
|
||||
|
||||
|
||||
msg.noData = N\u00E3o foi possivel obter dados com os par\u00E2metros informados.
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,8 +1,8 @@
|
|||
<?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="RelatorioFinanceiroReceitasDespesas" pageWidth="1243" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1203" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4">
|
||||
<property name="ireport.zoom" value="1.5"/>
|
||||
<property name="ireport.x" value="307"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<property name="ireport.zoom" value="8.33987597023839"/>
|
||||
<property name="ireport.x" value="8612"/>
|
||||
<property name="ireport.y" value="861"/>
|
||||
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
|
||||
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
|
||||
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/>
|
||||
|
|
@ -39,6 +39,7 @@
|
|||
<field name="valorFormaPagamento3" class="java.math.BigDecimal"/>
|
||||
<field name="valorFormaPagamento2" class="java.math.BigDecimal"/>
|
||||
<field name="valorFormaPagamento1" class="java.math.BigDecimal"/>
|
||||
<field name="descricao" class="java.lang.String"/>
|
||||
<variable name="vTotal" class="java.math.BigDecimal" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{precio}]]></variableExpression>
|
||||
</variable>
|
||||
|
|
@ -131,7 +132,7 @@
|
|||
<textFieldExpression><![CDATA[$R{label.agenciaDescricao}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="427" y="0" width="178" height="20" uuid="6724b194-ae32-48c6-ac74-578fe785e768"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="427" y="0" width="98" height="20" uuid="6724b194-ae32-48c6-ac74-578fe785e768"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$R{label.operacaoDescricao}]]></textFieldExpression>
|
||||
</textField>
|
||||
|
|
@ -141,55 +142,60 @@
|
|||
<textFieldExpression><![CDATA[$R{label.operacaoCodigo}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="982" y="0" width="60" height="20" uuid="083fbdd9-6c4b-4876-91d3-e5f16ca1bb43"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="905" y="0" width="60" height="20" uuid="083fbdd9-6c4b-4876-91d3-e5f16ca1bb43"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$R{label.serie}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="1042" y="0" width="80" height="20" uuid="ba0b9ea8-1174-4521-a19a-efc7ea2c9306"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="965" y="0" width="80" height="20" uuid="ba0b9ea8-1174-4521-a19a-efc7ea2c9306"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$R{label.numero}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="682" y="0" width="50" height="20" uuid="6d430f80-9725-4277-8eb7-9c36b8d0496c"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="605" y="0" width="50" height="20" uuid="6d430f80-9725-4277-8eb7-9c36b8d0496c"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$R{label.formaPagamento1}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="1122" y="0" width="80" height="20" uuid="2623c86d-602e-44af-bfbc-7a13150d1201"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="1045" y="0" width="80" height="20" uuid="2623c86d-602e-44af-bfbc-7a13150d1201"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$R{label.numeroDocumento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="782" y="0" width="50" height="20" uuid="98852ec0-40cc-46f6-8e15-d243abbef01e"/>
|
||||
<reportElement x="705" y="0" width="50" height="20" uuid="98852ec0-40cc-46f6-8e15-d243abbef01e"/>
|
||||
<textElement textAlignment="Center" markup="none"/>
|
||||
<textFieldExpression><![CDATA[$R{label.formaPagamento2}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="605" y="0" width="77" height="20" uuid="97964207-4388-4f8b-be2b-befe4264210c"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="525" y="0" width="80" height="20" uuid="97964207-4388-4f8b-be2b-befe4264210c"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$R{label.valor}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="882" y="0" width="50" height="20" uuid="ec59317f-459d-40ce-ae3e-b3c4403b8398"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="805" y="0" width="50" height="20" uuid="ec59317f-459d-40ce-ae3e-b3c4403b8398"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$R{label.formaPagamento3}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="932" y="0" width="50" height="20" uuid="3e1ddb02-ca37-431f-b072-76b9720119a5"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="855" y="0" width="50" height="20" uuid="3e1ddb02-ca37-431f-b072-76b9720119a5"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$R{label.valorFormaPagamento3}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="832" y="0" width="50" height="20" uuid="53bb879c-643a-4dd8-b9d9-4b978bec7df2"/>
|
||||
<reportElement x="755" y="0" width="50" height="20" uuid="53bb879c-643a-4dd8-b9d9-4b978bec7df2"/>
|
||||
<textElement textAlignment="Right" markup="none"/>
|
||||
<textFieldExpression><![CDATA[$R{label.valorFormaPagamento2}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="732" y="1" width="50" height="20" uuid="72be8326-4994-4155-b95a-bd7735d2a3c7"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="655" y="0" width="50" height="20" uuid="72be8326-4994-4155-b95a-bd7735d2a3c7"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$R{label.valorFormaPagamento1}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="1125" y="0" width="78" height="20" uuid="3130c634-e02d-48cd-a327-0fa62f0b46dd"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$R{label.descricao}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</columnHeader>
|
||||
<detail>
|
||||
|
|
@ -212,47 +218,37 @@
|
|||
<textFieldExpression><![CDATA[$F{tipoEventoExtraId}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="427" y="0" width="178" height="20" isPrintWhenDetailOverflows="true" uuid="e2841610-831d-4379-96ff-e5806f4c1ceb"/>
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="427" y="0" width="98" height="20" isPrintWhenDetailOverflows="true" uuid="e2841610-831d-4379-96ff-e5806f4c1ceb"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$F{descTipoEvento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="605" y="0" width="77" height="20" isPrintWhenDetailOverflows="true" uuid="77d7eb39-6b9d-448d-981b-01813e97d038"/>
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="525" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="77d7eb39-6b9d-448d-981b-01813e97d038"/>
|
||||
<textElement textAlignment="Right"/>
|
||||
<textFieldExpression><![CDATA[$F{precio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="982" y="0" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="0e52dd5f-4863-4f27-b949-222494f73b06"/>
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="905" y="0" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="0e52dd5f-4863-4f27-b949-222494f73b06"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$F{numSeriePreImpresa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1042" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="74841386-7603-436e-82cd-b1eaf08a5c44"/>
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="965" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="74841386-7603-436e-82cd-b1eaf08a5c44"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$F{numFolioPreImpreso}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1122" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="d0037045-52bd-42b7-b074-1c79cd87fd74"/>
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1045" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="d0037045-52bd-42b7-b074-1c79cd87fd74"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$F{numDocumento}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="682" y="0" width="50" height="20" isPrintWhenDetailOverflows="true" uuid="a9a0a244-8f87-4ebf-8557-dfde197b4287"/>
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="605" y="0" width="50" height="20" isPrintWhenDetailOverflows="true" uuid="a9a0a244-8f87-4ebf-8557-dfde197b4287"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$F{formaPagamento1}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" mode="Opaque" x="782" y="0" width="50" height="20" uuid="f20aaaa9-f7af-4217-9067-3ae137dd742e"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$F{formaPagamento2}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" mode="Opaque" x="882" y="0" width="50" height="20" uuid="8b78b072-a6ac-488e-93dd-fbdb41957fa6"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$F{formaPagamento3}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="732" y="0" width="50" height="20" uuid="be7f0c15-3826-4f96-a4ce-1c869ccfeaae"/>
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="655" y="0" width="50" height="20" uuid="be7f0c15-3826-4f96-a4ce-1c869ccfeaae"/>
|
||||
<box>
|
||||
<leftPen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
|
|
@ -263,7 +259,7 @@
|
|||
<textFieldExpression><![CDATA[$F{valorFormaPagamento1}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="832" y="0" width="50" height="20" uuid="87447828-a63c-4c13-b39e-6c9f8a218db2"/>
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="755" y="0" width="50" height="20" uuid="87447828-a63c-4c13-b39e-6c9f8a218db2"/>
|
||||
<box>
|
||||
<leftPen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
|
|
@ -274,7 +270,7 @@
|
|||
<textFieldExpression><![CDATA[$F{valorFormaPagamento2}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="932" y="0" width="50" height="20" uuid="2993afe4-7410-4498-b8a0-39d03f2bcbb5"/>
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="855" y="0" width="50" height="20" uuid="2993afe4-7410-4498-b8a0-39d03f2bcbb5"/>
|
||||
<box>
|
||||
<leftPen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
|
|
@ -284,6 +280,33 @@
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{valorFormaPagamento3}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1125" y="0" width="78" height="20" isPrintWhenDetailOverflows="true" uuid="ce7d9cf4-2d9c-42e4-b962-b7fe813a433e"/>
|
||||
<textElement textAlignment="Center"/>
|
||||
<textFieldExpression><![CDATA[$F{descricao}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="805" y="0" width="50" height="20" uuid="5e041247-1ea0-4af1-a4bb-445dc2ddd06f"/>
|
||||
<box>
|
||||
<leftPen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" markup="styled">
|
||||
<font fontName="SansSerif" size="10" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{formaPagamento3}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
|
||||
<reportElement style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="705" y="0" width="50" height="20" uuid="607ce7fb-25e5-4400-88f6-49e6c5aa4a04"/>
|
||||
<box>
|
||||
<leftPen lineWidth="0.0"/>
|
||||
<bottomPen lineWidth="0.0"/>
|
||||
</box>
|
||||
<textElement textAlignment="Right" verticalAlignment="Top" markup="styled">
|
||||
<font fontName="SansSerif" size="10" isBold="false"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{formaPagamento2}]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</detail>
|
||||
<columnFooter>
|
||||
|
|
@ -295,7 +318,7 @@
|
|||
<summary>
|
||||
<band height="21" splitType="Stretch">
|
||||
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement stretchType="RelativeToTallestObject" x="605" y="1" width="127" height="20" isPrintWhenDetailOverflows="true" uuid="417ed1de-ce71-42fa-8108-33a37f6a0626"/>
|
||||
<reportElement stretchType="RelativeToTallestObject" x="605" y="1" width="150" height="20" isPrintWhenDetailOverflows="true" uuid="417ed1de-ce71-42fa-8108-33a37f6a0626"/>
|
||||
<textElement textAlignment="Right">
|
||||
<font isBold="true"/>
|
||||
</textElement>
|
||||
|
|
|
|||
Loading…
Reference in New Issue