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

fixes bug #9166 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@69736 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-06-07 19:12:45 +00:00
parent fc3626f6bb
commit f9ca6854a6
9 changed files with 192 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,11 +60,12 @@ public class RelatorioDepositos extends Relatorio {
RelatorioDepositoBean deposito = new RelatorioDepositoBean(); RelatorioDepositoBean deposito = new RelatorioDepositoBean();
deposito.setNombempresa(rs.getString(1)); deposito.setNombempresa(rs.getString(1));
deposito.setNombpuntoventa(rs.getString(2)); deposito.setNombpuntoventa(rs.getString(2));
deposito.setDtmotivo(rs.getDate(3)); deposito.setNumpuntoventa(rs.getString(3));
deposito.setSaldo(rs.getBigDecimal(4).multiply(BigDecimal.valueOf(-1))); deposito.setDtmotivo(rs.getDate(4));
deposito.setVrdeposito(rs.getBigDecimal(5)); deposito.setSaldo(rs.getBigDecimal(5).multiply(BigDecimal.valueOf(-1)));
deposito.setVrfechamento(rs.getBigDecimal(6)); deposito.setVrdeposito(rs.getBigDecimal(6));
deposito.setNumdeposito(rs.getString(7)); deposito.setVrfechamento(rs.getBigDecimal(7));
deposito.setNumdeposito(rs.getString(8));
lsDadosRelatorio.add(deposito); lsDadosRelatorio.add(deposito);
} }
@ -94,6 +95,7 @@ public class RelatorioDepositos extends Relatorio {
sql.append(" SELECT DISTINCT tmp.nombempresa, "); sql.append(" SELECT DISTINCT tmp.nombempresa, ");
sql.append(" tmp.nombpuntoventa, "); sql.append(" tmp.nombpuntoventa, ");
sql.append(" tmp.numpuntoventa, ");
sql.append(" tmp.dtmotivo, "); sql.append(" tmp.dtmotivo, ");
sql.append(" tmp.saldo, "); sql.append(" tmp.saldo, ");
sql.append(" tmp.vrfechamento, "); sql.append(" tmp.vrfechamento, ");
@ -110,6 +112,7 @@ public class RelatorioDepositos extends Relatorio {
sql.append(" FROM "); sql.append(" FROM ");
sql.append(" ( SELECT DISTINCT e.nombempresa, "); sql.append(" ( SELECT DISTINCT e.nombempresa, ");
sql.append(" p.nombpuntoventa, "); sql.append(" p.nombpuntoventa, ");
sql.append(" p.numpuntoventa, ");
sql.append(" f.fecfechamento AS dtmotivo, "); sql.append(" f.fecfechamento AS dtmotivo, ");
sql.append(" ( SUM(NVL(fd.valor_pago,0)) - f.total ) AS saldo, "); sql.append(" ( SUM(NVL(fd.valor_pago,0)) - f.total ) AS saldo, ");
sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrfechamento , "); sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrfechamento , ");
@ -135,6 +138,7 @@ public class RelatorioDepositos extends Relatorio {
sql.append(" GROUP BY e.nombempresa, "); sql.append(" GROUP BY e.nombempresa, ");
sql.append(" p.nombpuntoventa, "); sql.append(" p.nombpuntoventa, ");
sql.append(" p.numpuntoventa, ");
sql.append(" f.fecfechamento, "); sql.append(" f.fecfechamento, ");
sql.append(" fd.FECHAMENTOCNTCORRENTE_ID, "); sql.append(" fd.FECHAMENTOCNTCORRENTE_ID, ");
sql.append(" f.total ) tmp "); sql.append(" f.total ) tmp ");

1
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositos_es .properties
View File

@ -17,3 +17,4 @@ header.vrdeposito=Vr. Dep
header.vrfechamento=Vr. Fechamento header.vrfechamento=Vr. Fechamento
header.usuario=Usuário header.usuario=Usuário
header.numdeposito=Num. Depósito header.numdeposito=Num. Depósito
header.numeroAgencia=Número

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

@ -17,3 +17,4 @@ header.vrdeposito=Vr. Dep
header.vrfechamento=Vr. Fechamento header.vrfechamento=Vr. Fechamento
header.usuario=Usuário header.usuario=Usuário
header.numdeposito=Num. Depósito 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.

268
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml
View File

@ -1,8 +1,8 @@
<?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="RelatorioAgenciaFechamento" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" whenResourceMissingType="Empty"> <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.2396694214876032"/> <property name="ireport.zoom" value="4.0"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="57"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="240"/>
<parameter name="fecInicio" class="java.lang.String"> <parameter name="fecInicio" class="java.lang.String">
<defaultValueExpression><![CDATA[]]></defaultValueExpression> <defaultValueExpression><![CDATA[]]></defaultValueExpression>
</parameter> </parameter>
@ -18,6 +18,7 @@
<field name="vrdeposito" class="java.math.BigDecimal"/> <field name="vrdeposito" class="java.math.BigDecimal"/>
<field name="vrfechamento" class="java.math.BigDecimal"/> <field name="vrfechamento" class="java.math.BigDecimal"/>
<field name="numdeposito" class="java.lang.String"/> <field name="numdeposito" class="java.lang.String"/>
<field name="numpuntoventa" class="java.lang.String"/>
<variable name="TOTAL_DEPOSITOS" class="java.math.BigDecimal" calculation="Sum"> <variable name="TOTAL_DEPOSITOS" class="java.math.BigDecimal" calculation="Sum">
<variableExpression><![CDATA[$F{vrdeposito}]]></variableExpression> <variableExpression><![CDATA[$F{vrdeposito}]]></variableExpression>
</variable> </variable>
@ -32,79 +33,98 @@
<groupHeader> <groupHeader>
<band height="50"> <band height="50">
<rectangle> <rectangle>
<reportElement x="1" y="28" width="538" height="22" backcolor="#CCCCCC"/> <reportElement x="1" y="28" width="554" height="22" backcolor="#CCCCCC" uuid="03834106-1480-4ae2-9dc7-23a4dcf9abd6"/>
</rectangle> </rectangle>
<textField> <textField>
<reportElement x="1" y="30" width="213" height="20"/> <reportElement x="69" y="30" width="149" height="20" uuid="70fc9e98-5101-446d-87ed-6c6097ae509e"/>
<textElement textAlignment="Center" lineSpacing="Single"> <textElement textAlignment="Center">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{header.agencia}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.agencia}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="214" y="30" width="67" height="20"/> <reportElement x="221" y="30" width="67" height="20" uuid="2f0a53c0-e005-4de6-816f-323ae5c9641d"/>
<textElement textAlignment="Center" lineSpacing="Single"> <textElement textAlignment="Center">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{header.dtmotivo}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.dtmotivo}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="281" y="30" width="64" height="20"/> <reportElement x="291" y="30" width="64" height="20" uuid="52a2634b-17d1-4ce6-9f8b-6202bc443e95"/>
<textElement textAlignment="Center" lineSpacing="Single"> <textElement textAlignment="Center">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{header.vrdeposito}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.vrdeposito}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement x="214" y="28" width="1" height="22"/> <reportElement x="220" y="28" width="1" height="22" uuid="0de74fe7-3428-4c4b-adbe-658a8315bded"/>
</line> </line>
<line> <line>
<reportElement x="280" y="28" width="1" height="22"/> <reportElement x="289" y="28" width="1" height="22" uuid="c837164a-9e73-4037-832a-79ae3c79569c"/>
</line> </line>
<line> <line>
<reportElement x="345" y="28" width="1" height="22"/> <reportElement x="356" y="28" width="1" height="22" uuid="336cfe8b-cc45-4970-9f92-fe4a64b00535"/>
</line> </line>
<textField> <textField>
<reportElement x="2" y="0" width="86" height="20"/> <reportElement x="2" y="0" width="86" height="20" uuid="97c1f585-395c-487e-bcbd-3a1260f47c9c"/>
<textElement textAlignment="Center" lineSpacing="Single"> <textElement textAlignment="Center">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{header.empresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="true"> <textField pattern="" isBlankWhenNull="true">
<reportElement x="88" y="0" width="213" height="20"/> <reportElement x="88" y="0" width="213" height="20" uuid="863371bf-b179-4c59-8df4-90975b3dc14e"/>
<textElement textAlignment="Left" lineSpacing="Single"> <textElement textAlignment="Left">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{nombempresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nombempresa}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="346" y="30" width="64" height="20"/> <reportElement x="357" y="30" width="64" height="20" uuid="abb21651-0e84-4231-a213-fe0a5a7fa493"/>
<textElement textAlignment="Center" lineSpacing="Single"> <textElement textAlignment="Center">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{header.vrfechamento}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.vrfechamento}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="410" y="30" width="64" height="20"/> <reportElement x="424" y="30" width="64" height="20" uuid="a704e07a-dff4-4f1f-9acb-e31066999543"/>
<textElement textAlignment="Center" lineSpacing="Single"> <textElement textAlignment="Center">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{header.saldo}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.saldo}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement x="410" y="28" width="1" height="22"/> <reportElement x="423" y="28" width="1" height="22" uuid="8949f7a3-640a-473f-a524-afe5817d168d"/>
</line> </line>
<textField> <textField>
<reportElement x="479" y="28" width="60" height="20"/> <reportElement x="493" y="28" width="60" height="20" uuid="419b40a0-83c0-440a-b4fb-c65ddd4b6fdb"/>
<textElement textAlignment="Center" lineSpacing="Single"> <textElement textAlignment="Center">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{header.numdeposito}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.numdeposito}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement x="474" y="28" width="1" height="22"/> <reportElement x="490" y="28" width="1" height="22" uuid="8a19715a-cc08-4b35-9402-760542654f5d"/>
</line> </line>
<line>
<reportElement x="67" y="28" width="1" height="22" uuid="58e8999f-8c51-4a8a-9820-cf39407532f3"/>
</line>
<textField>
<reportElement x="2" y="30" width="65" height="20" uuid="1db939e0-b893-47c7-b579-4da533fa3c85"/>
<textElement textAlignment="Center">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.numeroAgencia}]]></textFieldExpression>
</textField>
</band> </band>
</groupHeader> </groupHeader>
</group> </group>
@ -114,156 +134,202 @@
<pageHeader> <pageHeader>
<band height="41" splitType="Stretch"> <band height="41" splitType="Stretch">
<textField> <textField>
<reportElement x="231" y="20" width="49" height="20"/> <reportElement x="231" y="20" width="49" height="20" uuid="d8c71cf9-aef2-4980-b3a6-c26e1571b27a"/>
<textElement lineSpacing="Single"> <textElement>
<font isBold="true"/> <font isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{header.data}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.data}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="397" y="0" width="56" height="20"/> <reportElement x="397" y="0" width="56" height="20" uuid="d4cd880a-3ec0-44e6-bc35-95bc997e1d7b"/>
<textElement lineSpacing="Single"/> <textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{header.data.hora}]]></textFieldExpression> <paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
</textField> </textField>
<textField evaluationTime="Report"> <textField evaluationTime="Report">
<reportElement x="529" y="20" width="22" height="20"/> <reportElement x="529" y="20" width="22" height="20" uuid="aac9665b-dfc2-4c3d-b5e2-8186b328f888"/>
<textElement textAlignment="Right" lineSpacing="Single"/> <textElement textAlignment="Right">
<textFieldExpression class="java.lang.String"><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression> <paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="463" y="20" width="42" height="20"/> <reportElement x="463" y="20" width="42" height="20" uuid="649ab97a-99cf-4189-9d4d-d18b4b24f3ed"/>
<textElement lineSpacing="Single"/> <textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{header.pagina}]]></textFieldExpression> <paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="280" y="20" width="182" height="20"/> <reportElement x="280" y="20" width="182" height="20" uuid="7ec249cf-a04d-46e0-969e-6602f0aa0dcb"/>
<textElement lineSpacing="Single"/> <textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression> <paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="0" y="0" width="231" height="20"/> <reportElement x="0" y="0" width="231" height="20" uuid="7fcb08d6-b3f7-48c2-bb2c-76d34ef4a072"/>
<textElement lineSpacing="Single"/> <textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$P{TITULO}]]></textFieldExpression> <paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy HH:mm"> <textField pattern="dd/MM/yyyy HH:mm">
<reportElement x="453" y="0" width="98" height="20"/> <reportElement x="453" y="0" width="98" height="20" uuid="d70f1f3d-9075-406d-aa62-16f09a0cb84f"/>
<textElement textAlignment="Left" lineSpacing="Single"/> <textElement textAlignment="Left">
<textFieldExpression class="java.lang.String"><![CDATA[new java.util.Date()]]></textFieldExpression> <paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="505" y="20" width="24" height="20"/> <reportElement x="505" y="20" width="24" height="20" uuid="fd3d30ce-562a-4dcd-a842-9e9aca3ae3c6"/>
<textElement textAlignment="Right" lineSpacing="Single"/> <textElement textAlignment="Right">
<textFieldExpression class="java.lang.String"><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression> <paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
</textField> </textField>
</band> </band>
</pageHeader> </pageHeader>
<detail> <detail>
<band height="18" splitType="Stretch"> <band height="18" splitType="Stretch">
<rectangle> <rectangle>
<reportElement x="1" y="0" width="538" height="18"/> <reportElement x="1" y="0" width="554" height="18" uuid="58d686e0-88cb-4708-b589-fa3746de7a5b"/>
</rectangle> </rectangle>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement x="215" y="1" width="63" height="17"/> <reportElement x="222" y="1" width="67" height="17" uuid="648d6f06-b87e-4042-8ac0-552a3a9ca17c"/>
<textElement textAlignment="Center" lineSpacing="Single"> <textElement textAlignment="Center">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{dtmotivo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{dtmotivo}]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="true"> <textField pattern="" isBlankWhenNull="true">
<reportElement x="1" y="1" width="213" height="17"/> <reportElement x="69" y="1" width="149" height="17" uuid="640aae14-6703-4137-ae50-c2612e98efb0"/>
<textElement textAlignment="Left" lineSpacing="Single"> <textElement textAlignment="Left">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{nombpuntoventa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nombpuntoventa}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement x="281" y="1" width="62" height="17"/> <reportElement x="291" y="1" width="64" height="17" uuid="c50e9a15-f55c-4859-b98b-f5181f95d614"/>
<textElement textAlignment="Right" lineSpacing="Single"> <textElement textAlignment="Right">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{vrdeposito}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{vrdeposito}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement x="346" y="1" width="62" height="17"/> <reportElement x="357" y="1" width="64" height="17" uuid="a5788fa8-4c63-4d06-b573-48c62d78c222"/>
<textElement textAlignment="Right" lineSpacing="Single"> <textElement textAlignment="Right">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{vrfechamento}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{vrfechamento}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement x="412" y="1" width="62" height="17"/> <reportElement x="425" y="1" width="62" height="17" uuid="4a87d5aa-6020-4021-bb4c-5962a65acd14"/>
<textElement textAlignment="Right" lineSpacing="Single"> <textElement textAlignment="Right">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{saldo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{saldo}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="¤ #,##0.00" isBlankWhenNull="true">
<reportElement isPrintRepeatedValues="false" x="479" y="1" width="60" height="17"/> <reportElement isPrintRepeatedValues="false" x="493" y="1" width="60" height="17" uuid="8b59222e-761c-4aba-9132-638c2b9932a9"/>
<textElement textAlignment="Left" verticalAlignment="Top" lineSpacing="Single"> <textElement textAlignment="Left" verticalAlignment="Top">
<font size="8" isBold="true"/> <font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement> </textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{numdeposito}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numdeposito}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement x="214" y="0" width="1" height="18"/> <reportElement x="220" y="0" width="1" height="18" uuid="7bc5e76e-0e94-44fa-aa89-c4096d8cd8ac"/>
</line> </line>
<line> <line>
<reportElement x="280" y="0" width="1" height="18"/> <reportElement x="289" y="0" width="1" height="18" uuid="17cfcf71-9da9-45b9-9656-c6418fba738b"/>
</line> </line>
<line> <line>
<reportElement x="345" y="0" width="1" height="18"/> <reportElement x="356" y="0" width="1" height="18" uuid="7826e8ca-b064-4efa-99b4-d72255618d83"/>
</line> </line>
<line> <line>
<reportElement x="410" y="0" width="1" height="18"/> <reportElement x="423" y="0" width="1" height="18" uuid="9c64427b-0721-4832-8b90-e58de0a41eca"/>
</line> </line>
<line> <line>
<reportElement x="475" y="0" width="1" height="18"/> <reportElement x="490" y="0" width="1" height="18" uuid="0bc785b2-e08f-46ed-9faf-120551168924"/>
</line> </line>
<line>
<reportElement x="67" y="0" width="1" height="18" uuid="53b9ebeb-f71d-4414-a73d-2188b6083db9"/>
</line>
<textField pattern="" isBlankWhenNull="true">
<reportElement x="2" y="1" width="65" height="17" uuid="4f651cd3-e07f-42d3-ba24-d0c2bcaa3460"/>
<textElement textAlignment="Left">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$F{numpuntoventa}]]></textFieldExpression>
</textField>
</band> </band>
</detail> </detail>
<summary> <summary>
<band height="78"> <band height="78">
<staticText> <staticText>
<reportElement x="180" y="12" width="100" height="20"/> <reportElement x="180" y="12" width="100" height="20" uuid="b4440540-2f18-4b9e-94d1-285e376ba362"/>
<textElement textAlignment="Right" lineSpacing="Single"/> <textElement textAlignment="Right">
<paragraph lineSpacing="Single"/>
</textElement>
<text><![CDATA[Total Depósitos]]></text> <text><![CDATA[Total Depósitos]]></text>
</staticText> </staticText>
<textField pattern="¤ #,##0.00"> <textField pattern="¤ #,##0.00">
<reportElement x="301" y="12" width="178" height="20"/> <reportElement x="301" y="12" width="178" height="20" uuid="a8212576-8b4a-4b7d-9777-a727d1a86556"/>
<textElement lineSpacing="Single"/> <textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$V{TOTAL_DEPOSITOS}]]></textFieldExpression> <paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{TOTAL_DEPOSITOS}]]></textFieldExpression>
</textField> </textField>
<staticText> <staticText>
<reportElement x="181" y="32" width="100" height="20"/> <reportElement x="181" y="32" width="100" height="20" uuid="53594ff0-8b6d-4259-bea4-70f76933e536"/>
<textElement textAlignment="Right" lineSpacing="Single"/> <textElement textAlignment="Right">
<paragraph lineSpacing="Single"/>
</textElement>
<text><![CDATA[Total Fechamento]]></text> <text><![CDATA[Total Fechamento]]></text>
</staticText> </staticText>
<textField pattern="¤ #,##0.00"> <textField pattern="¤ #,##0.00">
<reportElement x="301" y="32" width="178" height="20"/> <reportElement x="301" y="32" width="178" height="20" uuid="46b3f5bb-1a6e-47da-9285-5f5a5fc759f8"/>
<textElement lineSpacing="Single"/> <textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$V{TOTAL_FECHAMENTO}]]></textFieldExpression> <paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{TOTAL_FECHAMENTO}]]></textFieldExpression>
</textField> </textField>
<staticText> <staticText>
<reportElement x="181" y="52" width="100" height="20"/> <reportElement x="181" y="52" width="100" height="20" uuid="d746843f-a730-4bbb-9520-80954166d840"/>
<textElement textAlignment="Right" lineSpacing="Single"/> <textElement textAlignment="Right">
<paragraph lineSpacing="Single"/>
</textElement>
<text><![CDATA[Total Pendente]]></text> <text><![CDATA[Total Pendente]]></text>
</staticText> </staticText>
<textField pattern="¤ #,##0.00"> <textField pattern="¤ #,##0.00">
<reportElement x="301" y="52" width="178" height="20"/> <reportElement x="301" y="52" width="178" height="20" uuid="5c04bbea-5e2e-4fcc-a965-4e91f5d8db76"/>
<textElement lineSpacing="Single"/> <textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$V{TOTAL_SALDO}]]></textFieldExpression> <paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$V{TOTAL_SALDO}]]></textFieldExpression>
</textField> </textField>
</band> </band>
</summary> </summary>
<noData> <noData>
<band height="20"> <band height="20">
<textField> <textField>
<reportElement x="0" y="0" width="555" height="20"/> <reportElement x="0" y="0" width="555" height="20" uuid="670b2fb1-0952-49f5-8458-aa0e25fd839b"/>
<textElement lineSpacing="Single"/> <textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$R{msg.noData}]]></textFieldExpression> <paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement x="0" y="0" width="555" height="1"/> <reportElement x="0" y="0" width="555" height="1" uuid="0b5eb2ba-d718-4b7d-9f3f-1bd71ca586bc"/>
</line> </line>
</band> </band>
</noData> </noData>

7
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java
View File

@ -11,6 +11,7 @@ public class RelatorioDepositoBean {
private BigDecimal vrfechamento; private BigDecimal vrfechamento;
private Date dtmotivo; private Date dtmotivo;
private String numdeposito; private String numdeposito;
private String numpuntoventa;
public String getNombpuntoventa() { public String getNombpuntoventa() {
return nombpuntoventa; return nombpuntoventa;
@ -54,5 +55,11 @@ public class RelatorioDepositoBean {
public void setNumdeposito(String numdeposito) { public void setNumdeposito(String numdeposito) {
this.numdeposito = numdeposito; this.numdeposito = numdeposito;
} }
public String getNumpuntoventa() {
return numpuntoventa;
}
public void setNumpuntoventa(String numpuntoventa) {
this.numpuntoventa = numpuntoventa;
}
} }

3
src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties
View File

@ -163,6 +163,9 @@ analitico.gerenciais.financeiro.conferenciaMovimento=com.rjconsultores.ventabole
analitico.gerenciais.financeiro.eventos=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioObservacaoEventosFinanceiros analitico.gerenciais.financeiro.eventos=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioObservacaoEventosFinanceiros
analitico.gerenciais.financeiro.observacaoBilhetes=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioObservacaoBilhetes analitico.gerenciais.financeiro.observacaoBilhetes=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioObservacaoBilhetes
analitico.gerenciais.financeiro.relatorioFinanceiroReceitasDespesas=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioFinanceiroReceitasDespesas analitico.gerenciais.financeiro.relatorioFinanceiroReceitasDespesas=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioFinanceiroReceitasDespesas
analitico.gerenciais.financeiro.relatorioDepositos=com.rjconsultores.ventaboletos.web.utilerias.menu.item.contacorrente.ItemMenuRelatorioDepositos
analitico.gerenciais.financeiro.relatorioDepositosDetalhados=com.rjconsultores.ventaboletos.web.utilerias.menu.item.contacorrente.ItemMenuRelatorioDepositosDetalhados
analitico.gerenciais.financeiro.relatorioPosicaoCaixaAnalitico=com.rjconsultores.ventaboletos.web.utilerias.menu.item.contacorrente.ItemMenuRelatorioPosicaoCaixaAnalitico
analitico.gerenciais.pacote=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.gerenciais.pacote.SubMenuRelatorioPacote analitico.gerenciais.pacote=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.gerenciais.pacote.SubMenuRelatorioPacote
analitico.gerenciais.pacote.boletos=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioVendasPacotesBoletos analitico.gerenciais.pacote.boletos=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioVendasPacotesBoletos
analitico.gerenciais.pacote.detalhado=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioVendasPacotesDetalhado analitico.gerenciais.pacote.detalhado=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioVendasPacotesDetalhado

2
web/WEB-INF/i3-label_es_MX.label
View File

@ -326,7 +326,7 @@ indexController.mniPracaPedagio.label = Caseta Peaje
indexController.mniRelatorioDescontos.label = Descuentos indexController.mniRelatorioDescontos.label = Descuentos
indexController.mniRelatorioDepositos.label=Cierre Cnt Contábil / Depósitos indexController.mniRelatorioDepositos.label=Cierre Cnt Contábil / Depósitos
indexController.mniRelatorioDepositosDetalhados.label= Depósitos Detallados indexController.mniRelatorioDepositosDetalhados.label= Depósitos Detallados
indexController.mniRelatorioPosicaoCaixaAnalitico.label= Relatório de Numeração Lógica indexController.mniRelatorioPosicaoCaixaAnalitico.label= Numeração Lógica
relatorioPosicaoCaixaAnaliticoController.lbPuntoVenta.value=Punto de Venta relatorioPosicaoCaixaAnaliticoController.lbPuntoVenta.value=Punto de Venta
relatorioPosicaoCaixaAnaliticoController.lbEmpresa.value=Empresa relatorioPosicaoCaixaAnaliticoController.lbEmpresa.value=Empresa
relatorioPosicaoCaixaAnaliticoController.lbNumero.value=Numero punto de venta relatorioPosicaoCaixaAnaliticoController.lbNumero.value=Numero punto de venta

2
web/WEB-INF/i3-label_pt_BR.label
View File

@ -333,7 +333,7 @@ indexController.mniPracaPedagio.label = Praça Pedágio
indexController.mniRelatorioDescontos.label = Vendas com Desconto indexController.mniRelatorioDescontos.label = Vendas com Desconto
indexController.mniRelatorioDepositos.label=Fechamento Cnt Corrente / Depósitos indexController.mniRelatorioDepositos.label=Fechamento Cnt Corrente / Depósitos
indexController.mniRelatorioDepositosDetalhados.label=Depósitos Detalhados indexController.mniRelatorioDepositosDetalhados.label=Depósitos Detalhados
indexController.mniRelatorioPosicaoCaixaAnalitico.label=Relatório de Numeração Lógica indexController.mniRelatorioPosicaoCaixaAnalitico.label=Numeração Lógica
relatorioPosicaoCaixaAnaliticoController.lbPuntoVenta.value=Ponto de Venda relatorioPosicaoCaixaAnaliticoController.lbPuntoVenta.value=Ponto de Venda
relatorioPosicaoCaixaAnaliticoController.lbEmpresa.value=Empresa relatorioPosicaoCaixaAnaliticoController.lbEmpresa.value=Empresa
relatorioPosicaoCaixaAnaliticoController.lbNumero.value=Número Ponto de Venda relatorioPosicaoCaixaAnaliticoController.lbNumero.value=Número Ponto de Venda