fixes bug #10516

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@79004 d1611594-4594-4d17-8e1d-87c2c4800839

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java

@@ -70,7 +70,9 @@ public class RelatorioBilhetesVendidos extends Relatorio {
 				sql.append(" JOIN PARADA p_destino on p_destino.PARADA_ID = B.DESTINO_ID ");
 				sql.append(" JOIN CATEGORIA ct on ct.CATEGORIA_ID = B.CATEGORIA_ID ");
 				sql.append(" JOIN CLASE_SERVICIO cs on cs.CLASESERVICIO_ID = B.CLASESERVICIO_ID ");
-				sql.append(" JOIN MARCA m on m.marca_id = B.marca_id ");
+				sql.append(" JOIN MARCA m on m.marca_id = b.marca_id ");
+				sql.append(" left join ciudad co ON co.ciudad_id = p_origen.ciudad_id ");
+				sql.append(" left join estado est ON est.estado_id = co.estado_id ");
 				sql.append(" WHERE ");
 				sql.append(" m.EMPRESA_ID = :EMPRESA_ID ");
 				sql.append(" and B.FECHORVENTA >= :DATA_INICIAL ");
@@ -78,6 +80,9 @@ public class RelatorioBilhetesVendidos extends Relatorio {
 				if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) {
 					sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
 				}
+				if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) {
+					sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + "");
+				}
 				if (parametros.get("STATUS") != null) {
 					if (parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) {
 						sql.append(" AND ((b.INDSTATUSBOLETO   = 'C' AND B.MOTIVOCANCELACION_ID IS NOT NULL) OR (b.INDSTATUSBOLETO = 'V' AND B.MOTIVOCANCELACION_ID IS NULL)) ");

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java

@@ -0,0 +1,151 @@
+/**
+ * 
+ */
+package com.rjconsultores.ventaboletos.relatorios.impl;
+
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.IndStatusBoleto;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioBilhetesVendidosNovoLayoutBean;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioVendasPTABean;
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
+import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
+
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
+/**
+ * @author Wallace
+ *
+ */
+public class RelatorioBilhetesVendidosNovoLayout extends Relatorio {
+
+	public RelatorioBilhetesVendidosNovoLayout(Map<String, Object> parametros, Connection conexao) throws Exception {
+		super(parametros, conexao);
+	}
+
+	private List<RelatorioBilhetesVendidosNovoLayoutBean> lsDadosRelatorio;
+
+	@Override
+	protected void processaParametros() throws Exception {
+
+		this.setCustomDataSource(new ArrayDataSource(this) {
+			@Override
+			public void initDados() throws Exception {
+
+				Connection conexao = this.relatorio.getConexao();
+				Map<String, Object> parametros = this.relatorio.getParametros();
+
+				StringBuilder sql = new StringBuilder();
+
+				sql.append("SELECT est.cveestado as cveestado, ae.decespecie as especie,  ");
+				sql.append("       a.acfiscal as numaidf,");
+				sql.append("       c.fechorventa as datavenda,");
+				sql.append("       a.forminicial as forminicial,");
+				sql.append("       a.formfinal as formfinal,");
+				sql.append("       a.serie AS serie,");
+				sql.append("       a.subserie as subserie,");
+				sql.append("       est.icms AS valoraliquiotaicms,");
+				sql.append("       c.preciopagado as valorcontabil,");
+				sql.append("       c.preciopagado - (c.preciopagado * coalesce(ei.porcredbaseicms / 100,0))AS valorbasecalculo, ");
+				sql.append("       (c.preciopagado - (c.preciopagado * coalesce(ei.porcredbaseicms / 100,0)) * est.icms) / 100 AS valoricms, ");
+				sql.append("        c.INDSTATUSBOLETO statuspassagem   ");
+				sql.append("FROM boleto c ");
+				sql.append("LEFT join aidf a ON a.aidf_id = c.aidf_id ");
+				sql.append("LEFT join aidf_especie ae ON (a.aidfesp_id = ae.aidfesp_id) ");
+				sql.append("join empresa e ON e.empresa_id = c.empresacorrida_id ");
+				sql.append("join parada po ON po.parada_id = c.origen_id ");
+				sql.append("join ciudad co ON co.ciudad_id = po.ciudad_id ");
+				sql.append("join estado est ON est.estado_id = co.estado_id ");
+				sql.append("INNER join empresa_imposto ei ON ei.empresa_id = e.empresa_id ");
+				sql.append("JOIN PUNTO_VENTA pv on c.PUNTOVENTA_ID = pv.PUNTOVENTA_ID ");
+				sql.append("AND ei.estado_id = est.estado_id ");
+				sql.append(" where ");
+				sql.append(" c.empresacorrida_id = :EMPRESA_ID ");
+				sql.append(" and c.fechorventa BETWEEN :DATA_INICIAL AND :DATA_FINAL  ");
+				sql.append(" and c.activo = 1");
+				sql.append(" and ei.activo = 1");
+				if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) {
+					sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
+				}
+				if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) {
+					sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + "");
+				}
+				if (parametros.get("STATUS") != null) {
+					if (parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) {
+						sql.append(" AND ((c.INDSTATUSBOLETO   = 'C' AND c.MOTIVOCANCELACION_ID IS NOT NULL) OR (c.INDSTATUSBOLETO = 'V' AND c.MOTIVOCANCELACION_ID IS NULL)) ");
+					} else if (parametros.get("STATUS").toString().contains("C")) {
+						sql.append(" AND c.INDSTATUSBOLETO   = 'C' AND c.MOTIVOCANCELACION_ID IS NOT NULL");
+					} else if (parametros.get("STATUS").toString().contains("V")) {
+						sql.append(" AND c.INDSTATUSBOLETO   = 'V' AND c.MOTIVOCANCELACION_ID IS NULL");
+					}
+				}
+
+				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());
+
+				stmt.setInt("EMPRESA_ID", Integer.valueOf(parametros.get("EMPRESA_ID").toString()));
+				stmt.setTimestamp("DATA_INICIAL", new Timestamp(DateUtil.inicioFecha((Date) parametros.get("DATA_INICIAL")).getTime()));
+				stmt.setTimestamp("DATA_FINAL", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime()));
+
+				ResultSet rset = stmt.executeQuery();
+				lsDadosRelatorio = new ArrayList<RelatorioBilhetesVendidosNovoLayoutBean>();
+
+				while (rset.next()) {
+
+					RelatorioBilhetesVendidosNovoLayoutBean bean = new RelatorioBilhetesVendidosNovoLayoutBean();
+
+					Map<String, Object> dataResult = new HashMap<String, Object>();
+
+					if (rset.getString("SERIE") != null) {
+						if (rset.getString("SERIE").split("-").length == 1) {
+							dataResult.put("SERIE", rset.getString("SERIE"));
+						} else {
+							dataResult.put("SERIE", rset.getString("SERIE").split("-")[0]);
+							dataResult.put("SUB_SERIE", rset.getString("SERIE").split("-")[1]);
+						}
+					}
+
+					if (rset.getString("statuspassagem") != null) {
+						dataResult.put("statuspassagem", IndStatusBoleto.valueOf(rset.getString("statuspassagem")).getValue());
+					}
+
+					bean.setNumAIDF((String) (rset.getObject("numaidf") == null ? "" : rset.getObject("numaidf")));
+					bean.setDataVenda((Date) (rset.getObject("datavenda") == null ? "" : rset.getObject("datavenda")));
+					bean.setFormInicial((String) (rset.getObject("formInicial") == null ? "" : rset.getObject("formInicial")));
+					bean.setFormFinal((String) (rset.getObject("formfinal") == null ? "" : rset.getObject("formfinal")));
+					bean.setSerie((String) (rset.getObject("serie") == null ? "" : rset.getObject("serie")));
+					bean.setSubSerie((String) (rset.getObject("subserie") == null ? "" : rset.getObject("subserie")));
+					bean.setValorContabil((BigDecimal) (rset.getObject("valorcontabil") == null ? "" : rset.getObject("valorcontabil")));
+					bean.setValorBaseCalculo((BigDecimal) (rset.getObject("valorbasecalculo") == null ? "" : rset.getObject("valorbasecalculo")));
+					bean.setValorAliquiotaICMS((BigDecimal) (rset.getObject("valoraliquiotaicms") == null ? "" : rset.getObject("valoraliquiotaicms")));
+					bean.setValorICMS((BigDecimal) (rset.getObject("valoricms") == null ? "" : rset.getObject("valoricms")));
+					bean.setUf((String) (rset.getObject("cveestado") == null ? "" : rset.getObject("cveestado")));
+					bean.setStatusPassagem((String) (rset.getObject("statuspassagem") == null ? "" : IndStatusBoleto.valueOf(rset.getString("statuspassagem")).getValue()));
+					bean.setEspecie((String) (rset.getObject("especie") == null ? "" : rset.getObject("especie")));
+
+					lsDadosRelatorio.add(bean);
+
+				}
+
+				if (lsDadosRelatorio.size() > 0) {
+					setLsDadosRelatorio(lsDadosRelatorio);
+				}
+			}
+		});
+	}
+
+	public void setLsDadosRelatorio(List<RelatorioBilhetesVendidosNovoLayoutBean> lsDadosRelatorio) {
+		this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio));
+		this.lsDadosRelatorio = lsDadosRelatorio;
+	}
+
+}

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_es.properties

@@ -0,0 +1,25 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.nome=Relatório Documentos Fiscais
+cabecalho.relatorio=Relatório
+label.periodo=Período:
+label.UF=UF
+label.especie=Espécie
+label.empresa=Empresa:
+label.formInicial=Nº Inicial
+label.formFinal=Nº Final
+label.numAIDF=AIDF
+label.serie=Série
+label.status=Status
+label.subSerie=SubSérie
+label.valorContabil=Vlr Contábil
+label.valorBaseCalculo=Vlr Base Cálc.
+label.valorAliquiotaICMS=Alíquota ICMS
+label.valorICMS=Valor ICMS
+label.dataVenda=Data Venda
+label.valorCancelado=Qtd. Cancec
+header.periodo=Período:
+header.tipoLinha=Tipo Linha:
+header.estado=Estado

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBilhetesVendidosNovoLayout_pt_BR.properties

@@ -0,0 +1,25 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.nome=Relatório Documentos Fiscais
+cabecalho.relatorio=Relatório
+label.periodo=Período:
+label.UF=UF
+label.especie=Espécie
+label.empresa=Empresa:
+label.formInicial=Nº Inicial
+label.formFinal=Nº Final
+label.numAIDF=AIDF
+label.serie=Série
+label.status=Status
+label.subSerie=SubSérie
+label.valorContabil=Vlr Contábil
+label.valorBaseCalculo=Vlr Base Cálc.
+label.valorAliquiotaICMS=Alíquota ICMS
+label.valorICMS=Valor ICMS
+label.dataVenda=Data Venda
+label.valorCancelado=Qtd. Cancec
+header.periodo=Período:
+header.tipoLinha=Tipo Linha:
+header.estado=Estado

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosNovoLayout.jrxml

@@ -0,0 +1,358 @@
+<?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="RelatorioDocumentosFiscais" pageWidth="898" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="858" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="RelatorioDocumentosFiscais" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e">
+	<property name="ireport.zoom" value="2.6573415000000145"/>
+	<property name="ireport.x" value="1692"/>
+	<property name="ireport.y" value="216"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
+	<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.columns" value="true"/>
+	<property name="collapseRowSpan" value="true"/>
+	<parameter name="DATA_INICIAL" class="java.util.Date">
+		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
+	</parameter>
+	<parameter name="DATA_FINAL" class="java.util.Date"/>
+	<parameter name="TITULO" class="java.lang.String"/>
+	<parameter name="EMPRESA" class="java.lang.String"/>
+	<parameter name="ESTADO" class="java.lang.String"/>
+	<parameter name="ESPECIE" class="java.lang.String"/>
+	<parameter name="TIPO_LINHA" class="java.lang.String"/>
+	<parameter name="TOTAL_VALOR_CONTABIL" class="java.math.BigDecimal"/>
+	<parameter name="TOTAL_VALOR_BASE_CALCULO" class="java.math.BigDecimal"/>
+	<parameter name="TOTAL_VALOR_ALIQUIOTA_ICMS" class="java.math.BigDecimal"/>
+	<parameter name="TOTAL_VALOR_ICMS" class="java.math.BigDecimal"/>
+	<parameter name="TOTAL_VALOR_ISENTAS" class="java.math.BigDecimal"/>
+	<parameter name="TOTAL_VALOR_OUTRAS" class="java.math.BigDecimal"/>
+	<parameter name="TOTAL_VALOR_CANCELADO" class="java.math.BigDecimal"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="numAIDF" class="java.lang.String"/>
+	<field name="formInicial" class="java.lang.String"/>
+	<field name="formFinal" class="java.lang.String"/>
+	<field name="serie" class="java.lang.String"/>
+	<field name="subSerie" class="java.lang.String"/>
+	<field name="valorContabil" class="java.math.BigDecimal"/>
+	<field name="valorBaseCalculo" class="java.math.BigDecimal"/>
+	<field name="valorAliquiotaICMS" class="java.math.BigDecimal"/>
+	<field name="valorICMS" class="java.math.BigDecimal"/>
+	<field name="uf" class="java.lang.String"/>
+	<field name="dataVenda" class="java.util.Date"/>
+	<field name="especie" class="java.lang.String"/>
+	<field name="statusPassagem" class="java.lang.String"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="28">
+			<textField>
+				<reportElement x="142" y="2" width="416" height="20" uuid="e15d26de-6873-4576-b49b-8dc546b39dbe"/>
+				<textElement textAlignment="Center">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="89" splitType="Stretch">
+			<textField>
+				<reportElement x="321" y="23" width="131" height="20" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/>
+				<textElement>
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{header.periodo}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="628" y="6" width="138" height="17" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/>
+				<textElement>
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report">
+				<reportElement x="833" y="23" width="24" height="23" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/>
+				<textElement textAlignment="Right">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="766" y="23" width="43" height="23" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/>
+				<textElement>
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH:mm">
+				<reportElement x="766" y="6" width="91" height="17" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/>
+				<textElement textAlignment="Left">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="809" y="23" width="24" height="23" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/>
+				<textElement textAlignment="Right">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="87" width="857" height="1" uuid="ee05e1fa-6963-4ff9-b3c8-c6cd1bb54e94"/>
+			</line>
+			<textField>
+				<reportElement x="142" y="23" width="179" height="20" uuid="4d4f219a-3607-4255-b549-fc5ada2ad59e"/>
+				<textElement verticalAlignment="Bottom">
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy">
+				<reportElement x="452" y="23" width="77" height="20" uuid="eed2f1a3-3688-4d0c-b0da-77ff99289c93"/>
+				<textElement>
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy">
+				<reportElement x="530" y="23" width="83" height="20" uuid="b151a471-e821-4b4f-b9a2-a5cc73d2e702"/>
+				<textElement>
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="23" width="142" height="20" isPrintWhenDetailOverflows="true" uuid="e97938f6-a4ba-488b-b53c-50d9420422ac"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.empresa}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="44" width="142" height="20" isPrintWhenDetailOverflows="true" uuid="37578e45-7834-459f-b021-b38fa08df7e4"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{header.estado}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement x="142" y="44" width="179" height="20" uuid="4ace9692-147a-46cb-9ae3-5c7224a3d4d0"/>
+				<textElement verticalAlignment="Bottom">
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{ESTADO}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="34" splitType="Stretch">
+			<line>
+				<reportElement mode="Transparent" x="0" y="33" width="857" height="1" uuid="ae94e51c-f84c-405c-a9c3-d8fd0c48f03a"/>
+			</line>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="201" y="0" width="67" height="33" isPrintWhenDetailOverflows="true" uuid="2cbc8ddc-38e5-4914-8189-5761ddeb2ce9"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.numAIDF}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="268" y="0" width="53" height="33" isPrintWhenDetailOverflows="true" uuid="7965e761-2e24-4f17-84eb-9431c98ce72c"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.formInicial}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="321" y="0" width="53" height="33" isPrintWhenDetailOverflows="true" uuid="bbaa5f53-76e0-491e-9145-e522122709e5"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.formFinal}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="374" y="0" width="79" height="33" isPrintWhenDetailOverflows="true" uuid="2b25ca5a-2c25-4c7d-87d1-5bfd205177a9"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.serie}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="453" y="0" width="77" height="33" isPrintWhenDetailOverflows="true" uuid="ab6b6770-67e8-4224-9304-8de30d3c1384"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.subSerie}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="530" y="0" width="83" height="33" isPrintWhenDetailOverflows="true" uuid="e3f4df4e-24a9-45b3-8ac3-f8b66d46a15f"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.valorContabil}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="613" y="0" width="79" height="33" isPrintWhenDetailOverflows="true" uuid="79775d53-3de4-4c0c-8ec7-3be13738dc14"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.valorBaseCalculo}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="692" y="0" width="59" height="33" isPrintWhenDetailOverflows="true" uuid="746627ad-15b0-4435-93ce-6d370b75e594"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.valorAliquiotaICMS}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="0" width="45" height="33" isPrintWhenDetailOverflows="true" uuid="6d6bbde3-210f-4dfb-9b84-2383480eb46f"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.UF}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="45" y="0" width="97" height="33" isPrintWhenDetailOverflows="true" uuid="fc3e1df1-ad7b-45de-ab36-78126000b123"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.dataVenda}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="751" y="0" width="67" height="33" isPrintWhenDetailOverflows="true" uuid="dc108100-3fd4-4d37-a73b-40f8490b623a"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.valorICMS}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="142" y="0" width="59" height="33" isPrintWhenDetailOverflows="true" uuid="97eb7851-4964-4114-acba-015e2bed5ed6"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.especie}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" mode="Transparent" x="818" y="0" width="40" height="33" isPrintWhenDetailOverflows="true" uuid="cbe72c43-c7dd-4074-9095-aa85726e634f"/>
+				<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.status}]]></textFieldExpression>
+			</textField>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="18" splitType="Stretch">
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="false">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="751" y="1" width="67" height="16" isPrintWhenDetailOverflows="true" uuid="784343f8-f7aa-4997-82e7-312878bd9a27"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{valorICMS}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="267" y="1" width="53" height="16" isPrintWhenDetailOverflows="true" uuid="ad46494b-0240-46d1-a775-f91f0035d7f8"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{formInicial}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="529" y="1" width="84" height="16" isPrintWhenDetailOverflows="true" uuid="0ed9578b-73d5-4f51-b21c-07d9419bbc08"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="320" y="1" width="53" height="16" isPrintWhenDetailOverflows="true" uuid="1ed844e5-7aa4-49ee-8024-765e5ae49f74"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{formFinal}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="613" y="1" width="79" height="16" isPrintWhenDetailOverflows="true" uuid="92017408-1781-4e17-90b7-5ff86457cf6d"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{valorBaseCalculo}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="692" y="1" width="59" height="16" isPrintWhenDetailOverflows="true" uuid="36f5d507-0340-4c7e-b44b-5057c1e8bee6"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{valorAliquiotaICMS}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="452" y="1" width="78" height="16" isPrintWhenDetailOverflows="true" uuid="7f08e540-2cf9-4da3-b40a-fb7d5275751f"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{subSerie}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="373" y="1" width="79" height="16" isPrintWhenDetailOverflows="true" uuid="16c5bcd4-ac1c-4c49-b065-5794fb9c2e32"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="false">
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="1" width="45" height="16" isPrintWhenDetailOverflows="true" uuid="16f536ed-9001-4b34-85f4-a01198390b7d"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{uf}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false">
+				<reportElement stretchType="RelativeToTallestObject" x="45" y="1" width="97" height="16" isPrintWhenDetailOverflows="true" uuid="09aeacb1-1c4d-4c40-8b13-b328e3f1afe7"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="201" y="1" width="66" height="16" isPrintWhenDetailOverflows="true" uuid="9e980077-0d28-437f-a699-6b4319090045"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{numAIDF}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
+				<reportElement stretchType="RelativeToTallestObject" x="142" y="1" width="59" height="16" isPrintWhenDetailOverflows="true" uuid="b0c28690-12bf-478c-90ae-a36ee69948f6"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{especie}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
+				<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="818" y="1" width="39" height="16" isPrintWhenDetailOverflows="true" uuid="5767fd4a-2a72-45d6-9733-89a155b69895"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" markup="none">
+					<font size="11" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{statusPassagem}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band height="8"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="8"/>
+	</pageFooter>
+	<summary>
+		<band height="33"/>
+	</summary>
+	<noData>
+		<band height="20">
+			<textField>
+				<reportElement x="0" y="0" width="857" height="20" uuid="5a6c1b7b-2242-4cf1-b957-723b906ee620"/>
+				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
+			</textField>
+		</band>
+	</noData>
+</jasperReport>

src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioBilhetesVendidosNovoLayoutBean.java

@@ -0,0 +1,144 @@
+package com.rjconsultores.ventaboletos.relatorios.utilitarios;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class RelatorioBilhetesVendidosNovoLayoutBean {
+
+	private String numAIDF;
+	private String formInicial;
+	private String formFinal;
+	private String serie;
+	private String subSerie;
+	private BigDecimal valorContabil;
+	private BigDecimal valorBaseCalculo;
+	private BigDecimal valorAliquiotaICMS;
+	private BigDecimal valorICMS;
+	private String uf;
+	private String especie;
+	private Integer estadoId;
+	private String statusPassagem;
+	private String bilhete;
+	private Date dataVenda;
+
+	public String getNumAIDF() {
+		return numAIDF;
+	}
+
+	public void setNumAIDF(String numAIDF) {
+		this.numAIDF = numAIDF;
+	}
+
+	public String getFormInicial() {
+		return formInicial;
+	}
+
+	public void setFormInicial(String formInicial) {
+		this.formInicial = formInicial;
+	}
+
+	public String getFormFinal() {
+		return formFinal;
+	}
+
+	public void setFormFinal(String formFinal) {
+		this.formFinal = formFinal;
+	}
+
+	public String getSerie() {
+		return serie;
+	}
+
+	public void setSerie(String serie) {
+		this.serie = serie;
+	}
+
+	public String getSubSerie() {
+		return subSerie;
+	}
+
+	public void setSubSerie(String subSerie) {
+		this.subSerie = subSerie;
+	}
+
+	public BigDecimal getValorContabil() {
+		return valorContabil;
+	}
+
+	public void setValorContabil(BigDecimal valorContabil) {
+		this.valorContabil = valorContabil;
+	}
+
+	public BigDecimal getValorBaseCalculo() {
+		return valorBaseCalculo;
+	}
+
+	public void setValorBaseCalculo(BigDecimal valorBaseCalculo) {
+		this.valorBaseCalculo = valorBaseCalculo;
+	}
+
+	public BigDecimal getValorAliquiotaICMS() {
+		return valorAliquiotaICMS;
+	}
+
+	public void setValorAliquiotaICMS(BigDecimal valorAliquiotaICMS) {
+		this.valorAliquiotaICMS = valorAliquiotaICMS;
+	}
+
+	public BigDecimal getValorICMS() {
+		return valorICMS;
+	}
+
+	public void setValorICMS(BigDecimal valorICMS) {
+		this.valorICMS = valorICMS;
+	}
+
+	public String getUf() {
+		return uf;
+	}
+
+	public void setUf(String uf) {
+		this.uf = uf;
+	}
+
+	public Integer getEstadoId() {
+		return estadoId;
+	}
+
+	public void setEstadoId(Integer estadoId) {
+		this.estadoId = estadoId;
+	}
+
+	public String getEspecie() {
+		return especie;
+	}
+
+	public void setEspecie(String especie) {
+		this.especie = especie;
+	}
+
+	public String getStatusPassagem() {
+		return statusPassagem;
+	}
+
+	public void setStatusPassagem(String statusPassagem) {
+		this.statusPassagem = statusPassagem;
+	}
+
+	public String getBilhete() {
+		return bilhete;
+	}
+
+	public void setBilhete(String bilhete) {
+		this.bilhete = bilhete;
+	}
+
+	public Date getDataVenda() {
+		return dataVenda;
+	}
+
+	public void setDataVenda(Date dataVenda) {
+		this.dataVenda = dataVenda;
+	}
+
+}

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java

@@ -8,7 +8,6 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
-import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -23,11 +22,14 @@ import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Paging;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.Estado;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.enums.IndStatusBoleto;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBilhetesVendidos;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBilhetesVendidosNovoLayout;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
+import com.rjconsultores.ventaboletos.service.EstadoService;
 import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
@@ -54,42 +56,30 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
 
 	private Datebox datInicial;
 	private Datebox datFinal;
-
 	private MyComboboxEstandar cmbEmpresa;
+	private MyComboboxEstandar cmbEstado;
 	private List<Empresa> lsEmpresa;
-
+	private List<Estado> lsEstado;
 	@Autowired
 	private transient PagedListWrapper<PuntoVenta> plwPuntoVenta;
-
 	private MyTextbox txtNombrePuntoVenta;
 	private Bandbox bbPesquisaPuntoVenta;
 	private MyListbox puntoVentaList;
 	private MyListbox puntoVentaSelList;
 	private Paging pagingPuntoVenta;
-	
 	private Checkbox chkVendido;
 	private Checkbox chkCancelado;
-//	private Checkbox chkTransferido;
+	@Autowired
-//	private Checkbox chkEntregue;
+	private EstadoService estadoService;
-//	private Checkbox chkReservado;
-//	private Checkbox chkExtraviado;
-//	private Checkbox chkReimpresso;
-//	private Checkbox chkMarcado;
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
 		lsEmpresa = empresaService.obtenerTodos();
+		lsEstado = estadoService.obtenerTodos();
 		super.doAfterCompose(comp);
 		
 		chkVendido.setChecked(true);
 		chkCancelado.setChecked(true);
-//		chkTransferido.setChecked(true);
-//		chkEntregue.setChecked(true);
-//		chkReservado.setChecked(true);
-//		chkExtraviado.setChecked(true);
-//		chkReimpresso.setChecked(true);
-//		chkMarcado.setChecked(true);
-
 		puntoVentaList.setItemRenderer(new RenderRelatorioVendasBilheteiro());
 
 	}
@@ -102,6 +92,14 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
 		this.lsEmpresa = lsEmpresa;
 	}
 
+	public List<Estado> getLsEstado() {
+		return lsEstado;
+	}
+
+	public void setLsEstado(List<Estado> lsEstado) {
+		this.lsEstado = lsEstado;
+	}
+
 	private void executarPesquisaAgencia() {
 		HibernateSearchObject<PuntoVenta> puntoVentaBusqueda =
 				new HibernateSearchObject<PuntoVenta>(PuntoVenta.class, pagingPuntoVenta.getPageSize());
@@ -147,7 +145,10 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
 	}
 
 	public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
-		executarRelatorio();
+		executarRelatorio(false);
+	}
+	public void onClick$btnExecutarRelatorioNovoLayout(Event ev) throws Exception {
+		executarRelatorio(true);
 	}
 
 	/**
@@ -155,7 +156,7 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
 	 * 
 	 */
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	private void executarRelatorio() throws Exception {
+	private void executarRelatorio(boolean novoLayout) throws Exception {
 		Relatorio relatorio;
 		Map<String, Object> parametros = new HashMap<String, Object>();
 		StringBuilder filtro = new StringBuilder();
@@ -190,24 +191,6 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
 		if (chkCancelado.isChecked()) {
 			status += "'" + IndStatusBoleto.C + "',";
 		}
-//		if (chkEntregue.isChecked()) {
-//			status += "'" + IndStatusBoleto.E + "',";			
-//		}
-//		if (chkExtraviado.isChecked()) {
-//			status += "'" + IndStatusBoleto.X + "',";			
-//		}
-//		if (chkMarcado.isChecked()) {
-//			status += "'" + IndStatusBoleto.M + "',";			
-//		}
-//		if (chkReimpresso.isChecked()) {
-//			status += "'" + IndStatusBoleto.R + "',";
-//		}
-//		if (chkReservado.isChecked()) {
-//			status += "'" + IndStatusBoleto.S + "',";
-//		}
-//		if (chkTransferido.isChecked()) {
-//			status += "'" + IndStatusBoleto.T + "',";
-//		}
 		if (chkVendido.isChecked()) {
 			status += "'" + IndStatusBoleto.V + "',";
 		}
@@ -229,13 +212,27 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
 		} else {
 			filtro.append(" Todas;");
 		}
+		
+		Comboitem itemEstado = cmbEstado.getSelectedItem();
+		if (itemEstado != null) {
+			Estado estado = (Estado) itemEstado.getValue();
+			parametros.put("ESTADO_ID", estado.getEstadoId());
+			parametros.put("ESTADO", estado.getNombestado());
+		} else{
+			parametros.put("ESTADO", "TODOS");
+		}
 
+		if(novoLayout){
+			relatorio = new RelatorioBilhetesVendidosNovoLayout(parametros, dataSourceRead.getConnection());
+			parametros.put("TITULO", Labels.getLabel("relatorioBilhetesVendidosController.window.title"));
+		}else{
+			relatorio = new RelatorioBilhetesVendidos(parametros, dataSourceRead.getConnection());
+		}
 		parametros.put("FILTROS", filtro.toString());
-		relatorio = new RelatorioBilhetesVendidos(parametros, dataSourceRead.getConnection());
+		
-
 		Map args = new HashMap();
 		args.put("relatorio", relatorio);
 
-		openWindow("/component/reportView.zul", Labels.getLabel("relatorioVendasBilheteiroController.window.title"), args, MODAL);
+		openWindow("/component/reportView.zul", Labels.getLabel("relatorioBilhetesVendidosController.window.title"), args, MODAL);
 	}
 }

web/WEB-INF/i3-label_es_MX.label

@@ -425,6 +425,25 @@ relatorioAproveitamentoController.HoraServico.label = Hora servicio
 relatorioAproveitamentoController.Classe.label = Clase
 relatorioAproveitamentoController.btnBuscarServico.label = Buscar servicio
 
+# Relatório Bilhetes Vendidos
+relatorioBilhetesVendidosController.window.title = Bilhetes Vendidos
+relatorioBilhetesVendidosController.lbDatInicial.value = Fecha inicio
+relatorioBilhetesVendidosController.lbDatFinal.value = Fecha final
+relatorioBilhetesVendidosController.lbEmpresa.value = Empresa
+relatorioBilhetesVendidosController.lbPuntoVenta.value = Agência
+relatorioBilhetesVendidosController.lbEstado.value = Estado
+relatorioBilhetesVendidosController.lbStatus.value = Status
+relatorioBilhetesVendidosController.lbNumero.value = Número
+relatorioBilhetesVendidosController.vendido.label = Vendido
+relatorioBilhetesVendidosController.cancelado.label = Cancelado
+relatorioBilhetesVendidosController.transferido.label = Transferido
+relatorioBilhetesVendidosController.entregue.label = Entregue
+relatorioBilhetesVendidosController.reservado.label = Reservado
+relatorioBilhetesVendidosController.extravidado.label = Extraviado
+relatorioBilhetesVendidosController.reimpresso.label = Reimpresso
+relatorioBilhetesVendidosController.marcado.label = Marcado
+relatorioBilhetesVendidosController.categoria.label = Categoria
+
 # Relatorio Empresa Corrida
 relatorioEmpresaCorridaController.window.title=Reporte empresa corrida
 relatorioEmpresaCorridaController.lbDataIni.value=Fecha inicio

web/WEB-INF/i3-label_pt_BR.label

@@ -6789,6 +6789,7 @@ relatorioBilhetesVendidosController.lbDatInicial.value = Data Inicial
 relatorioBilhetesVendidosController.lbDatFinal.value = Data Final
 relatorioBilhetesVendidosController.lbEmpresa.value = Empresa
 relatorioBilhetesVendidosController.lbPuntoVenta.value = Agência
+relatorioBilhetesVendidosController.lbEstado.value = Estado
 relatorioBilhetesVendidosController.lbStatus.value = Status
 relatorioBilhetesVendidosController.lbNumero.value = Número
 relatorioBilhetesVendidosController.vendido.label = Vendido

web/gui/relatorios/filtroRelatorioBilhetesVendidos.zul

@@ -4,51 +4,48 @@
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winFiltroRelatorioBilhetesVendidos"?>
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
 <zk xmlns="http://www.zkoss.org/2005/zul">
-<window id="winFiltroRelatorioBilhetesVendidos"
+	<window id="winFiltroRelatorioBilhetesVendidos"
 		apply="${relatorioBilhetesVendidosController}"
-		contentStyle="overflow:auto" height="450px" width="550px"
+		contentStyle="overflow:auto" height="380px" width="550px"
 		border="normal">
-		
+
 		<grid fixedLayout="true">
 			<columns>
-				<column width="20%"/>
+				<column width="20%" />
-				<column width="30%"/>
+				<column width="30%" />
-				<column width="20%"/>
+				<column width="20%" />
-				<column width="30%"/>
+				<column width="30%" />
 			</columns>
 			<rows>
 				<row>
 					<label
 						value="${c:l('relatorioBilhetesVendidosController.lbDatInicial.value')}" />
 					<datebox id="datInicial" width="90%"
-						format="dd/MM/yyyy"  constraint="no empty"
+						format="dd/MM/yyyy" constraint="no empty" maxlength="10" />
-						maxlength="10" />
 					<label
 						value="${c:l('relatorioBilhetesVendidosController.lbDatFinal.value')}" />
 					<datebox id="datFinal" width="90%"
-						format="dd/MM/yyyy" constraint="no empty"
+						format="dd/MM/yyyy" constraint="no empty" maxlength="10" />
-						maxlength="10" />
 				</row>
 			</rows>
 		</grid>
 		<grid fixedLayout="true">
 			<columns>
-				<column width="20%"/>
+				<column width="20%" />
-				<column width="80%"/>
+				<column width="80%" />
 			</columns>
 			<rows>
 				<row spans="1,1,2">
 					<label
 						value="${c:l('relatorioBilhetesVendidosController.lbEmpresa.value')}" />
-					<combobox id="cmbEmpresa" 
+					<combobox id="cmbEmpresa" buttonVisible="true"
-						buttonVisible="true" constraint="no empty"
+						constraint="no empty"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
 						model="@{winFiltroRelatorioBilhetesVendidos$composer.lsEmpresa}"
 						width="95%" />
 				</row>
 				<row spans="1,3">
-					<label
+					<label value="Agencia" />
-						value="Agencia" />
 					<bandbox id="bbPesquisaPuntoVenta" width="100%"
 						mold="rounded" readonly="true">
 						<bandpopup>
@@ -101,28 +98,42 @@
 					</listbox>
 					<paging id="pagingSelPuntoVenta" pageSize="10" />
 				</row>
-			</rows>			
+			</rows>
 		</grid>
 		<grid fixedLayout="true">
 			<columns>
-				<column width="40%"/>
+				<column width="40%" />
-				<column width="40%"/>
+				<column width="40%" />
 			</columns>
 			<rows>
 				<row>
-					<label value="${c:l('relatorioBilhetesVendidosController.lbStatus.value')}" />
+					<label
+						value="${c:l('relatorioBilhetesVendidosController.lbStatus.value')}" />
 					<label value="" />
 				</row>
 				<row>
-					<checkbox id="chkVendido" label="${c:l('relatorioBilhetesVendidosController.vendido.label')}" />
+					<checkbox id="chkVendido"
-					<checkbox id="chkCancelado" label="${c:l('relatorioBilhetesVendidosController.cancelado.label')}" />
+						label="${c:l('relatorioBilhetesVendidosController.vendido.label')}" />
+					<checkbox id="chkCancelado"
+						label="${c:l('relatorioBilhetesVendidosController.cancelado.label')}" />
+				</row>
+				<row>
+					<label
+						value="${c:l('relatorioBilhetesVendidosController.lbEstado.value')}" />
+					<combobox id="cmbEstado"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+						mold="rounded" buttonVisible="true"
+						style="width: 200px;"
+						model="@{winFiltroRelatorioBilhetesVendidos$composer.lsEstado}" />
 				</row>
 			</rows>
 		</grid>
 		<toolbar>
 			<button id="btnExecutarRelatorio" image="/gui/img/find.png"
 				label="${c:l('relatorio.lb.btnExecutarRelatorio')}" />
+			<button id="btnExecutarRelatorioNovoLayout"
+				image="/gui/img/find.png" label="Novo Layout" />
 		</toolbar>
 
-</window>
+	</window>
 </zk>