bug#10699

dev:veloso
qua:jose


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

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

@@ -12,19 +12,24 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
 public class RelatorioHistoricoClientes extends Relatorio {
+	
+	private boolean agrupar; 
 
 	public RelatorioHistoricoClientes(Map<String, Object> parametros, Connection conexao) throws Exception {
+		
 		super(parametros, conexao);
+		
 
 		this.setCustomDataSource(new ArrayDataSource(this) {
 
 			public void initDados() throws Exception {
 				Connection conexao = this.relatorio.getConexao();
 				Map<String, Object> parametros = this.relatorio.getParametros();
+
 				String sql = getSql(parametros);
 
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
-
+				agrupar = parametros.get("AGRUPAR").toString().equals("true");
 				ResultSet rset = stmt.executeQuery();
 
 				while (rset.next()) {
@@ -57,7 +62,16 @@ public class RelatorioHistoricoClientes extends Relatorio {
 			}
 		});
 	}
-
+	
+	@Override
+	public String getNome() {
+		if (agrupar) {
+			return super.getNome();
+		} else {
+			return super.getNome() + "SemAgrupamento";
+		}
+	}
+	
 	@Override
 	protected void processaParametros() throws Exception {
 	}

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

@@ -0,0 +1,33 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impressor por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+
+label.nomeCliente=Nome
+label.cpfCliente=CPF
+label.emailCliente=Email
+label.telCliente=Tel
+label.sigla=Tipo
+label.bilhete=Bilhete
+label.linha=Linha
+label.origem=Origem
+label.destino=Destino
+label.servico=Serviço
+label.classe=Classe
+label.poltrona=Polt.
+label.dataVenda=Venda
+label.dataViagem=Viagem
+label.tarifa=Tarifa
+label.taxas=Taxas
+label.formapago=F. Pgto
+label.parcelas=Parcelas
+
+label.totais=TOTAIS:

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

@@ -0,0 +1,33 @@
+#geral
+msg.noData=Não foi possivel obter dados com os parâmetros informados.
+
+#Labels cabeçalho
+cabecalho.relatorio=Relatório:
+cabecalho.periodo=Período:
+cabecalho.periodoA=à
+cabecalho.dataHora=Data/Hora:
+cabecalho.impressorPor=Impressor por:
+cabecalho.pagina=Página
+cabecalho.de=de
+cabecalho.filtros=Filtros:
+
+label.nomeCliente=Nome
+label.cpfCliente=CPF
+label.emailCliente=Email
+label.telCliente=Tel
+label.sigla=Tipo
+label.bilhete=Bilhete
+label.linha=Linha
+label.origem=Origem
+label.destino=Destino
+label.servico=Serviço
+label.classe=Classe
+label.poltrona=Polt.
+label.dataVenda=Venda
+label.dataViagem=Viagem
+label.tarifa=Tarifa
+label.taxas=Taxas
+label.formapago=F. Pgto
+label.parcelas=Parcelas
+
+label.totais=TOTAIS:

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

@@ -11,10 +11,23 @@ cabecalho.pagina=P
 cabecalho.de=de
 cabecalho.filtros=Filtros:
 
-#Labels header
-label.aidf=AIDF
-label.empresa=Empresa
-label.agencia=Agencia
-label.serie=Serie
-label.bilhete=Bilhetes
-label.numeracao=Numeração
+label.nomeCliente=Nome:
+label.cpfCliente=CPF:
+label.emailCliente=Email:
+label.telCliente=Tel:
+label.sigla=Tipo
+label.bilhete=Bilhete
+label.linha=Linha
+label.origem=Origem
+label.destino=Destino
+label.servico=Serviço
+label.classe=Classe
+label.poltrona=Polt.
+label.dataVenda=Venda
+label.dataViagem=Viagem
+label.tarifa=Tarifa
+label.taxas=Taxas
+label.formapago=F. Pgto
+label.parcelas=Parcelas
+
+label.totais=TOTAIS:

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

@@ -10,6 +10,7 @@
 	<parameter name="USUARIO" class="java.lang.String"/>
 	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
 	<parameter name="FILTROS" class="java.lang.String"/>
+	<parameter name="AGRUPAR" class="java.lang.Boolean"/>
 	<field name="nomeCliente" class="java.lang.String"/>
 	<field name="cpfCliente" class="java.lang.String"/>
 	<field name="emailCliente" class="java.lang.String"/>
@@ -38,6 +39,7 @@
 		<groupExpression><![CDATA[$F{cpfCliente}]]></groupExpression>
 		<groupHeader>
 			<band height="38">
+				<printWhenExpression><![CDATA[$P{AGRUPAR}]]></printWhenExpression>
 				<textField>
 					<reportElement uuid="47ce5fd4-21f6-4555-9c9b-5c3122af6a08" x="61" y="0" width="176" height="15"/>
 					<textElement>
@@ -207,6 +209,7 @@ $F{cpfCliente}.substring(0,3)
 		</groupHeader>
 		<groupFooter>
 			<band height="20">
+				<printWhenExpression><![CDATA[$P{AGRUPAR}]]></printWhenExpression>
 				<textField>
 					<reportElement uuid="3088c23d-c7b6-4286-9404-8e5638b81ce2" x="591" y="0" width="30" height="15"/>
 					<textElement>

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

@@ -0,0 +1,378 @@
+<?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="RelatorioHistoricoClientes" pageWidth="840" pageHeight="593" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="840" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2de20ee0-535e-49d2-a7be-c24a30351d9f">
+	<property name="ireport.zoom" value="2.143588810000011"/>
+	<property name="ireport.x" value="720"/>
+	<property name="ireport.y" value="62"/>
+	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="title"/>
+	<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"/>
+	<parameter name="USUARIO" class="java.lang.String"/>
+	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
+	<parameter name="FILTROS" class="java.lang.String"/>
+	<parameter name="AGRUPAR" class="java.lang.Boolean"/>
+	<field name="nomeCliente" class="java.lang.String"/>
+	<field name="cpfCliente" class="java.lang.String"/>
+	<field name="emailCliente" class="java.lang.String"/>
+	<field name="telCliente" class="java.lang.String"/>
+	<field name="sigla" class="java.lang.String"/>
+	<field name="bilhete" class="java.lang.String"/>
+	<field name="linha" class="java.lang.String"/>
+	<field name="origem" class="java.lang.String"/>
+	<field name="destino" class="java.lang.String"/>
+	<field name="servico" class="java.lang.String"/>
+	<field name="classe" class="java.lang.String"/>
+	<field name="poltrona" class="java.lang.String"/>
+	<field name="dataVenda" class="java.util.Date"/>
+	<field name="dataViagem" class="java.util.Date"/>
+	<field name="tarifa" class="java.math.BigDecimal"/>
+	<field name="taxas" class="java.math.BigDecimal"/>
+	<field name="formapago" class="java.lang.String"/>
+	<field name="parcelas" class="java.lang.String"/>
+	<title>
+		<band height="79" splitType="Stretch">
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="da52f710-3882-4beb-ba6f-870e03f6800d" mode="Transparent" x="0" y="0" width="495" height="41" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement uuid="2f4f1314-9363-4e6d-822f-c85c1890998b" mode="Transparent" x="819" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="c8a70b8d-369e-48ae-a911-a5d9692316f7" mode="Transparent" x="736" y="42" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<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"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
+				<reportElement uuid="ad4bbfb8-582d-4aa2-904d-8dfe60e54442" mode="Transparent" x="736" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="8601bf20-f5f8-4fed-9445-7adfe580d236" mode="Transparent" x="551" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="b48a0903-0b2a-4ae5-ae04-811d097a9f91" x="551" y="0" width="185" height="25"/>
+				<textElement textAlignment="Right">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement uuid="3c577f75-c6d6-4c11-a846-bfe71a8a1b42" x="0" y="58" width="839" height="1"/>
+			</line>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="aff6535e-c25b-4f31-ad3a-baacc52e4974" x="0" y="59" width="840" height="15"/>
+				<textElement verticalAlignment="Middle">
+					<font size="10"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement uuid="84641d2c-21a5-47f0-b4a8-afe7bf700cb6" positionType="Float" x="0" y="78" width="839" height="1"/>
+			</line>
+		</band>
+	</title>
+	<columnHeader>
+		<band height="15">
+			<textField>
+				<reportElement uuid="18583c5b-9665-4604-8bb8-69d73c58567a" x="364" y="0" width="56" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="8ddc037e-7fbe-466e-8e61-dae087bc1cf7" x="420" y="0" width="56" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="90babf43-9835-4c7e-a7d1-40be2cc51619" x="476" y="0" width="39" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.servico}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="bd43ca66-b87e-42a7-abff-72479a5ffe63" x="605" y="0" width="45" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.dataVenda}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="2eb1c82e-7377-4220-b139-400d5d48b7d3" x="650" y="0" width="45" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.dataViagem}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="fbfc5435-e89e-4e40-bee0-6f8b5ce9b2ea" x="695" y="0" width="29" height="15"/>
+				<textElement textAlignment="Right">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.tarifa}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="eed395cd-47a8-45f5-b51c-8089c932d448" x="286" y="0" width="78" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.linha}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="0f163842-d1be-4185-9e53-9655e080dd2d" x="515" y="0" width="66" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.classe}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="ae2f034e-0ca5-46bc-b2f6-f3bd47796ad5" x="581" y="0" width="24" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.poltrona}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="3daef887-6dca-431a-94f9-526502486ff1" x="724" y="0" width="31" height="15"/>
+				<textElement textAlignment="Right">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.taxas}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="37321f26-a994-4e2e-8e56-e8e5ea4dfed0" x="804" y="0" width="36" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.parcelas}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="352473e7-d6b5-46ce-a8ed-b28e7e2dc880" x="755" y="0" width="49" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.formapago}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="2d8bc8b7-05a7-493a-ac4f-52f7f39cfa8b" x="206" y="0" width="25" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.sigla}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="aae9977c-b656-4daf-8b9f-8fd3248542e3" x="231" y="0" width="55" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.bilhete}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="f47b6889-caff-40c0-a384-f2bbc9665741" mode="Transparent" x="0" y="0" width="77" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.nomeCliente}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="3fbb713b-dc9d-4dc6-91fb-1fb40b491280" mode="Transparent" x="77" y="0" width="56" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.cpfCliente}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="431ed3cb-4ca3-48f8-b2cc-135161f41839" mode="Transparent" x="133" y="0" width="37" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.emailCliente}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="3d7297de-acef-46a7-8fb7-c3a41f3e8ab4" mode="Transparent" x="170" y="0" width="36" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.telCliente}]]></textFieldExpression>
+			</textField>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="15" splitType="Stretch">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="7d36d275-67bb-4ec8-a119-fbedc14cbe04" stretchType="RelativeToTallestObject" x="286" y="0" width="78" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="027df7b5-ebc5-4e17-8f47-9b585bd3dc7e" stretchType="RelativeToTallestObject" x="364" y="0" width="56" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="63b723f6-7508-4472-b7fb-d5c0cdd85e7a" stretchType="RelativeToTallestObject" x="420" y="0" width="56" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="a52bef35-fb3a-41d9-ae97-69ae9bc1d86d" stretchType="RelativeToTallestObject" x="476" y="0" width="39" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{servico}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="809ff880-ad14-497c-a4b3-f639338eda3a" stretchType="RelativeToTallestObject" x="515" y="0" width="66" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{classe}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="8da16e41-42e7-45e1-b655-a8df7415d9ad" stretchType="RelativeToTallestObject" x="581" y="0" width="24" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{poltrona}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement uuid="747c1f2d-48e2-4c3b-937c-d09b3600479a" stretchType="RelativeToTallestObject" x="605" y="0" width="45" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataVenda}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement uuid="4d3f7dd3-d0c0-4b25-bb84-4239eea981d2" stretchType="RelativeToTallestObject" x="650" y="0" width="45" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataViagem}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="ce675415-da10-4f5a-9aff-591e64d2f310" stretchType="RelativeToTallestObject" x="695" y="0" width="29" height="15"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="c13c8d66-c9c4-466c-80bf-e5852d511ba4" stretchType="RelativeToTallestObject" x="724" y="0" width="31" height="15"/>
+				<textElement textAlignment="Right">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{taxas}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="dbae1b16-7ae9-434d-b144-fa1cc85c0ad9" stretchType="RelativeToTallestObject" x="755" y="0" width="49" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{formapago}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="b0271781-4011-49cc-88f4-728db92c02ab" stretchType="RelativeToTallestObject" x="804" y="0" width="36" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{parcelas}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="c84cf1a5-c9cb-41fc-a177-66e10fdd184e" stretchType="RelativeToTallestObject" x="206" y="0" width="25" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{sigla}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="61a29051-32aa-45af-a209-161218f1e3eb" stretchType="RelativeToTallestObject" x="231" y="0" width="55" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{bilhete}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="47ce5fd4-21f6-4555-9c9b-5c3122af6a08" stretchType="RelativeToTallestObject" x="0" y="0" width="77" height="15"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{nomeCliente} == null ? "Sem Cliente" : $F{nomeCliente}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="a0e4121e-c83e-4043-a5de-9866b54d52df" stretchType="RelativeToTallestObject" x="77" y="0" width="56" height="15"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{cpfCliente}.length() != 11 ? $F{cpfCliente} :
+$F{cpfCliente}.substring(0,3)
++ '.'
++ $F{cpfCliente}.substring(3,6)
++ '.'
++ $F{cpfCliente}.substring(6,9)
++ '-'
++ $F{cpfCliente}.substring(9,11)]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="4c493d99-5a45-4390-8909-b6403b31598c" stretchType="RelativeToTallestObject" x="133" y="0" width="37" height="15"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{emailCliente}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="7d687ab8-abb2-41f9-9b23-442da1a0cc75" stretchType="RelativeToTallestObject" x="170" y="0" width="36" height="15"/>
+				<textElement>
+					<font size="7"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{telCliente}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<noData>
+		<band height="50">
+			<textField>
+				<reportElement uuid="6b9f63c1-76d9-4dd7-8fce-9bc0d91292af" x="0" y="24" width="575" height="26"/>
+				<textElement markup="none">
+					<font size="11" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
+			</textField>
+		</band>
+	</noData>
+</jasperReport>

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

@@ -17,6 +17,7 @@ import org.zkoss.zhtml.Messagebox;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Bandbox;
+import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Paging;
@@ -66,6 +67,7 @@ public class RelatorioHistoricoClientesController extends MyGenericForwardCompos
 	private MyListbox linhaList;
 	private MyListbox linhaListSelList;
 	private Textbox txtPalavraPesquisaLinha;
+	private Checkbox chcAgrupar;
 
 	@Autowired
 	private EmpresaService empresaService;
@@ -161,6 +163,7 @@ public class RelatorioHistoricoClientesController extends MyGenericForwardCompos
 		parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioHistoricoClientesController.window.title"));
 		parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
 		parametros.put("USUARIO_NOME", UsuarioLogado.getUsuarioLogado().getNombusuario());
+		parametros.put("AGRUPAR", chcAgrupar.isChecked());
 
 		lsNumLinha = new ArrayList(Arrays.asList(linhaListSelList.getData()));
 		parametros.put("lsNumLinha", lsNumLinha);

web/WEB-INF/i3-label_es_MX.label

@@ -467,6 +467,7 @@ relatorioHistoricoClientesController.lblDataEmbarqueFin.value = Data Embarque Fi
 relatorioHistoricoClientesController.MSG.informarDatas = Favor informar um filtro de data.
 relatorioHistoricoClientesController.MSG.informarDataVenda = Favor informar o período completo de venda.
 relatorioHistoricoClientesController.MSG.informarDataEmbarque = Favor infromar o período completo de embarque.
+relatorioHistoricoClientesController.lblAgruparPorCliente.value = Agrupar por Cliente
 
 # Relatorio OCD Empresa
 relatorioOCDController.window.title=Reporte OCD por la empresa

web/WEB-INF/i3-label_pt_BR.label

@@ -490,6 +490,7 @@ relatorioHistoricoClientesController.lblDataEmbarqueFin.value = Data Embarque Fi
 relatorioHistoricoClientesController.MSG.informarDatas = Favor informar um filtro de data.
 relatorioHistoricoClientesController.MSG.informarDataVenda = Favor informar o período completo de venda.
 relatorioHistoricoClientesController.MSG.informarDataEmbarque = Favor infromar o período completo de embarque.
+relatorioHistoricoClientesController.lblAgruparPorCliente.value = Agrupar por Cliente
 
 # Relatorio OCD Empresa
 relatorioOCDController.window.title=Relatório OCD por Empresa

web/gui/relatorios/filtroRelatorioHistoricoClientes.zul

@@ -7,7 +7,7 @@
 <zk xmlns="http://www.zkoss.org/2005/zul">
 	<window id="winFiltroRelatorioHistoricoCliente" apply="${relatorioHistoricoClientesController}" 
 		 contentStyle="overflow:auto"
-		height="460px" width="728px" border="normal">
+		height="484px" width="728px" border="normal">
 			<grid fixedLayout="true">
 			<columns>
 				<column width="25%" />
@@ -16,7 +16,7 @@
 				<column width="30%" />
 			</columns>
 			<rows>
-					<row>
+				<row>				
 					<label
 						value="${c:l('relatorioHistoricoClientesController.lblDataVendaIni.value')}" />
 					<datebox id="dtVendaInicial" width="100%" mold="rounded"
@@ -174,6 +174,13 @@
 						</borderlayout>
 					</cell>
 				</row>
+				<row>
+				<cell colspan="2">
+					<checkbox id="chcAgrupar"
+						label="${c:l('relatorioHistoricoClientesController.lblAgruparPorCliente.value')}" />
+				</cell>
+			</row>
+				
 			</rows>
 		</grid>