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

Fixes bug #9774 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@75747 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2017-10-26 19:43:05 +00:00
parent 80b3d16287
commit 25998911bf
5 changed files with 109 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroReceitasDespesas_es.properties
View File

@ -1,23 +1,29 @@
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
#geral #geral
msg.noData=Não foi possivel obter dados com os parâmetros informados.
cabecalho.dataHora = Data/Hora:
cabecalho.de = de
cabecalho.empresa = Empresa:
cabecalho.filtros = Filtros:
cabecalho.impressorPor = Impressor por:
#Labels cabeçalho #Labels cabeçalho
cabecalho.nome=Relatório Financeiro de Receitas e Despesas cabecalho.nome = Relat\u00F3rio Financeiro de Receitas e Despesas
cabecalho.relatorio=Relatório: cabecalho.pagina = P\u00E1gina
cabecalho.periodo=Período: cabecalho.periodo = Per\u00EDodo:
cabecalho.periodoA=à cabecalho.periodoA = \u00E0
cabecalho.dataHora=Data/Hora: cabecalho.relatorio = Relat\u00F3rio:
cabecalho.impressorPor=Impressor por: cabecalho.usuario = Usu\u00E1rio:
cabecalho.pagina=Página
cabecalho.de=de label.agenciaCodigo = Num. da Ag\u00EAncia
cabecalho.filtros=Filtros: label.agenciaDescricao = Nome da Ag\u00EAncia
cabecalho.usuario=Usuário: label.data = Data
cabecalho.filtros=Filtros: label.formaPagamento = Forma Pagamento
cabecalho.empresa=Empresa: label.numero = Numero
label.data=Data label.numeroDocumento = Num. Documento
label.agenciaCodigo=Num. da Agência label.operacaoCodigo = C\u00F3digo da Opera\u00E7\u00E3o
label.agenciaDescricao=Nome da Agência label.operacaoDescricao = Descri\u00E7\u00E3o da Opera\u00E7\u00E3o
label.operacaoCodigo=Código da Operação label.serie = Serie
label.operacaoDescricao=Descrição da Operação label.total = Total
label.valor=Valor label.valor = Valor
label.total=Total
msg.noData = N\u00E3o foi possivel obter dados com os par\u00E2metros informados.

46
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioFinanceiroReceitasDespesas_pt_BR.properties
View File

@ -1,23 +1,29 @@
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
#geral #geral
msg.noData=Não foi possivel obter dados com os parâmetros informados.
cabecalho.dataHora = Data/Hora:
cabecalho.de = de
cabecalho.empresa = Empresa:
cabecalho.filtros = Filtros:
cabecalho.impressorPor = Impressor por:
#Labels cabeçalho #Labels cabeçalho
cabecalho.nome=Relatório Financeiro de Receitas e Despesas cabecalho.nome = Relat\u00F3rio Financeiro de Receitas e Despesas
cabecalho.relatorio=Relatório: cabecalho.pagina = P\u00E1gina
cabecalho.periodo=Período: cabecalho.periodo = Per\u00EDodo:
cabecalho.periodoA=à cabecalho.periodoA = \u00E0
cabecalho.dataHora=Data/Hora: cabecalho.relatorio = Relat\u00F3rio:
cabecalho.impressorPor=Impressor por: cabecalho.usuario = Usu\u00E1rio:
cabecalho.pagina=Página
cabecalho.de=de label.agenciaCodigo = Num. da Ag\u00EAncia
cabecalho.filtros=Filtros: label.agenciaDescricao = Nome da Ag\u00EAncia
cabecalho.usuario=Usuário: label.data = Data
cabecalho.filtros=Filtros: label.formaPagamento = Forma Pagamento
cabecalho.empresa=Empresa: label.numero = Numero
label.data=Data label.numeroDocumento = Num. Documento
label.agenciaCodigo=Num. da Agência label.operacaoCodigo = C\u00F3digo da Opera\u00E7\u00E3o
label.agenciaDescricao=Nome da Agência label.operacaoDescricao = Descri\u00E7\u00E3o da Opera\u00E7\u00E3o
label.operacaoCodigo=Código da Operação label.serie = Serie
label.operacaoDescricao=Descrição da Operação label.total = Total
label.valor=Valor label.valor = Valor
label.total=Total
msg.noData = N\u00E3o foi possivel obter dados com os par\u00E2metros informados.

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

Binary file not shown.

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

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-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="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4"> <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.zoom" value="1.5"/>
<property name="ireport.x" value="468"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="0"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/> <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.rows" value="true"/>
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/> <property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="Summary"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<parameter name="fecInicioFiltro" class="java.lang.String"/> <parameter name="fecInicioFiltro" class="java.lang.String"/>
<parameter name="fecFinalFiltro" class="java.lang.String"/> <parameter name="fecFinalFiltro" class="java.lang.String"/>
<parameter name="noDataRelatorio" class="java.lang.String"/> <parameter name="noDataRelatorio" class="java.lang.String"/>
@ -24,6 +24,10 @@
<field name="precio" class="java.math.BigDecimal"/> <field name="precio" class="java.math.BigDecimal"/>
<field name="numPuntoVenta" class="java.lang.String"/> <field name="numPuntoVenta" class="java.lang.String"/>
<field name="indtipo" class="java.lang.Integer"/> <field name="indtipo" class="java.lang.Integer"/>
<field name="numSeriePreImpresa" class="java.lang.String"/>
<field name="numFolioPreImpreso" class="java.lang.String"/>
<field name="numDocumento" class="java.lang.String"/>
<field name="formaPagamento" class="java.lang.String"/>
<variable name="vTotal" class="java.math.BigDecimal" calculation="Sum"> <variable name="vTotal" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[($F{indtipo}.equals(Integer.valueOf("1")) ? $F{precio} : $F{precio}.negate())]]></variableExpression> <variableExpression><![CDATA[($F{indtipo}.equals(Integer.valueOf("1")) ? $F{precio} : $F{precio}.negate())]]></variableExpression>
</variable> </variable>
@ -36,46 +40,46 @@
<pageHeader> <pageHeader>
<band height="81" splitType="Stretch"> <band height="81" splitType="Stretch">
<textField> <textField>
<reportElement x="638" y="20" width="142" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/> <reportElement x="1038" y="20" width="142" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font isBold="false"/> <font isBold="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{cabecalho.pagina} + " " + $V{PAGE_NUMBER}+ " " + $R{cabecalho.de}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.pagina} + " " + $V{PAGE_NUMBER}+ " " + $R{cabecalho.de}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="0" y="0" width="638" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/> <reportElement x="0" y="0" width="962" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/>
<textElement markup="none"> <textElement markup="none">
<font size="14" isBold="true"/> <font size="14" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.nome}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy HH:mm"> <textField pattern="dd/MM/yyyy HH:mm">
<reportElement x="638" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/> <reportElement x="1038" y="0" width="164" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font isBold="false"/> <font isBold="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField> </textField>
<textField pattern=""> <textField pattern="">
<reportElement x="0" y="20" width="638" height="20" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"/> <reportElement x="0" y="20" width="962" height="20" uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b"/>
<textElement> <textElement>
<font isBold="false"/> <font isBold="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicioFiltro} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinalFiltro}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicioFiltro} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinalFiltro}]]></textFieldExpression>
</textField> </textField>
<textField evaluationTime="Report"> <textField evaluationTime="Report">
<reportElement x="783" y="20" width="19" height="20" uuid="b3192d34-b55c-4a4e-9d38-227fbcd2f2bb"/> <reportElement x="1180" y="20" width="22" height="20" uuid="b3192d34-b55c-4a4e-9d38-227fbcd2f2bb"/>
<textElement> <textElement>
<font size="10" isBold="false"/> <font size="10" isBold="false"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="53" y="40" width="585" height="20" uuid="cbf22091-2856-4cb1-8115-c3fee5ce5299"/> <reportElement x="53" y="40" width="909" height="20" uuid="cbf22091-2856-4cb1-8115-c3fee5ce5299"/>
<textFieldExpression><![CDATA[$P{nombEmpresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{nombEmpresa}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="0" y="60" width="802" height="20" uuid="b1cf4373-eaf7-44ea-a501-f860094844df"/> <reportElement x="0" y="60" width="1202" height="20" uuid="b1cf4373-eaf7-44ea-a501-f860094844df"/>
<textFieldExpression><![CDATA[$P{filtros}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{filtros}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
@ -84,7 +88,7 @@
<textFieldExpression><![CDATA[$R{cabecalho.empresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.empresa}]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="false"> <textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="638" y="40" width="164" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="2112e0ea-6df2-448f-8761-5c211d3012d3"/> <reportElement mode="Transparent" x="1038" y="40" width="164" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="2112e0ea-6df2-448f-8761-5c211d3012d3"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
@ -100,7 +104,7 @@
<textFieldExpression><![CDATA[$R{label.data}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.data}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement positionType="Float" x="0" y="20" width="802" height="1" uuid="811af238-a027-48e9-bd6f-eee885474929"/> <reportElement positionType="Float" x="0" y="20" width="1203" height="1" uuid="811af238-a027-48e9-bd6f-eee885474929"/>
</line> </line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="102" y="0" width="102" height="20" uuid="1ee34c25-6f62-4fec-88b8-09678b2bfd18"/> <reportElement stretchType="RelativeToTallestObject" x="102" y="0" width="102" height="20" uuid="1ee34c25-6f62-4fec-88b8-09678b2bfd18"/>
@ -124,6 +128,26 @@
<textElement textAlignment="Center"/> <textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$R{label.operacaoCodigo}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.operacaoCodigo}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="962" y="0" width="80" 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"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$R{label.numero}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="1122" y="0" width="81" height="20" uuid="2623c86d-602e-44af-bfbc-7a13150d1201"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$R{label.numeroDocumento}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="802" y="0" width="160" height="20" uuid="6d430f80-9725-4277-8eb7-9c36b8d0496c"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$R{label.formaPagamento}]]></textFieldExpression>
</textField>
</band> </band>
</columnHeader> </columnHeader>
<detail> <detail>
@ -154,6 +178,26 @@
<textElement textAlignment="Right"/> <textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{precio}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{precio}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="962" y="0" width="80" 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 stretchType="RelativeToTallestObject" x="1042" 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 stretchType="RelativeToTallestObject" x="1122" y="0" width="81" 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 stretchType="RelativeToTallestObject" x="802" y="0" width="160" height="20" isPrintWhenDetailOverflows="true" uuid="a9a0a244-8f87-4ebf-8557-dfde197b4287"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{formaPagamento}]]></textFieldExpression>
</textField>
</band> </band>
</detail> </detail>
<columnFooter> <columnFooter>
@ -172,7 +216,7 @@
<textFieldExpression><![CDATA[$V{vTotal}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{vTotal}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement positionType="Float" x="0" y="0" width="802" height="1" uuid="c8dfd524-14cc-454c-afc0-3ce9f8d0ead8"/> <reportElement positionType="Float" x="0" y="0" width="1203" height="1" uuid="c8dfd524-14cc-454c-afc0-3ce9f8d0ead8"/>
</line> </line>
<textField> <textField>
<reportElement x="546" y="1" width="156" height="20" uuid="38a0f957-1b50-46f9-b79f-c631baf8937b"/> <reportElement x="546" y="1" width="156" height="20" uuid="38a0f957-1b50-46f9-b79f-c631baf8937b"/>

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
View File

@ -212,9 +212,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
conferenciaComissaoService.generacionAutomaticaConferencia();
isPeriodo = (Boolean) Executions.getCurrent().getArg().get("isPeriodo"); isPeriodo = (Boolean) Executions.getCurrent().getArg().get("isPeriodo");
if (isPeriodo) { if (isPeriodo) {