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

fixes bug#24378 

qua:
dev:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@112026 d1611594-4594-4d17-8e1d-87c2c4800839
master
aristides 2022-04-26 19:24:29 +00:00
parent d6cbf22a0c
commit 3276e48111
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java
View File

@ -73,10 +73,13 @@ public class RelatorioDepositos extends Relatorio {
deposito.setDtmotivo(rs.getDate("dtmotivo"));
deposito.setSaldo(rs.getBigDecimal("saldo").multiply(BigDecimal.valueOf(-1)));
deposito.setVrdeposito(rs.getBigDecimal("vrdeposito"));
BigDecimal vlrBoleto=rs.getBigDecimal("vlrBoleto");
deposito.setVrdeposito(deposito.getVrdeposito().add(vlrBoleto));
deposito.setVrfechamento(rs.getBigDecimal("vrfechamento"));
deposito.setEmpresaId(rs.getInt("empresaId"));
deposito.setPuntoventaId(rs.getInt("puntoventaId"));
BigDecimal vlrBoleto=rs.getBigDecimal("vlrBoleto");
if (! filtrarPendentes){
deposito.setNumdeposito(rs.getString("numdeposito"));
}
@ -111,7 +114,7 @@ public class RelatorioDepositos extends Relatorio {
dtMotivo = deposito.getDtmotivo();
}
pendente = pendente.subtract(deposito.getVrdeposito()).subtract(vlrBoleto);
pendente = pendente.subtract(deposito.getVrdeposito());
deposito.setVrpendente(pendente);
lsDadosRelatorio.add(deposito);

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

@ -14,8 +14,8 @@ header.data=Per
header.agencia=Agência
header.dtmotivo=Data Fechamento
header.saldo=Pendente
header.vrdeposito=Vr. Depósito
header.vrfechamento=Vr. Fechamento
header.vrdeposito=Depósito/Boleto
header.vrfechamento=Fechamento
header.usuario=Usuário
header.numdeposito=Num. Depósito
header.numeroAgencia=Número

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

Binary file not shown.

16
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.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="RelatorioDepositos" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" whenResourceMissingType="Empty" uuid="65274c35-4f3f-4196-bd84-f042e9ac12ea">
<property name="ireport.zoom" value="1.3310000000000006"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<property name="ireport.y" value="6"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="title"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.3" value="pageHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
@ -403,42 +403,42 @@
<summary>
<band height="72">
<staticText>
<reportElement uuid="b4440540-2f18-4b9e-94d1-285e376ba362" x="0" y="12" width="100" height="20"/>
<reportElement uuid="b4440540-2f18-4b9e-94d1-285e376ba362" x="0" y="12" width="128" height="20"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>
<text><![CDATA[Total Depósitos]]></text>
<text><![CDATA[Total Depósitos/Boletos]]></text>
</staticText>
<textField pattern="#,##0.00">
<reportElement uuid="a8212576-8b4a-4b7d-9777-a727d1a86556" x="101" y="12" width="178" height="20"/>
<reportElement uuid="a8212576-8b4a-4b7d-9777-a727d1a86556" x="129" y="12" width="178" height="20"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{TOTAL_DEPOSITOS}]]></textFieldExpression>
</textField>
<staticText>
<reportElement uuid="53594ff0-8b6d-4259-bea4-70f76933e536" x="0" y="32" width="100" height="20"/>
<reportElement uuid="53594ff0-8b6d-4259-bea4-70f76933e536" x="0" y="32" width="128" height="20"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>
<text><![CDATA[Total Fechamento]]></text>
</staticText>
<textField pattern="#,##0.00">
<reportElement uuid="46b3f5bb-1a6e-47da-9285-5f5a5fc759f8" x="100" y="32" width="178" height="20"/>
<reportElement uuid="46b3f5bb-1a6e-47da-9285-5f5a5fc759f8" x="129" y="32" width="178" height="20"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$P{totalFechamento}]]></textFieldExpression>
</textField>
<staticText>
<reportElement uuid="d746843f-a730-4bbb-9520-80954166d840" x="0" y="52" width="100" height="20"/>
<reportElement uuid="d746843f-a730-4bbb-9520-80954166d840" x="0" y="52" width="128" height="20"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>
<text><![CDATA[Total Pendente]]></text>
</staticText>
<textField pattern="#,##0.00">
<reportElement uuid="5c04bbea-5e2e-4fcc-a965-4e91f5d8db76" x="100" y="52" width="178" height="20"/>
<reportElement uuid="5c04bbea-5e2e-4fcc-a965-4e91f5d8db76" x="129" y="52" width="178" height="20"/>
<textElement>
<paragraph lineSpacing="Single"/>
</textElement>