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

fixes bug #9387 

fixes bug #9391

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73927 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-09-18 16:36:00 +00:00
parent 9a000a5e6c
commit efcc5baf9f
10 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetesFinanceiro_es.properties
View File

@ -14,7 +14,7 @@ label.dataHora=Emitido em:
label.impressorPor=Emitido Por:
label.total=Total
label.qtdeBilhetes=Quantidade de Bilhetes
label.nombpuntoventa=Ag. Emissão
label.nombpuntoventa=Ag. Venda
label.descorigem=Origem
label.descdestino=Destino
label.fechorVenta=Dt Emissão
@ -22,5 +22,5 @@ label.numeroBilhete=N
label.numero=Número
label.totalBilhete=Total Bilhete
label.fechorDevolucao=Dt Devolução
label.nombpuntoventa=Ag. Devolução
label.nombpuntoventadev=Ag. Devolução
label.cveusuario=Bilheteiro

4
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDevolucaoBilhetesFinanceiro_pt_BR.properties
View File

@ -14,7 +14,7 @@ label.dataHora=Emitido em:
label.impressorPor=Emitido Por:
label.total=Total
label.qtdeBilhetes=Quantidade de Bilhetes
label.nombpuntoventa=Ag. Emissão
label.nombpuntoventa=Ag. Venda
label.descorigem=Origem
label.descdestino=Destino
label.fechorVenta=Dt Emissão
@ -22,5 +22,5 @@ label.numeroBilhete=N
label.numero=Número
label.totalBilhete=Total Bilhete
label.fechorDevolucao=Dt Devolução
label.nombpuntoventa=Ag. Devolução
label.nombpuntoventadev=Ag. Devolução
label.cveusuario=Bilheteiro

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

Binary file not shown.

4
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetesFinanceiro.jrxml
View File

@ -1,7 +1,7 @@
<?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="RelatorioDevolucaoBilhetesFinanceiro" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
<property name="ireport.zoom" value="2.0"/>
<property name="ireport.x" value="916"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="159"/>
<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
<style name="table">
@ -327,7 +327,7 @@
<textElement verticalAlignment="Middle" markup="none">
<font size="6" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{label.nombpuntoventa}]]></textFieldExpression>
<textFieldExpression><![CDATA[$R{label.nombpuntoventadev}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="226" y="1" width="105" height="14" isPrintWhenDetailOverflows="true" uuid="2b0943fd-f6c2-414b-b6d1-cb8ad1734e06"/>

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

Binary file not shown.

3
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesas.jrxml
View File

@ -23,8 +23,9 @@
<field name="descTipoEvento" class="java.lang.String"/>
<field name="precio" class="java.math.BigDecimal"/>
<field name="numPuntoVenta" class="java.lang.String"/>
<field name="indtipo" class="java.lang.Integer"/>
<variable name="vTotal" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{precio}]]></variableExpression>
<variableExpression><![CDATA[($F{indtipo}.equals(Integer.valueOf("1")) ? $F{precio} : $F{precio}.negate())]]></variableExpression>
</variable>
<background>
<band splitType="Stretch"/>

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

Binary file not shown.

5
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasAgencia.jrxml
View File

@ -1,7 +1,7 @@
<?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="RelatorioFinanceiroReceitasDespesasAgencia" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" 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="485"/>
<property name="ireport.x" value="483"/>
<property name="ireport.y" value="0"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="Summary"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@ -22,11 +22,12 @@
<field name="descTipo" class="java.lang.String"/>
<field name="puntoVentaId" class="java.lang.Integer"/>
<field name="descTipoEvento" class="java.lang.String"/>
<field name="indtipo" class="java.lang.Integer"/>
<variable name="vTotal" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{precio}]]></variableExpression>
</variable>
<variable name="vSubTotal" class="java.math.BigDecimal" resetType="Group" resetGroup="agencia" calculation="Sum">
<variableExpression><![CDATA[$F{precio}]]></variableExpression>
<variableExpression><![CDATA[$F{indtipo}.equals(Integer.valueOf("1")) ? $F{precio} : $F{precio}.negate()]]></variableExpression>
</variable>
<group name="agencia">
<groupExpression><![CDATA[$F{puntoVentaId}]]></groupExpression>

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

Binary file not shown.

5
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFinanceiroReceitasDespesasEvento.jrxml
View File

@ -1,7 +1,7 @@
<?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="RelatorioFinanceiroReceitasDespesasEvento" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" 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="485"/>
<property name="ireport.x" value="483"/>
<property name="ireport.y" value="0"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="Summary"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@ -23,11 +23,12 @@
<field name="puntoVentaId" class="java.lang.Integer"/>
<field name="descTipoEvento" class="java.lang.String"/>
<field name="tipoEventoExtraId" class="java.lang.String"/>
<field name="indtipo" class="java.lang.Integer"/>
<variable name="vTotal" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{precio}]]></variableExpression>
</variable>
<variable name="vSubTotal" class="java.math.BigDecimal" resetType="Group" resetGroup="evento" calculation="Sum">
<variableExpression><![CDATA[$F{precio}]]></variableExpression>
<variableExpression><![CDATA[$F{indtipo}.equals(Integer.valueOf("1")) ? $F{precio} : $F{precio}.negate()]]></variableExpression>
</variable>
<group name="evento">
<groupExpression><![CDATA[$F{tipoEventoExtraId}]]></groupExpression>