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

fixes bug#21424 

dev:valdir
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@105065 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2021-01-19 19:53:17 +00:00
parent 640053b0b8
commit 96aee57244
8 changed files with 114 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -1,7 +1,7 @@
<?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="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"> <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.zoom" value="1.5"/>
<property name="ireport.x" value="483"/> <property name="ireport.x" value="537"/>
<property name="ireport.y" value="0"/> <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.band.2" value="Summary"/>
<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"/>
@ -24,63 +24,69 @@
<field name="descTipoEvento" class="java.lang.String"/> <field name="descTipoEvento" class="java.lang.String"/>
<field name="indtipo" class="java.lang.Integer"/> <field name="indtipo" class="java.lang.Integer"/>
<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{precio}]]></variableExpression>
</variable> </variable>
<variable name="vSubTotal" class="java.math.BigDecimal" resetType="Group" resetGroup="agencia" calculation="Sum"> <variable name="vSubTotal" class="java.math.BigDecimal" resetType="Group" resetGroup="agencia" calculation="Sum">
<variableExpression><![CDATA[$F{indtipo}.equals(Integer.valueOf("1")) ? $F{precio} : $F{precio}.negate()]]></variableExpression> <variableExpression><![CDATA[$F{precio}]]></variableExpression>
</variable> </variable>
<group name="agencia"> <group name="agencia">
<groupExpression><![CDATA[$F{puntoVentaId}]]></groupExpression> <groupExpression><![CDATA[$F{puntoVentaId}]]></groupExpression>
<groupHeader> <groupHeader>
<band height="42"> <band height="42">
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="1" width="109" height="20" uuid="a3dea313-f2a7-4388-bd91-5c02e8612b8e"/> <reportElement uuid="a3dea313-f2a7-4388-bd91-5c02e8612b8e" stretchType="RelativeToTallestObject" x="0" y="1" width="109" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{label.numpuntoventa}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.numpuntoventa}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement positionType="Float" x="0" y="21" width="802" height="1" uuid="811af238-a027-48e9-bd6f-eee885474929"/> <reportElement uuid="811af238-a027-48e9-bd6f-eee885474929" positionType="Float" x="0" y="21" width="802" height="1"/>
</line> </line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="109" y="1" width="280" height="20" uuid="a228f320-6e89-45a4-aef6-d1e8e76fa7a7"/> <reportElement uuid="a228f320-6e89-45a4-aef6-d1e8e76fa7a7" stretchType="RelativeToTallestObject" x="109" y="1" width="280" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{label.agenciaDescricao}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.agenciaDescricao}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="702" y="22" width="100" height="20" uuid="97964207-4388-4f8b-be2b-befe4264210c"/> <reportElement uuid="97964207-4388-4f8b-be2b-befe4264210c" stretchType="RelativeToTallestObject" x="702" y="22" width="100" height="20"/>
<textElement textAlignment="Right"/> <textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$R{label.precio}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.precio}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="602" y="22" width="100" height="20" uuid="86d783fe-132a-4724-a4cd-16fb16bc0292"/> <reportElement uuid="86d783fe-132a-4724-a4cd-16fb16bc0292" stretchType="RelativeToTallestObject" x="602" y="22" width="100" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{label.desctipo}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.desctipo}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="22" width="109" height="20" isPrintWhenDetailOverflows="true" uuid="c98526c0-c36f-42df-9308-452ac671044c"/> <reportElement uuid="c98526c0-c36f-42df-9308-452ac671044c" stretchType="RelativeToTallestObject" x="0" y="22" width="109" height="20" isPrintWhenDetailOverflows="true"/>
<textElement/>
<textFieldExpression><![CDATA[$F{numPuntoVenta}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numPuntoVenta}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false"> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
<reportElement stretchType="RelativeToTallestObject" x="109" y="22" width="280" height="20" isPrintWhenDetailOverflows="true" uuid="aad51f92-6577-4404-9c57-1d47c0c64c6a"/> <reportElement uuid="aad51f92-6577-4404-9c57-1d47c0c64c6a" stretchType="RelativeToTallestObject" x="109" y="22" width="280" height="20" isPrintWhenDetailOverflows="true"/>
<textElement/>
<textFieldExpression><![CDATA[$F{nombPuntoVenta}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nombPuntoVenta}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="389" y="22" width="213" height="20" uuid="670228b3-4fbc-4e3e-a7d7-3952294b6d3d"/> <reportElement uuid="670228b3-4fbc-4e3e-a7d7-3952294b6d3d" stretchType="RelativeToTallestObject" x="389" y="22" width="213" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{label.descevento}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.descevento}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement positionType="Float" x="0" y="0" width="802" height="1" uuid="e084b6d2-8877-49be-8aa8-f20ca7decee4"/> <reportElement uuid="e084b6d2-8877-49be-8aa8-f20ca7decee4" positionType="Float" x="0" y="0" width="802" height="1"/>
</line> </line>
</band> </band>
</groupHeader> </groupHeader>
<groupFooter> <groupFooter>
<band height="20"> <band height="20">
<textField> <textField>
<reportElement x="534" y="0" width="168" height="20" uuid="608a9bbf-4069-4236-b395-38768d8f05d1"/> <reportElement uuid="608a9bbf-4069-4236-b395-38768d8f05d1" x="534" y="0" width="168" height="20"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.subtotal}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.subtotal}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="702" y="0" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="6e8e3a23-b4ae-4c1b-9afd-26cff36df812"/> <reportElement uuid="6e8e3a23-b4ae-4c1b-9afd-26cff36df812" stretchType="RelativeToTallestObject" x="702" y="0" width="100" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
@ -98,55 +104,57 @@
<pageHeader> <pageHeader>
<band height="80" splitType="Stretch"> <band height="80" splitType="Stretch">
<textField> <textField>
<reportElement x="638" y="20" width="142" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/> <reportElement uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec" x="638" y="20" width="142" height="20"/>
<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 uuid="43b2c28d-4760-4890-b00d-25e931e79c74" x="0" y="0" width="638" height="20"/>
<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 uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5" x="638" y="0" width="164" height="20"/>
<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 uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b" x="0" y="20" width="638" height="20"/>
<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="b0635582-1d50-4d42-a0f4-e0e21412f70b"/> <reportElement uuid="b0635582-1d50-4d42-a0f4-e0e21412f70b" x="783" y="20" width="19" height="20"/>
<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="0" y="60" width="802" height="20" uuid="7fd1ffec-2814-4bb2-93e8-12580f4557b3"/> <reportElement uuid="7fd1ffec-2814-4bb2-93e8-12580f4557b3" x="0" y="60" width="802" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$P{filtros}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{filtros}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="0" y="40" width="53" height="20" uuid="1a8b1a1d-b6df-4df2-8c19-b5c1be857a85"/> <reportElement uuid="1a8b1a1d-b6df-4df2-8c19-b5c1be857a85" x="0" y="40" width="53" height="20"/>
<textElement markup="none"/> <textElement markup="none"/>
<textFieldExpression><![CDATA[$R{cabecalho.empresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.empresa}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="53" y="40" width="585" height="20" uuid="62fb92c4-08c6-40d3-925a-c2e1df785fee"/> <reportElement uuid="62fb92c4-08c6-40d3-925a-c2e1df785fee" x="53" y="40" width="585" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$P{nombEmpresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{nombEmpresa}]]></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="7fdc4e4f-c2fe-4e56-ac0a-ee8150971404"/> <reportElement uuid="7fdc4e4f-c2fe-4e56-ac0a-ee8150971404" mode="Transparent" x="638" y="40" width="164" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
<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"/>
@ -161,16 +169,18 @@
<detail> <detail>
<band height="20" splitType="Stretch"> <band height="20" splitType="Stretch">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="702" y="0" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="77d7eb39-6b9d-448d-981b-01813e97d038"/> <reportElement uuid="77d7eb39-6b9d-448d-981b-01813e97d038" stretchType="RelativeToTallestObject" x="702" y="0" width="100" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right"/> <textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{precio}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{precio}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="602" y="0" width="100" height="20" uuid="e3a6f51b-9146-442d-b076-92d5652fec2b"/> <reportElement uuid="e3a6f51b-9146-442d-b076-92d5652fec2b" stretchType="RelativeToTallestObject" x="602" y="0" width="100" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{descTipo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{descTipo}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="389" y="0" width="213" height="20" uuid="06951041-1dc3-4500-88eb-3a2df05ba67a"/> <reportElement uuid="06951041-1dc3-4500-88eb-3a2df05ba67a" stretchType="RelativeToTallestObject" x="389" y="0" width="213" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{descTipoEvento}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{descTipoEvento}]]></textFieldExpression>
</textField> </textField>
</band> </band>
@ -184,17 +194,17 @@
<summary> <summary>
<band height="21" splitType="Stretch"> <band height="21" splitType="Stretch">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="702" y="1" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="417ed1de-ce71-42fa-8108-33a37f6a0626"/> <reportElement uuid="417ed1de-ce71-42fa-8108-33a37f6a0626" stretchType="RelativeToTallestObject" x="702" y="1" width="100" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<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 uuid="c8dfd524-14cc-454c-afc0-3ce9f8d0ead8" positionType="Float" x="0" y="0" width="802" height="1"/>
</line> </line>
<textField> <textField>
<reportElement x="534" y="1" width="168" height="20" uuid="38a0f957-1b50-46f9-b79f-c631baf8937b"/> <reportElement uuid="38a0f957-1b50-46f9-b79f-c631baf8937b" x="534" y="1" width="168" height="20"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
@ -205,7 +215,7 @@
<noData> <noData>
<band height="20"> <band height="20">
<textField isBlankWhenNull="true"> <textField isBlankWhenNull="true">
<reportElement positionType="Float" x="0" y="0" width="555" height="20" isPrintWhenDetailOverflows="true" uuid="d7df66c6-4dc0-4f3b-88f4-b22094d29091"/> <reportElement uuid="d7df66c6-4dc0-4f3b-88f4-b22094d29091" positionType="Float" x="0" y="0" width="555" height="20" isPrintWhenDetailOverflows="true"/>
<textElement verticalAlignment="Middle"/> <textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
</textField> </textField>

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

Binary file not shown.

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

@ -25,44 +25,49 @@
<field name="tipoEventoExtraId" class="java.lang.String"/> <field name="tipoEventoExtraId" class="java.lang.String"/>
<field name="indtipo" class="java.lang.Integer"/> <field name="indtipo" class="java.lang.Integer"/>
<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{precio}]]></variableExpression>
</variable> </variable>
<variable name="vSubTotal" class="java.math.BigDecimal" resetType="Group" resetGroup="evento" calculation="Sum"> <variable name="vSubTotal" class="java.math.BigDecimal" resetType="Group" resetGroup="evento" calculation="Sum">
<variableExpression><![CDATA[$F{indtipo}.equals(Integer.valueOf("1")) ? $F{precio} : $F{precio}.negate()]]></variableExpression> <variableExpression><![CDATA[$F{precio}]]></variableExpression>
</variable> </variable>
<group name="evento"> <group name="evento">
<groupExpression><![CDATA[$F{tipoEventoExtraId}]]></groupExpression> <groupExpression><![CDATA[$F{tipoEventoExtraId}]]></groupExpression>
<groupHeader> <groupHeader>
<band height="42"> <band height="42">
<line> <line>
<reportElement positionType="Float" x="0" y="21" width="802" height="1" uuid="811af238-a027-48e9-bd6f-eee885474929"/> <reportElement uuid="811af238-a027-48e9-bd6f-eee885474929" positionType="Float" x="0" y="21" width="802" height="1"/>
</line> </line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="702" y="22" width="100" height="20" uuid="97964207-4388-4f8b-be2b-befe4264210c"/> <reportElement uuid="97964207-4388-4f8b-be2b-befe4264210c" stretchType="RelativeToTallestObject" x="702" y="22" width="100" height="20"/>
<textElement textAlignment="Right"/> <textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$R{label.precio}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.precio}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="602" y="22" width="100" height="20" uuid="86d783fe-132a-4724-a4cd-16fb16bc0292"/> <reportElement uuid="86d783fe-132a-4724-a4cd-16fb16bc0292" stretchType="RelativeToTallestObject" x="602" y="22" width="100" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{label.desctipo}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.desctipo}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="1" width="213" height="20" uuid="670228b3-4fbc-4e3e-a7d7-3952294b6d3d"/> <reportElement uuid="670228b3-4fbc-4e3e-a7d7-3952294b6d3d" stretchType="RelativeToTallestObject" x="0" y="1" width="213" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{label.descevento}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.descevento}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement positionType="Float" x="0" y="0" width="802" height="1" uuid="e084b6d2-8877-49be-8aa8-f20ca7decee4"/> <reportElement uuid="e084b6d2-8877-49be-8aa8-f20ca7decee4" positionType="Float" x="0" y="0" width="802" height="1"/>
</line> </line>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="22" width="213" height="20" uuid="06951041-1dc3-4500-88eb-3a2df05ba67a"/> <reportElement uuid="06951041-1dc3-4500-88eb-3a2df05ba67a" stretchType="RelativeToTallestObject" x="0" y="22" width="213" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{descTipoEvento}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{descTipoEvento}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="322" y="22" width="280" height="20" uuid="a228f320-6e89-45a4-aef6-d1e8e76fa7a7"/> <reportElement uuid="a228f320-6e89-45a4-aef6-d1e8e76fa7a7" stretchType="RelativeToTallestObject" x="322" y="22" width="280" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{label.agenciaDescricao}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.agenciaDescricao}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="213" y="22" width="109" height="20" uuid="a3dea313-f2a7-4388-bd91-5c02e8612b8e"/> <reportElement uuid="a3dea313-f2a7-4388-bd91-5c02e8612b8e" stretchType="RelativeToTallestObject" x="213" y="22" width="109" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{label.numpuntoventa}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.numpuntoventa}]]></textFieldExpression>
</textField> </textField>
</band> </band>
@ -70,14 +75,14 @@
<groupFooter> <groupFooter>
<band height="20"> <band height="20">
<textField> <textField>
<reportElement x="534" y="0" width="168" height="20" uuid="608a9bbf-4069-4236-b395-38768d8f05d1"/> <reportElement uuid="608a9bbf-4069-4236-b395-38768d8f05d1" x="534" y="0" width="168" height="20"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.subtotal}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.subtotal}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="702" y="0" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="6e8e3a23-b4ae-4c1b-9afd-26cff36df812"/> <reportElement uuid="6e8e3a23-b4ae-4c1b-9afd-26cff36df812" stretchType="RelativeToTallestObject" x="702" y="0" width="100" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
@ -95,55 +100,57 @@
<pageHeader> <pageHeader>
<band height="82" splitType="Stretch"> <band height="82" splitType="Stretch">
<textField> <textField>
<reportElement x="638" y="20" width="142" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/> <reportElement uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec" x="638" y="20" width="142" height="20"/>
<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 uuid="43b2c28d-4760-4890-b00d-25e931e79c74" x="0" y="0" width="638" height="20"/>
<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 uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5" x="638" y="0" width="164" height="20"/>
<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 uuid="fd05bd35-30d9-4baf-aa56-f8e5d3c3268b" x="0" y="20" width="638" height="20"/>
<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 isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="53" y="40" width="585" height="20" uuid="8fa1c53b-1da7-4d4d-a75c-ab1543acae2a"/> <reportElement uuid="8fa1c53b-1da7-4d4d-a75c-ab1543acae2a" x="53" y="40" width="585" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$P{nombEmpresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{nombEmpresa}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="0" y="40" width="53" height="20" uuid="ec8faa1e-0434-4771-9dcb-00118503a781"/> <reportElement uuid="ec8faa1e-0434-4771-9dcb-00118503a781" x="0" y="40" width="53" height="20"/>
<textElement markup="none"/> <textElement markup="none"/>
<textFieldExpression><![CDATA[$R{cabecalho.empresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{cabecalho.empresa}]]></textFieldExpression>
</textField> </textField>
<textField evaluationTime="Report"> <textField evaluationTime="Report">
<reportElement x="783" y="20" width="19" height="20" uuid="b0635582-1d50-4d42-a0f4-e0e21412f70b"/> <reportElement uuid="b0635582-1d50-4d42-a0f4-e0e21412f70b" x="783" y="20" width="19" height="20"/>
<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="0" y="61" width="802" height="20" uuid="fdd05f3f-d9fc-423c-84f4-159866bc3963"/> <reportElement uuid="fdd05f3f-d9fc-423c-84f4-159866bc3963" x="0" y="61" width="802" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$P{filtros}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{filtros}]]></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="94a441de-4065-43bc-8a99-6abdc8fa5e94"/> <reportElement uuid="94a441de-4065-43bc-8a99-6abdc8fa5e94" mode="Transparent" x="638" y="40" width="164" height="20" forecolor="#000000" backcolor="#FFFFFF"/>
<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"/>
@ -158,20 +165,23 @@
<detail> <detail>
<band height="20" splitType="Stretch"> <band height="20" splitType="Stretch">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="702" y="0" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="77d7eb39-6b9d-448d-981b-01813e97d038"/> <reportElement uuid="77d7eb39-6b9d-448d-981b-01813e97d038" stretchType="RelativeToTallestObject" x="702" y="0" width="100" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right"/> <textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{precio}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{precio}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="602" y="0" width="100" height="20" uuid="e3a6f51b-9146-442d-b076-92d5652fec2b"/> <reportElement uuid="e3a6f51b-9146-442d-b076-92d5652fec2b" stretchType="RelativeToTallestObject" x="602" y="0" width="100" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{descTipo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{descTipo}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false"> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
<reportElement stretchType="RelativeToTallestObject" x="322" y="0" width="280" height="20" isPrintWhenDetailOverflows="true" uuid="aad51f92-6577-4404-9c57-1d47c0c64c6a"/> <reportElement uuid="aad51f92-6577-4404-9c57-1d47c0c64c6a" stretchType="RelativeToTallestObject" x="322" y="0" width="280" height="20" isPrintWhenDetailOverflows="true"/>
<textElement/>
<textFieldExpression><![CDATA[$F{nombPuntoVenta}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nombPuntoVenta}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="213" y="0" width="109" height="20" isPrintWhenDetailOverflows="true" uuid="c98526c0-c36f-42df-9308-452ac671044c"/> <reportElement uuid="c98526c0-c36f-42df-9308-452ac671044c" stretchType="RelativeToTallestObject" x="213" y="0" width="109" height="20" isPrintWhenDetailOverflows="true"/>
<textElement/>
<textFieldExpression><![CDATA[$F{numPuntoVenta}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numPuntoVenta}]]></textFieldExpression>
</textField> </textField>
</band> </band>
@ -185,17 +195,17 @@
<summary> <summary>
<band height="21" splitType="Stretch"> <band height="21" splitType="Stretch">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="702" y="1" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="417ed1de-ce71-42fa-8108-33a37f6a0626"/> <reportElement uuid="417ed1de-ce71-42fa-8108-33a37f6a0626" stretchType="RelativeToTallestObject" x="702" y="1" width="100" height="20" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<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 uuid="c8dfd524-14cc-454c-afc0-3ce9f8d0ead8" positionType="Float" x="0" y="0" width="802" height="1"/>
</line> </line>
<textField> <textField>
<reportElement x="534" y="1" width="168" height="20" uuid="38a0f957-1b50-46f9-b79f-c631baf8937b"/> <reportElement uuid="38a0f957-1b50-46f9-b79f-c631baf8937b" x="534" y="1" width="168" height="20"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
@ -206,7 +216,7 @@
<noData> <noData>
<band height="20"> <band height="20">
<textField isBlankWhenNull="true"> <textField isBlankWhenNull="true">
<reportElement positionType="Float" x="0" y="0" width="555" height="20" isPrintWhenDetailOverflows="true" uuid="d7df66c6-4dc0-4f3b-88f4-b22094d29091"/> <reportElement uuid="d7df66c6-4dc0-4f3b-88f4-b22094d29091" positionType="Float" x="0" y="0" width="555" height="20" isPrintWhenDetailOverflows="true"/>
<textElement verticalAlignment="Middle"/> <textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
</textField> </textField>

15
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioFinanceiroReceitasDespesasController.java
View File

@ -76,12 +76,16 @@ public class RelatorioFinanceiroReceitasDespesasController extends MyGenericForw
private Radio rSintetico; private Radio rSintetico;
private Radio rAgencia; private Radio rAgencia;
private Radio rEvento; private Radio rEvento;
private Radio rDataVenda;
private Radio rDataFechamentoCaixa;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp); super.doAfterCompose(comp);
lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa(); lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa();
cmbIndTipo.setSelectedIndex(0); cmbIndTipo.setSelectedIndex(0);
rDataVenda.setChecked(true);
} }
public void onClick$btnExecutarRelatorio(Event ev) throws Exception { public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
@ -89,6 +93,17 @@ public class RelatorioFinanceiroReceitasDespesasController extends MyGenericForw
Map<String, Object> parametros = new HashMap<String, Object>(); Map<String, Object> parametros = new HashMap<String, Object>();
StringBuilder sbFiltros = new StringBuilder(); StringBuilder sbFiltros = new StringBuilder();
parametros.put("isDataFechamentoCaixa", rDataFechamentoCaixa.isChecked());
sbFiltros.append(Labels.getLabel("relatorioFinanceiroReceitasDespesasController.lb.filtrarData"));
if(rDataFechamentoCaixa.isChecked()) {
sbFiltros.append(": ")
.append(Labels.getLabel("relatorioFinanceiroReceitasDespesasController.lb.dataFechamentoCaixa"));
} else {
sbFiltros.append(": ")
.append(Labels.getLabel("relatorioFinanceiroReceitasDespesasController.lb.filtrarData"));
}
sbFiltros.append("; ");
String formatoData = "dd/MM/yyyy HH:mm"; String formatoData = "dd/MM/yyyy HH:mm";
String formatoDataFiltro = "dd/MM/yyyy"; String formatoDataFiltro = "dd/MM/yyyy";
if(dataInicial.getValue() != null) { if(dataInicial.getValue() != null) {

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

@ -7911,6 +7911,9 @@ relatorioFinanceiroReceitasDespesasController.lb.agencia = Por Agência
relatorioFinanceiroReceitasDespesasController.lb.evento = Por Evento relatorioFinanceiroReceitasDespesasController.lb.evento = Por Evento
relatorioFinanceiroReceitasDespesasController.lbEventoExtra.value = Evento relatorioFinanceiroReceitasDespesasController.lbEventoExtra.value = Evento
relatorioFinanceiroReceitasDespesasController.lbNumDocumento.value=Nº Documento relatorioFinanceiroReceitasDespesasController.lbNumDocumento.value=Nº Documento
relatorioFinanceiroReceitasDespesasController.lb.filtrarData = Fecha del Filtro
relatorioFinanceiroReceitasDespesasController.lb.dataVenda = Fecha venta
relatorioFinanceiroReceitasDespesasController.lb.dataFechamentoCaixa = Fecha corte turno
# Relatório CNAB # Relatório CNAB
indexController.mniRelatorioRemessaCNAB.label = Remessa de Lote (CNAB 400) indexController.mniRelatorioRemessaCNAB.label = Remessa de Lote (CNAB 400)

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

@ -8402,6 +8402,9 @@ relatorioFinanceiroReceitasDespesasController.lb.agencia = Por Agência
relatorioFinanceiroReceitasDespesasController.lb.evento = Por Evento relatorioFinanceiroReceitasDespesasController.lb.evento = Por Evento
relatorioFinanceiroReceitasDespesasController.lbEventoExtra.value = Evento relatorioFinanceiroReceitasDespesasController.lbEventoExtra.value = Evento
relatorioFinanceiroReceitasDespesasController.lbNumDocumento.value=Nº Documento relatorioFinanceiroReceitasDespesasController.lbNumDocumento.value=Nº Documento
relatorioFinanceiroReceitasDespesasController.lb.filtrarData = Data do Filtro
relatorioFinanceiroReceitasDespesasController.lb.dataVenda = Data da Venda
relatorioFinanceiroReceitasDespesasController.lb.dataFechamentoCaixa = Data do Fechamento do Caixa
#Auditoria #Auditoria
auditoriaController.window.title = Auditoria auditoriaController.window.title = Auditoria

17
web/gui/relatorios/filtroRelatorioFinanceiroReceitasDespesas.zul
View File

@ -18,12 +18,12 @@
<rows> <rows>
<row> <row>
<label <label
value="${c:l('relatorioFinanceiroReceitasDespesasController.lbDataIni.value')}" /> value="${c:l('lb.dataIni.value')}" />
<datebox id="dataInicial" width="100%" mold="rounded" <datebox id="dataInicial" width="100%" mold="rounded"
format="dd/MM/yyyy" constraint="no empty" format="dd/MM/yyyy" constraint="no empty"
maxlength="10" /> maxlength="10" />
<label <label
value="${c:l('relatorioFinanceiroReceitasDespesasController.lbDataFin.value')}" /> value="${c:l('lb.dataFin.value')}" />
<datebox id="dataFinal" width="100%" mold="rounded" <datebox id="dataFinal" width="100%" mold="rounded"
format="dd/MM/yyyy" constraint="no empty" format="dd/MM/yyyy" constraint="no empty"
maxlength="10" /> maxlength="10" />
@ -182,7 +182,18 @@
<radio id="rEvento" <radio id="rEvento"
label="${c:l('relatorioFinanceiroReceitasDespesasController.lb.evento')}" /> label="${c:l('relatorioFinanceiroReceitasDespesasController.lb.evento')}" />
</radiogroup> </radiogroup>
</row> </row>
<row spans="1,4">
<label
value="${c:l('relatorioFinanceiroReceitasDespesasController.lb.filtrarData')}" />
<radiogroup>
<radio id="rDataVenda"
label="${c:l('relatorioFinanceiroReceitasDespesasController.lb.dataVenda')}" />
<radio id="rDataFechamentoCaixa"
label="${c:l('relatorioFinanceiroReceitasDespesasController.lb.dataFechamentoCaixa')}" />
</radiogroup>
</row>
</rows> </rows>
</grid> </grid>
<toolbar> <toolbar>