Merge pull request 'AL-2518' (!182) from AL-2518 into master
Reviewed-on: adm/VentaBoletosAdm#182 Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>master 1.7.3
commit
10f105daf1
2
pom.xml
2
pom.xml
|
|
@ -4,7 +4,7 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>br.com.rjconsultores</groupId>
|
||||
<artifactId>ventaboletosadm</artifactId>
|
||||
<version>1.7.2</version>
|
||||
<version>1.7.3</version>
|
||||
<packaging>war</packaging>
|
||||
|
||||
<properties>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -43,7 +43,9 @@
|
|||
<variable name="totalVendaPassagens" class="java.math.BigDecimal" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{totalTarifa}]]></variableExpression>
|
||||
</variable>
|
||||
<variable name="totalComissaoVenda" class="java.math.BigDecimal" calculation="Sum"/>
|
||||
<variable name="totalComissaoVenda" class="java.math.BigDecimal" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{comissaoTarifa}]]></variableExpression>
|
||||
</variable>
|
||||
<variable name="totalVendaImpPosterior" class="java.math.BigDecimal" calculation="Sum">
|
||||
<variableExpression><![CDATA[$F{totalVendaImpPosterior}]]></variableExpression>
|
||||
</variable>
|
||||
|
|
@ -485,91 +487,91 @@
|
|||
<summary>
|
||||
<band height="24">
|
||||
<textField>
|
||||
<reportElement uuid="254c9278-71b2-4ffa-926c-5b0055e02cda" x="0" y="2" width="95" height="20"/>
|
||||
<reportElement uuid="254c9278-71b2-4ffa-926c-5b0055e02cda" x="0" y="4" width="95" height="20"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.total.geral}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="f73d0e76-f4b7-4f0d-9829-1e2e0ac136e2" x="95" y="2" width="40" height="20"/>
|
||||
<reportElement uuid="f73d0e76-f4b7-4f0d-9829-1e2e0ac136e2" x="95" y="4" width="40" height="20"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{totalVendaPassagens}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="8d5c13c7-22b3-4d98-aa90-2f29c66b27df" x="135" y="2" width="40" height="20"/>
|
||||
<reportElement uuid="8d5c13c7-22b3-4d98-aa90-2f29c66b27df" x="135" y="4" width="40" height="20"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{totalComissaoVenda}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="5283241a-48aa-4a14-9055-fa4556740285" x="175" y="2" width="40" height="20"/>
|
||||
<reportElement uuid="5283241a-48aa-4a14-9055-fa4556740285" x="175" y="4" width="40" height="20"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{totalVendaImpPosterior}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="1e757c53-6a63-4631-8cf1-1947ef2e5655" x="215" y="2" width="40" height="20"/>
|
||||
<reportElement uuid="1e757c53-6a63-4631-8cf1-1947ef2e5655" x="215" y="4" width="40" height="20"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{totalComissaoVendaImpPos}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="28d68769-ee18-4e75-876f-3831440e4d6d" x="255" y="2" width="40" height="20"/>
|
||||
<reportElement uuid="28d68769-ee18-4e75-876f-3831440e4d6d" x="255" y="4" width="40" height="20"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{totalVendaImpPosterior}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="6a225efc-3b35-4d11-88a6-b91bcc0f46c4" x="295" y="2" width="40" height="20"/>
|
||||
<reportElement uuid="6a225efc-3b35-4d11-88a6-b91bcc0f46c4" x="295" y="4" width="40" height="20"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{totalComissaoImpPosterior}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="692797f2-804c-475c-8850-3298c8929bff" x="335" y="2" width="40" height="20"/>
|
||||
<reportElement uuid="692797f2-804c-475c-8850-3298c8929bff" x="335" y="4" width="40" height="20"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{totalExcBagagem}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="0bc22fcd-08c9-4aa6-ba57-86c622d4ab25" x="375" y="2" width="40" height="20"/>
|
||||
<reportElement uuid="0bc22fcd-08c9-4aa6-ba57-86c622d4ab25" x="375" y="4" width="40" height="20"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{totalComissaoExcBagagem}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="f36968b3-9d63-4a93-8b83-76aa7a7efac0" x="415" y="2" width="40" height="20"/>
|
||||
<reportElement uuid="f36968b3-9d63-4a93-8b83-76aa7a7efac0" x="415" y="4" width="40" height="20"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{totalOutros}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="13303515-a3f8-4c98-9faf-8cfc7fbf4fbb" x="455" y="2" width="40" height="20"/>
|
||||
<reportElement uuid="13303515-a3f8-4c98-9faf-8cfc7fbf4fbb" x="455" y="4" width="40" height="20"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{totalComissaoOutros}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="d13a8054-8d65-44f0-ab07-528d86eccabd" x="495" y="2" width="40" height="20"/>
|
||||
<reportElement uuid="d13a8054-8d65-44f0-ab07-528d86eccabd" x="495" y="4" width="40" height="20"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$V{totalPagado}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
|
||||
<reportElement uuid="9e75f6e6-ff85-4065-bc46-b1362f9294e1" x="535" y="2" width="40" height="20"/>
|
||||
<reportElement uuid="9e75f6e6-ff85-4065-bc46-b1362f9294e1" x="535" y="4" width="40" height="20"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
|
|
|
|||
Loading…
Reference in New Issue