bug #9389
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@72781 d1611594-4594-4d17-8e1d-87c2c4800839master
parent
9859f47c83
commit
eef301809a
|
@ -209,7 +209,7 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
sql.append(" inner join forma_pago fp on cfp.formapago_id = fp.formapago_id ");
|
||||
sql.append(" inner join marca m on c.marca_id = m.marca_id ");
|
||||
sql.append(" inner join empresa e on e.empresa_id = m.empresa_id ");
|
||||
sql.append(" inner join parada po on po.parada_id = c.origen_id ");
|
||||
sql.append(" inner join parada po on po.parada_id = pv.parada_id ");
|
||||
sql.append(" inner join ciudad co on co.ciudad_id = po.ciudad_id ");
|
||||
sql.append(" inner join estado eo on eo.estado_id = co.estado_id ");
|
||||
sql.append(" where c.fechorventa between :DATE_INICIO and :DATE_FIM ");
|
||||
|
@ -217,7 +217,6 @@ public class RelatorioFinanceiroSintetico extends Relatorio {
|
|||
sql.append(ufs == null ? "" : "and eo.estado_id in ( " + ufs + " ) ");
|
||||
sql.append(pdvs == null ? "" : "and pv.puntoventa_id in ( " + pdvs + " ) ");
|
||||
sql.append(tipoptovtaId == -1 ? "" : "and pv.tipoptovta_id = " + tipoptovtaId);
|
||||
// sql.append(" order by e.empresa_id, eo.estado_id) cd ");
|
||||
sql.append(" ) cd ");
|
||||
sql.append(" where cd.nao_entra_no_caixa = 0 ");
|
||||
sql.append(" group by cd.estadoOrigem, cd.estadoId, cd.codigo, cd.puntoventaId, cd.empresaId ) agrc ");
|
||||
|
|
Binary file not shown.
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioFinanceiroSintetico" pageWidth="1320" pageHeight="595" orientation="Landscape" columnWidth="1280" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="1a307341-ad36-4306-8e8d-c8b55fb6bcc6">
|
||||
<property name="ireport.zoom" value="1.771561000000001"/>
|
||||
<property name="ireport.x" value="779"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
<parameter name="nombempresa" class="java.lang.String"/>
|
||||
<parameter name="inicio" class="java.util.Date"/>
|
||||
|
@ -131,15 +131,24 @@
|
|||
<textFieldExpression><![CDATA["Período: "]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy">
|
||||
<reportElement x="40" y="42" width="49" height="20" uuid="c6df39dd-dd20-47cd-9daf-0e5e121d9b08"/>
|
||||
<reportElement x="40" y="42" width="63" height="20" uuid="c6df39dd-dd20-47cd-9daf-0e5e121d9b08"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$P{inicio}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField pattern="dd/MM/yyyy">
|
||||
<reportElement x="102" y="42" width="56" height="20" uuid="01624a82-6a65-4ae8-9932-5b5cad17eb04"/>
|
||||
<reportElement x="116" y="42" width="68" height="20" uuid="01624a82-6a65-4ae8-9932-5b5cad17eb04"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$P{fim}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement x="89" y="42" width="13" height="20" uuid="e035a947-ddce-4ec8-8e4f-d8de68534f65"/>
|
||||
<reportElement x="103" y="42" width="13" height="20" uuid="e035a947-ddce-4ec8-8e4f-d8de68534f65"/>
|
||||
<textElement>
|
||||
<font size="8"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["a"]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
|
@ -826,8 +835,7 @@
|
|||
<textElement textAlignment="Center">
|
||||
<font size="7" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA["Total geral"
|
||||
]]></textFieldExpression>
|
||||
<textFieldExpression><![CDATA["Total geral"]]></textFieldExpression>
|
||||
</textField>
|
||||
</band>
|
||||
</columnFooter>
|
||||
|
|
Loading…
Reference in New Issue