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

fixes bug#21994 

dev: Wilian
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@106661 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2021-05-13 00:58:03 +00:00
parent b76f901e18
commit ff4b8c94c5
5 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_es.properties
View File

@ -19,10 +19,11 @@ label.agencia=Ag
label.conta=Conta label.conta=Conta
label.cidade=Cidade label.cidade=Cidade
label.baseCalculo=Base de Cálculo label.baseCalculo=Base de Cálculo
label.receitaBpr=Receita BPR label.segObrigatorio=Seguro Obrigatório(+)
label.receitaBpr=Receita BPR (Bilhete Passagem Rodoviário)
label.devolucoes=Devoluções label.devolucoes=Devoluções
label.receitaBaseComissao=Receita Base Comissão label.receitaBaseComissao=Receita Base Comissão
label.receitaSeguros=Receita Seguros label.receitaSeguros=Receita Seguro Obrigatório
label.receitaSegurosOpcional=Receita Seguro Opcional label.receitaSegurosOpcional=Receita Seguro Opcional
label.receitaExcBagagens=Receita Exc. Bagagens label.receitaExcBagagens=Receita Exc. Bagagens
label.receitaImpressaoPosterior=Receita Impressão Posterior label.receitaImpressaoPosterior=Receita Impressão Posterior

5
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioReciboComissao_pt_BR.properties
View File

@ -19,10 +19,11 @@ label.agencia=Ag
label.conta=Conta label.conta=Conta
label.cidade=Cidade label.cidade=Cidade
label.baseCalculo=Base de Cálculo label.baseCalculo=Base de Cálculo
label.receitaBpr=Receita BPR label.segObrigatorio=Seguro Obrigatório(+)
label.receitaBpr=Receita BPR (Bilhete Passagem Rodoviário)
label.devolucoes=Devoluções label.devolucoes=Devoluções
label.receitaBaseComissao=Receita Base Comissão label.receitaBaseComissao=Receita Base Comissão
label.receitaSeguros=Receita Seguros label.receitaSeguros=Receita Seguro Obrigatório
label.receitaSegurosOpcional=Receita Seguro Opcional label.receitaSegurosOpcional=Receita Seguro Opcional
label.receitaExcBagagens=Receita Exc. Bagagens label.receitaExcBagagens=Receita Exc. Bagagens
label.receitaImpressaoPosterior=Receita Impressão Posterior label.receitaImpressaoPosterior=Receita Impressão Posterior

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

Binary file not shown.

98
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReciboComissao.jrxml
View File

@ -2,7 +2,7 @@
<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="RelatorioReciboComissao" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="a757a10d-6ec1-4dc3-ad77-489bc18e4b25"> <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="RelatorioReciboComissao" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="a757a10d-6ec1-4dc3-ad77-489bc18e4b25">
<property name="ireport.zoom" value="1.5"/> <property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="720"/>
<field name="comissaoBpr" class="java.math.BigDecimal"/> <field name="comissaoBpr" class="java.math.BigDecimal"/>
<field name="receitaExcessobagagem" class="java.math.BigDecimal"/> <field name="receitaExcessobagagem" class="java.math.BigDecimal"/>
<field name="receitaSeguroopcional" class="java.math.BigDecimal"/> <field name="receitaSeguroopcional" class="java.math.BigDecimal"/>
@ -927,8 +927,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{texto2}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{texto2}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="87" width="131" height="15" uuid="2c1cf473-71a3-461d-8bda-b43b337f3525"/> <reportElement positionType="Float" x="11" y="87" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="2c1cf473-71a3-461d-8bda-b43b337f3525"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -940,8 +940,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.devolucoes}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.devolucoes}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="42" width="194" height="15" uuid="478488eb-7a2d-4833-9467-07ff9e8e577b"/> <reportElement positionType="Float" x="11" y="42" width="266" height="15" isPrintWhenDetailOverflows="true" uuid="478488eb-7a2d-4833-9467-07ff9e8e577b"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -954,7 +954,7 @@
<textFieldExpression><![CDATA[$R{label.baseCalculo}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.baseCalculo}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="190" y="57" width="63" height="15" uuid="cfd8a179-c60d-4343-b5c6-96f6d695d316"/> <reportElement positionType="Float" x="214" y="57" width="63" height="15" uuid="cfd8a179-c60d-4343-b5c6-96f6d695d316"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -966,8 +966,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{receitaBPR}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaBPR}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="102" width="131" height="15" uuid="3a8c3b35-6707-42d7-9a56-958c385fa8a2"/> <reportElement positionType="Float" x="11" y="102" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="3a8c3b35-6707-42d7-9a56-958c385fa8a2"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -979,8 +979,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.receitaBaseComissao}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.receitaBaseComissao}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="57" width="131" height="15" uuid="cc446093-b5c6-46cd-9437-4981af064086"/> <reportElement positionType="Float" x="11" y="57" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="cc446093-b5c6-46cd-9437-4981af064086"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -993,7 +993,7 @@
<textFieldExpression><![CDATA[$R{label.receitaBpr}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.receitaBpr}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="190" y="147" width="63" height="15" uuid="552e2ea7-f151-4ae1-931d-d83444357119"/> <reportElement positionType="Float" x="214" y="147" width="63" height="15" uuid="552e2ea7-f151-4ae1-931d-d83444357119"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1006,7 +1006,7 @@
<textFieldExpression><![CDATA[$F{receitaBrutaExcessoBagagem}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaBrutaExcessoBagagem}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="190" y="102" width="63" height="15" uuid="4cc4be6f-1897-44de-a709-65c70664fa54"/> <reportElement positionType="Float" x="214" y="102" width="63" height="15" uuid="4cc4be6f-1897-44de-a709-65c70664fa54"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1019,7 +1019,7 @@
<textFieldExpression><![CDATA[$F{receitaBaseComissao}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaBaseComissao}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="190" y="117" width="63" height="15" uuid="ebcbc2ef-e23f-48dd-9ae8-0443a274a1cf"/> <reportElement positionType="Float" x="214" y="117" width="63" height="15" uuid="ebcbc2ef-e23f-48dd-9ae8-0443a274a1cf"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1032,7 +1032,7 @@
<textFieldExpression><![CDATA[$F{receitaBrutaSeguroopcional}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaBrutaSeguroopcional}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="190" y="87" width="63" height="15" uuid="d605f88f-06eb-413f-a6b5-cf4b4bc6162a"/> <reportElement positionType="Float" x="214" y="87" width="63" height="15" uuid="d605f88f-06eb-413f-a6b5-cf4b4bc6162a"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1044,8 +1044,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{devolvidos}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{devolvidos}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="117" width="131" height="15" uuid="e9d8c43c-2eae-4c3b-abed-2b1a945125a1"/> <reportElement positionType="Float" x="11" y="117" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="e9d8c43c-2eae-4c3b-abed-2b1a945125a1"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1057,8 +1057,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.receitaSegurosOpcional}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.receitaSegurosOpcional}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="147" width="131" height="15" uuid="1a899349-991f-4eb9-9711-e38b9872edcb"/> <reportElement positionType="Float" x="11" y="147" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="1a899349-991f-4eb9-9711-e38b9872edcb"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1070,8 +1070,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.receitaExcBagagens}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.receitaExcBagagens}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="513" width="131" height="15" uuid="094fc020-fd48-4ed1-994e-710a3cc77359"/> <reportElement positionType="Float" x="270" y="513" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="094fc020-fd48-4ed1-994e-710a3cc77359"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1083,8 +1083,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.receitaBpr}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.receitaBpr}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="588" width="131" height="15" uuid="0b8d38d8-3178-42a9-aca7-a354dae6d5fc"/> <reportElement positionType="Float" x="270" y="588" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="0b8d38d8-3178-42a9-aca7-a354dae6d5fc"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1097,7 +1097,7 @@
<textFieldExpression><![CDATA[$R{label.receitaSeguros}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.receitaSeguros}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="449" y="558" width="63" height="15" uuid="49ed6c05-00db-4528-ba1c-d7fb4c6df136"/> <reportElement positionType="Float" x="473" y="558" width="63" height="15" uuid="49ed6c05-00db-4528-ba1c-d7fb4c6df136"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1109,8 +1109,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{receitaBaseComissao}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaBaseComissao}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="558" width="131" height="15" uuid="4f8f9cc7-dd46-40db-af0d-9671a0d5b9a7"/> <reportElement positionType="Float" x="270" y="558" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="4f8f9cc7-dd46-40db-af0d-9671a0d5b9a7"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1123,7 +1123,7 @@
<textFieldExpression><![CDATA[$R{label.receitaBaseComissao}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.receitaBaseComissao}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="449" y="513" width="63" height="15" uuid="f4095938-7301-440c-8c7d-c0f402844fa1"/> <reportElement positionType="Float" x="473" y="513" width="63" height="15" uuid="f4095938-7301-440c-8c7d-c0f402844fa1"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1135,8 +1135,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{receitaBPR}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaBPR}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="543" width="131" height="15" uuid="3e9e8142-3513-4c00-8f69-6a6015ad1925"/> <reportElement positionType="Float" x="270" y="543" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="3e9e8142-3513-4c00-8f69-6a6015ad1925"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1149,7 +1149,7 @@
<textFieldExpression><![CDATA[$R{label.devolucoes}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.devolucoes}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="449" y="603" width="63" height="15" uuid="c7820dc5-571c-4a63-87fb-875b3d5587c4"/> <reportElement positionType="Float" x="473" y="603" width="63" height="15" uuid="c7820dc5-571c-4a63-87fb-875b3d5587c4"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1162,7 +1162,7 @@
<textFieldExpression><![CDATA[$F{receitaBrutaExcessoBagagem}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaBrutaExcessoBagagem}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="449" y="543" width="63" height="15" uuid="6679f41a-3fc1-489b-a575-096799744ea6"/> <reportElement positionType="Float" x="473" y="543" width="63" height="15" uuid="6679f41a-3fc1-489b-a575-096799744ea6"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1174,8 +1174,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{devolvidos}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{devolvidos}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="498" width="194" height="15" uuid="06045373-af2b-4575-8cc4-d6e1319cdba4"/> <reportElement positionType="Float" x="270" y="498" width="266" height="15" isPrintWhenDetailOverflows="true" uuid="06045373-af2b-4575-8cc4-d6e1319cdba4"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1187,8 +1187,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.baseCalculo}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.baseCalculo}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="603" width="131" height="15" uuid="b2a8b508-3541-49a9-8c9e-e8b4b76770dc"/> <reportElement positionType="Float" x="270" y="603" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="b2a8b508-3541-49a9-8c9e-e8b4b76770dc"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1201,7 +1201,7 @@
<textFieldExpression><![CDATA[$R{label.receitaExcBagagens}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.receitaExcBagagens}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="449" y="573" width="63" height="15" uuid="dfd54e43-7b57-4b57-b35a-cae3c72435bc"/> <reportElement positionType="Float" x="473" y="573" width="63" height="15" uuid="dfd54e43-7b57-4b57-b35a-cae3c72435bc"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1213,8 +1213,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{receitaBrutaSeguroopcional}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaBrutaSeguroopcional}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="72" width="131" height="15" uuid="8ea1aae0-5c47-424d-85fd-bb527b619cfc"/> <reportElement positionType="Float" x="11" y="72" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="8ea1aae0-5c47-424d-85fd-bb527b619cfc"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1227,7 +1227,7 @@
<textFieldExpression><![CDATA[$R{label.receitaImpressaoPosterior}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.receitaImpressaoPosterior}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="190" y="72" width="63" height="15" uuid="1e2712b2-9482-4583-a691-ccf8f3c4cef3"/> <reportElement positionType="Float" x="214" y="72" width="63" height="15" uuid="1e2712b2-9482-4583-a691-ccf8f3c4cef3"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1240,7 +1240,7 @@
<textFieldExpression><![CDATA[$F{receitaGAP}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaGAP}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="449" y="528" width="63" height="15" uuid="aa7e2c99-7c1d-40f7-91f3-3db1e9973e95"/> <reportElement positionType="Float" x="473" y="528" width="63" height="15" uuid="aa7e2c99-7c1d-40f7-91f3-3db1e9973e95"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1252,8 +1252,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{receitaGAP}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaGAP}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="528" width="131" height="15" uuid="e0a82e3f-eae2-40ee-9476-d5575255cf59"/> <reportElement positionType="Float" x="270" y="528" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="e0a82e3f-eae2-40ee-9476-d5575255cf59"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1265,8 +1265,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.receitaImpressaoPosterior}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.receitaImpressaoPosterior}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="59" y="132" width="131" height="15" uuid="a2494ced-cea4-4c5a-8717-f2a7934f13b8"/> <reportElement positionType="Float" x="11" y="132" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="a2494ced-cea4-4c5a-8717-f2a7934f13b8"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1279,7 +1279,7 @@
<textFieldExpression><![CDATA[$R{label.receitaSeguros}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.receitaSeguros}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="190" y="132" width="63" height="15" uuid="70410b55-12e1-432e-823b-912433d65aad"/> <reportElement positionType="Float" x="214" y="132" width="63" height="15" uuid="70410b55-12e1-432e-823b-912433d65aad"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1302,7 +1302,7 @@
<textElement verticalAlignment="Middle" markup="none"> <textElement verticalAlignment="Middle" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.receitaSeguros}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.segObrigatorio}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="489" y="72" width="63" height="15" uuid="57dd3172-3075-47fa-ae20-ef0c65b9f246"/> <reportElement positionType="Float" x="489" y="72" width="63" height="15" uuid="57dd3172-3075-47fa-ae20-ef0c65b9f246"/>
@ -1318,7 +1318,7 @@
<textFieldExpression><![CDATA[$F{receitaSeguro}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaSeguro}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement positionType="Float" x="449" y="588" width="63" height="15" uuid="6e47cf62-e48a-4194-bd12-b5dc422272e0"/> <reportElement positionType="Float" x="473" y="588" width="63" height="15" uuid="6e47cf62-e48a-4194-bd12-b5dc422272e0"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1330,8 +1330,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{receitaBrutaSeguro}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaBrutaSeguro}]]></textFieldExpression>
</textField> </textField>
<textField isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement positionType="Float" x="318" y="573" width="131" height="15" uuid="834984fa-0cf0-47d6-a22a-6f392a87f26a"/> <reportElement positionType="Float" x="270" y="573" width="203" height="15" isPrintWhenDetailOverflows="true" uuid="834984fa-0cf0-47d6-a22a-6f392a87f26a"/>
<box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1"> <box topPadding="1" leftPadding="1" bottomPadding="1" rightPadding="1">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/>
@ -1367,7 +1367,7 @@
<textElement verticalAlignment="Middle" markup="none"> <textElement verticalAlignment="Middle" markup="none">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.receitaSeguros}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.segObrigatorio}]]></textFieldExpression>
</textField> </textField>
</band> </band>
</detail> </detail>

2
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaComissaoController.java
View File

@ -552,6 +552,7 @@ public class EditarPuntoVentaComissaoController extends MyGenericForwardComposer
return false; return false;
} }
/* pelo mantis 21994 não é mais obrigatorio essa validacao
if(!ptovtaComissao.getSeguroReceita() && !ptovtaComissao.getSeguroDev() && if(!ptovtaComissao.getSeguroReceita() && !ptovtaComissao.getSeguroDev() &&
(!isNullOrZero(ptovtaComissao.getSeguroobrigatorioBaixa()) || !isNullOrZero(ptovtaComissao.getSeguroobrigatorioAlta()))) { (!isNullOrZero(ptovtaComissao.getSeguroobrigatorioBaixa()) || !isNullOrZero(ptovtaComissao.getSeguroobrigatorioAlta()))) {
@ -562,6 +563,7 @@ public class EditarPuntoVentaComissaoController extends MyGenericForwardComposer
return false; return false;
} }
*/
return true; return true;
} }