Merge pull request 'fixes bug#AL-4586' (!602) from AL-4587 into master

Reviewed-on: adm/VentaBoletosAdm#602
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>

pom.xml

@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.10.0</version>
+	<version>1.11.0</version>
 	<packaging>war</packaging> 
   
 	<properties>
 		<modelWeb.version>1.84.0</modelWeb.version>
-		<flyway.version>1.70.0</flyway.version>
+		<flyway.version>1.71.0</flyway.version>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
 

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

@@ -0,0 +1,135 @@
+package com.rjconsultores.ventaboletos.relatorios.impl;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
+import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
+
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+
+public class RelatorioDescontoCupom extends Relatorio {
+
+	private List<RelatorioDescontoPorCupomBean> lsDadosRelatorioDescontoPorCupom;
+
+	public RelatorioDescontoCupom(Map<String, Object> parametros, Connection conexao) throws Exception {
+		super(parametros, conexao);
+
+		this.setCustomDataSource(new DataSource(this) {
+			@Override
+			public void initDados() throws Exception {
+
+				lsDadosRelatorioDescontoPorCupom = new ArrayList<RelatorioDescontoPorCupomBean>();
+
+				Connection conexao = this.relatorio.getConexao();
+				Map<String, Object> parametros = this.relatorio.getParametros();
+
+				String sql = getSql();
+
+				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
+
+				ResultSet rset = null;
+
+				java.sql.Date dataInicial = new java.sql.Date(
+						DateUtil.normalizarToFecha((Date) parametros.get("DATA_INICIAL")).getTime());
+				java.sql.Date dataFinal = new java.sql.Date(
+						DateUtil.normalizarToFecha((Date) parametros.get("DATA_FINAL")).getTime());
+
+				java.sql.Date dateResgateInicial = new java.sql.Date(
+						DateUtil.normalizarToFecha((Date) parametros.get("DATA_RESGATEINICIAL")).getTime());
+				java.sql.Date dateResgateFinal = new java.sql.Date(
+						DateUtil.normalizarToFecha((Date) parametros.get("DATA_RESGATEFINAL")).getTime());
+
+				stmt.setDate("DATA_INICIAL", dataInicial);
+				stmt.setDate("DATA_FINAL", dataFinal);
+
+				stmt.setDate("DATA_RESGATEINICIAL", dateResgateInicial);
+				stmt.setDate("DATA_RESGATEFINAL", dateResgateFinal);
+
+				if (parametros.get("EMPRESA_ID") != null)
+					stmt.setInt("EMPRESA_ID", (Integer) parametros.get("EMPRESA_ID"));
+				else
+					stmt.setNull("EMPRESA_ID", java.sql.Types.INTEGER);
+
+				if (parametros.get("PUNTOVENTA_ID") != null)
+					stmt.setInt("PUNTOVENTA_ID", (Integer) parametros.get("PUNTOVENTA_ID"));
+				else
+					stmt.setNull("PUNTOVENTA_ID", java.sql.Types.INTEGER);
+
+				rset = stmt.executeQuery();
+
+				RelatorioDescontoPorCupomBean relatorioDescontoPorCupom = null;
+				while (rset.next()) {
+					relatorioDescontoPorCupom = new RelatorioDescontoPorCupomBean();
+					relatorioDescontoPorCupom.setDescConvenio(rset.getString("descConvenio"));
+					relatorioDescontoPorCupom.setCodigoCupom(rset.getString("codigoCupom"));
+					relatorioDescontoPorCupom.setCliente(rset.getString("cliente"));
+					relatorioDescontoPorCupom.setDataEntrega(rset.getDate("dataEntrega"));
+					relatorioDescontoPorCupom.setPuntoVentaEntrega(rset.getString("puntoVentaEntrega"));
+					relatorioDescontoPorCupom.setDataResgate(rset.getDate("dataResgate"));
+					relatorioDescontoPorCupom.setPuntoVentaResgate(rset.getString("puntoVentaResgate"));
+
+					relatorioDescontoPorCupom.setNumeroTicket(rset.getLong("numeroTicket"));
+					relatorioDescontoPorCupom.setValorTicket(rset.getBigDecimal("valorTicket"));
+					relatorioDescontoPorCupom.setValorDescuento(rset.getBigDecimal("valorDescuento"));
+					lsDadosRelatorioDescontoPorCupom.add(relatorioDescontoPorCupom);
+				}
+
+				if (lsDadosRelatorioDescontoPorCupom.size() > 0) {
+
+					setLsDadosRelatorio(lsDadosRelatorioDescontoPorCupom);
+				}
+			}
+
+		});
+
+	}
+
+	private String getSql() {
+		StringBuilder sql = new StringBuilder();
+		sql.append("SELECT  ");
+		sql.append("C.DESCCONVENIO descConvenio, ");
+		sql.append("CS.CODIGOCUPOM codigoCupom,  ");
+		sql.append("BOLETOSORTEADO.NOMBPASAJERO cliente,  ");
+		sql.append("BOLETOSORTEADO.fechorventa dataEntrega,  ");
+		sql.append("PUNTOVENTASORTEADO.NOMBPUNTOVENTA puntoVentaEntrega,  ");
+		sql.append("BOLETOCUPOM.fechorventa dataResgate,  ");
+		sql.append("PUNTOVENTACUPOM.NOMBPUNTOVENTA puntoVentaResgate,  ");
+		sql.append("CS.BOLETOSORTEADO_ID numeroTicket,  ");
+		sql.append("BOLETOCUPOM.precioPagado valorTicket,  ");
+		sql.append("BOLETOCUPOM.descuentoamparado valorDescuento  ");
+		sql.append("FROM CAMPANHACUPOMSORTEADO CS  ");
+		sql.append("INNER JOIN CONVENIO C ON C.CONVENIO_ID=CS.CONVENIO_ID  ");
+		sql.append("INNER JOIN BOLETO BOLETOSORTEADO ON BOLETOSORTEADO.BOLETO_ID=CS.BOLETOSORTEADO_ID  ");
+		sql.append(
+				"INNER JOIN PUNTO_VENTA PUNTOVENTASORTEADO ON PUNTOVENTASORTEADO.PUNTOVENTA_ID = BOLETOSORTEADO.PUNTOVENTA_ID  ");
+		sql.append("INNER JOIN BOLETO BOLETOCUPOM ON BOLETOCUPOM.BOLETO_ID=CS.BOLETOCUPOM_ID  ");
+		sql.append(
+				"INNER JOIN PUNTO_VENTA PUNTOVENTACUPOM ON PUNTOVENTACUPOM.PUNTOVENTA_ID = BOLETOCUPOM.PUNTOVENTA_ID  ");
+		sql.append("WHERE  ");
+		sql.append("BOLETOSORTEADO.FECHORVENTA BETWEEN :DATA_INICIAL AND :DATA_FINAL ");
+		sql.append("AND BOLETOCUPOM.FECHORVENTA BETWEEN :DATA_RESGATEINICIAL AND :DATA_RESGATEFINAL ");
+		sql.append("AND CS.EMPRESA_ID=COALESCE(:EMPRESA_ID,CS.EMPRESA_ID)  ");
+		sql.append("AND CS.PUNTOVENTA_ID=COALESCE(:PUNTOVENTA_ID,CS.PUNTOVENTA_ID)  ");
+
+		return sql.toString();
+	}
+
+	@Override
+	protected void processaParametros() throws Exception {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void setLsDadosRelatorio(List<RelatorioDescontoPorCupomBean> lsDadosRelatorio) {
+		this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio));
+		this.lsDadosRelatorioDescontoPorCupom = lsDadosRelatorio;
+	}
+
+}

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

@@ -0,0 +1,81 @@
+package com.rjconsultores.ventaboletos.relatorios.impl;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class RelatorioDescontoPorCupomBean {
+	
+	private String descConvenio;
+	private String codigoCupom ;
+	private String cliente;
+	private Date dataEntrega; 
+	private String puntoVentaEntrega;
+	private Date dataResgate; 
+	private String puntoVentaResgate;
+	private Long numeroTicket;
+	private BigDecimal valorTicket;
+	private BigDecimal valorDescuento;
+	public String getDescConvenio() {
+		return descConvenio;
+	}
+	public void setDescConvenio(String descConvenio) {
+		this.descConvenio = descConvenio;
+	}
+	public String getCodigoCupom() {
+		return codigoCupom;
+	}
+	public void setCodigoCupom(String codigoCupom) {
+		this.codigoCupom = codigoCupom;
+	}
+	public String getCliente() {
+		return cliente;
+	}
+	public void setCliente(String cliente) {
+		this.cliente = cliente;
+	}
+	public Date getDataEntrega() {
+		return dataEntrega;
+	}
+	public void setDataEntrega(Date dataEntrega) {
+		this.dataEntrega = dataEntrega;
+	}
+	public String getPuntoVentaEntrega() {
+		return puntoVentaEntrega;
+	}
+	public void setPuntoVentaEntrega(String puntoVentaEntrega) {
+		this.puntoVentaEntrega = puntoVentaEntrega;
+	}
+	public Date getDataResgate() {
+		return dataResgate;
+	}
+	public void setDataResgate(Date dataResgate) {
+		this.dataResgate = dataResgate;
+	}
+	public String getPuntoVentaResgate() {
+		return puntoVentaResgate;
+	}
+	public void setPuntoVentaResgate(String puntoVentaResgate) {
+		this.puntoVentaResgate = puntoVentaResgate;
+	}
+	public Long getNumeroTicket() {
+		return numeroTicket;
+	}
+	public void setNumeroTicket(Long numeroTicket) {
+		this.numeroTicket = numeroTicket;
+	}
+	public BigDecimal getValorTicket() {
+		return valorTicket;
+	}
+	public void setValorTicket(BigDecimal valorTicket) {
+		this.valorTicket = valorTicket;
+	}
+	public BigDecimal getValorDescuento() {
+		return valorDescuento;
+	}
+	public void setValorDescuento(BigDecimal valorDescuento) {
+		this.valorDescuento = valorDescuento;
+	}
+	
+	
+
+}

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

@@ -0,0 +1,25 @@
+#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:
+cabecalho.dataDaVenda=Data da Venda
+cabecalho.dataDoResgate=Data do Resgate
+
+label.descConvenio=Nome do Convêncio
+label.codigoCupom=Código Cupom
+label.cliente=Nome Passageiro
+label.dataEntrega=Data Entrega
+label.puntoVentaEntrega=Agência da Entrega
+label.dataResgate=Data Resgate
+label.puntoVentaResgate=Agência do Resgate
+label.numeroTicket=Ticket Ganhador
+label.valorTicket=Valor Ticket
+label.valorDescuento=Valor do Desconto

src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDescontoCupom_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.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:
+cabecalho.dataDaVenda=Data da Venda
+cabecalho.dataDoResgate=Data do Resgate
+
+label.descConvenio=Nome do Convênio
+label.codigoCupom=Código Cupom
+label.cliente=Nome Passageiro
+label.dataEntrega=Data Entrega
+label.puntoVentaEntrega=Agência da Entrega
+label.dataResgate=Data Resgate
+label.puntoVentaResgate=Agência do Resgate
+label.numeroTicket=Ticket Ganhador
+label.valorTicket=Valor Ticket
+label.valorDescuento=Valor do Desconto

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

@@ -0,0 +1,338 @@
+<?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="RelatorioDescontoCupom" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="832" leftMargin="5" rightMargin="5" topMargin="20" bottomMargin="20" uuid="075a29e7-68c6-44a0-b788-c0614ed3c46a">
+	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<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"/>
+	<parameter name="DATA_INICIAL" class="java.util.Date"/>
+	<parameter name="DATA_FINAL" class="java.util.Date"/>
+	<parameter name="DATA_RESGATEINICIAL" class="java.util.Date"/>
+	<parameter name="DATA_RESGATEFINAL" class="java.util.Date"/>
+	<field name="descConvenio" class="java.lang.String"/>
+	<field name="cliente" class="java.lang.String"/>
+	<field name="codigoCupom" class="java.lang.String"/>
+	<field name="puntoVentaEntrega" class="java.lang.String"/>
+	<field name="dataEntrega" class="java.util.Date"/>
+	<field name="puntoVentaResgate" class="java.lang.String"/>
+	<field name="numeroTicket" class="java.lang.Long"/>
+	<field name="valorTicket" class="java.math.BigDecimal"/>
+	<field name="valorDescuento" class="java.math.BigDecimal"/>
+	<field name="dataResgate" class="java.util.Date"/>
+	<title>
+		<band height="81" splitType="Stretch">
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="eb2d73d0-40a6-4b6d-9e8a-76806f943e47" mode="Transparent" x="0" y="0" width="394" height="25" 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="8751af1a-64e8-41dc-a423-8ffd9686e093" mode="Transparent" x="811" 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="66239550-5098-4a3a-ad99-ab9f1a420d1e" mode="Transparent" x="728" 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="ce2d33f4-cfa1-48fe-9a70-5847e9ddd122" mode="Transparent" x="728" 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="012dd1aa-b31e-4df4-b879-c3fc9785e27c" mode="Transparent" x="543" 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="49b24665-8942-4812-b7b4-7aac56812b46" x="543" y="0" width="185" height="25"/>
+				<textElement textAlignment="Right">
+					<font size="9" isBold="true"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement uuid="0b20a6e5-3ba4-495b-912f-ae8d87eda713" x="-1" y="58" width="832" height="1"/>
+			</line>
+			<textField isStretchWithOverflow="true">
+				<reportElement uuid="8e18add1-0582-4bed-8896-5948d588cfa0" x="-1" y="59" width="833" height="15"/>
+				<textElement verticalAlignment="Middle">
+					<font size="10"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement uuid="1381bb9d-c239-4937-8f02-70fb99a20ddd" positionType="Float" x="-1" y="78" width="832" height="1"/>
+			</line>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="7dab3ec0-f044-41df-bdb7-8014567ea89b" mode="Transparent" x="1" y="25" width="100" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.dataDaVenda}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
+				<reportElement uuid="1a3b14ee-760a-4576-acdc-adeb9453bee6" mode="Transparent" x="376" y="25" width="70" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{DATA_RESGATEINICIAL}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="2a540086-2a16-4860-b4c7-9167dcedc637" mode="Transparent" x="446" y="25" width="20" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.periodoA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy " isBlankWhenNull="false">
+				<reportElement uuid="4b218deb-bdf8-4f40-ad37-75a9e90582eb" mode="Transparent" x="192" y="25" width="67" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="b290552a-a04c-46ea-a864-7262661a19be" mode="Transparent" x="276" y="25" width="100" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.dataDoResgate}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
+				<reportElement uuid="d2e9b85f-5ac2-49d0-81c4-b35fef7c7c64" mode="Transparent" x="101" y="25" width="70" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="61eaab9e-3880-4e3a-8b30-aa4bc96c300c" mode="Transparent" x="172" y="25" width="20" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.periodoA}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
+				<reportElement uuid="292720be-a240-41a3-8d11-937d4bef11cb" mode="Transparent" x="466" y="25" width="67" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{DATA_RESGATEFINAL}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<columnHeader>
+		<band height="16">
+			<textField>
+				<reportElement uuid="492a191f-1cfb-4d61-8160-93cc76bd897e" x="0" y="0" width="100" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.descConvenio}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="92b2990e-22f4-40c2-a15b-694d2a64696b" x="100" y="0" width="60" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.codigoCupom}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="62953a9e-1a36-4bea-bf59-d8ae933274ce" x="160" y="0" width="100" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.cliente}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="ae5dc587-ab3f-4a6e-b96b-378bce36ca54" x="260" y="0" width="70" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.dataEntrega}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="6981c29e-5d14-4c3b-a089-75e7189b76e3" x="330" y="0" width="130" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.puntoVentaEntrega}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="c76bc8a2-3da9-45bc-9946-812c882446b2" x="530" y="0" width="130" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.puntoVentaResgate}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="85120e15-b345-4f98-a42f-f0d61739b552" x="630" y="0" width="80" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.numeroTicket}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="fe0f8028-590b-4bd8-af16-a03115d31403" x="771" y="0" width="60" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.valorDescuento}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="70e884e2-3666-4f9c-bbe9-c18fae08aba6" x="710" y="0" width="60" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.valorTicket}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="e895467f-eaa7-4fa2-8743-b8ac1c555ee9" x="460" y="0" width="70" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{label.dataResgate}]]></textFieldExpression>
+			</textField>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="15" splitType="Stretch">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="fe2a3916-54c9-448a-a841-d6bcd5c6a93f" stretchType="RelativeToTallestObject" x="0" y="0" width="100" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{descConvenio}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="1a3bdcab-e895-42e7-aa08-8318d94aeedd" stretchType="RelativeToTallestObject" x="100" y="0" width="60" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{codigoCupom}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="3fb24dba-72f1-4de9-bf07-89c2262f4ed5" stretchType="RelativeToTallestObject" x="160" y="0" width="100" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{cliente}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
+				<reportElement uuid="dfbd7b2c-5c48-4fa3-8de9-29e196a9e382" stretchType="RelativeToTallestObject" x="259" y="0" width="70" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataEntrega}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
+				<reportElement uuid="f7bad1bc-7e98-4ade-8266-1de9963ba2ed" stretchType="RelativeToTallestObject" x="330" y="0" width="130" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{puntoVentaEntrega}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
+				<reportElement uuid="4b2cecd1-68ed-4e8e-812c-5fbf781afea4" stretchType="RelativeToTallestObject" x="460" y="0" width="70" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataResgate}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="b2c6022d-0944-4d9e-937e-8908401f86f1" stretchType="RelativeToTallestObject" x="530" y="0" width="130" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{puntoVentaResgate}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="false">
+				<reportElement uuid="ec19c014-ea1a-41b6-8522-de41c6db8214" stretchType="RelativeToTallestObject" x="630" y="0" width="80" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{numeroTicket}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="674774dd-179e-42a7-9d04-e8f322dc75a7" stretchType="RelativeToTallestObject" x="710" y="0" width="60" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{valorTicket}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="604abe51-72fc-4088-9edd-59519d05c3ab" stretchType="RelativeToTallestObject" x="771" y="0" width="60" height="15"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{valorDescuento}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<noData>
+		<band height="50">
+			<textField>
+				<reportElement uuid="be7cf0fc-2faf-48f6-b8d1-fec82d255686" x="0" y="24" width="831" height="26"/>
+				<textElement markup="none">
+					<font size="11" isBold="true"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
+			</textField>
+		</band>
+	</noData>
+</jasperReport>

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java

@@ -670,6 +670,7 @@ public class EditarConvenioController extends MyGenericForwardComposer {
             	convenio.setIndDescuentoNormal(null);
             	convenio.setIndGeral((short) 2);
             	convenio.setCliente(null); 
+            	convenio.setImprimeprecio((short) 1 );
             	
             	ConvenioCampanha convenioCampanha= convenio.getConvenioCampanha();
             	convenioCampanha.setTermoECondicao(txtTermoCondicao.getValue());

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

@@ -0,0 +1,146 @@
+package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios;
+
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+import org.zkoss.util.resource.Labels;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zul.Comboitem;
+
+import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
+import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioDescontoCupom;
+import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.service.EmpresaService;
+import com.rjconsultores.ventaboletos.service.PuntoVentaService;
+import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
+import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
+import com.rjconsultores.ventaboletos.web.utilerias.MyDatebox;
+import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
+import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
+
+@Controller("relatorioDescontoPorCupomController")
+@Scope("prototype")
+
+public class RelatorioDescontoPorCupomController extends MyGenericForwardComposer {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Autowired
+	private transient PagedListWrapper<PuntoVenta> plwPuntoVenta;
+	@Autowired
+	private DataSource dataSourceRead;
+
+	@Autowired
+	private EmpresaService empresaService;
+	private MyComboboxEstandar cmbEmpresa;
+	private List<Empresa> lsEmpresa;
+
+	@Autowired
+	private PuntoVentaService puntoVentaService;
+	private MyComboboxEstandar cmbPuntoVenta;
+	private List<PuntoVenta> lsPuntoVenta;
+
+	private MyDatebox datInicial;
+	private MyDatebox datFinal;
+	private MyDatebox datResgateInicial;
+	private MyDatebox datResgateFinal;
+
+	@Override
+	public void doAfterCompose(Component comp) throws Exception {
+
+		lsEmpresa = empresaService.obtenerTodos();
+		lsPuntoVenta = puntoVentaService.obtenerTodos();
+		
+
+
+		super.doAfterCompose(comp);
+	}
+
+	public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
+		executarRelatorio();
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private void executarRelatorio() throws Exception {
+		Relatorio relatorio;
+		Map<String, Object> parametros = new HashMap<String, Object>();
+		StringBuilder filtro = new StringBuilder();
+
+		parametros.put("DATA_INICIAL", (java.util.Date) this.datInicial.getValue());
+		parametros.put("DATA_FINAL", (java.util.Date) this.datFinal.getValue());
+		parametros.put("DATA_RESGATEINICIAL", (java.util.Date) this.datResgateInicial.getValue());
+		parametros.put("DATA_RESGATEFINAL", (java.util.Date) this.datResgateFinal.getValue());
+		parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioDescontoPorCupomController.window.title"));
+		parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
+
+		filtro.append(" Empresa: ");
+
+		Comboitem itemEmpresa = cmbEmpresa.getSelectedItem();
+		if (itemEmpresa != null) {
+			Empresa empresa = (Empresa) itemEmpresa.getValue();
+			parametros.put("EMPRESA_ID", empresa.getEmpresaId());
+			parametros.put("EMPRESA", empresa.getNombempresa());
+			filtro.append(empresa.getNombempresa() + ";");
+		} else {
+			filtro.append("Todas;");
+		}
+
+		filtro.append(" Empresa: ");
+
+		Comboitem itemPuntoVenta = cmbPuntoVenta.getSelectedItem();
+		if (itemPuntoVenta != null) {
+			PuntoVenta puntoVenta = (PuntoVenta) itemPuntoVenta.getValue();
+			parametros.put("PUNTOVENTA_ID", puntoVenta.getPuntoventaId());
+			parametros.put("PUNTOVENTA", puntoVenta.getNombpuntoventa());
+			filtro.append(puntoVenta.getNombpuntoventa() + ";");
+		} else {
+			filtro.append("Todas;");
+		}
+
+		parametros.put("FILTROS", filtro.toString());
+
+		Connection connection = dataSourceRead.getConnection();
+		try {
+			relatorio = new RelatorioDescontoCupom(parametros, connection);
+			Map args = new HashMap();
+			args.put("relatorio", relatorio);
+
+			openWindow("/component/reportView.zul", Labels.getLabel("relatorioW2IController.window.title"), args,
+					MODAL);
+		} finally {
+			if ((connection != null) && !connection.isClosed()) {
+				connection.close();
+			}
+		}
+	}
+
+	public List<Empresa> getLsEmpresa() {
+		return lsEmpresa;
+	}
+
+	public void setLsEmpresa(List<Empresa> lsEmpresa) {
+		this.lsEmpresa = lsEmpresa;
+	}
+
+	public List<PuntoVenta> getLsPuntoVenta() {
+		return lsPuntoVenta;
+	}
+
+	public void setLsPuntoVenta(List<PuntoVenta> lsPuntoVenta) {
+		this.lsPuntoVenta = lsPuntoVenta;
+	}
+
+}

src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/relatorios/ItemMenuRelatorioDescontoPorCupom.java

@@ -0,0 +1,27 @@
+package com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios;
+
+import org.zkoss.util.resource.Labels;
+
+import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria;
+import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema;
+
+public class ItemMenuRelatorioDescontoPorCupom extends DefaultItemMenuSistema {
+
+	public ItemMenuRelatorioDescontoPorCupom() {
+		super("indexController.mniRelatorioDescontoPorCupom.label");
+		
+		
+	}
+	
+	@Override
+	public String getClaveMenu() {
+		return "COM.RJCONSULTORES.ADMINISTRACION.GUI.RELATORIOS.MENU.RELATORIODESCONTOPORCUPOM";
+	}
+
+	@Override
+	public void ejecutar() {
+		PantallaUtileria.openWindow("/gui/relatorios/filtroRelatorioDescontoPorCupom.zul",
+                Labels.getLabel("relatorioDescontoPorCupomController.window.title"), getArgs(), desktop);
+		
+	}
+}

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

@@ -221,6 +221,7 @@ analitico.gerenciais.estatisticos.relatorioVendaEmbarcada=com.rjconsultores.vent
 analitico.gerenciais.estatisticos.movimentacaobilhete=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioMovimentacaoBilhete
 analitico.gerenciais.estatisticos.encerramentocheckin=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioEncerramentoCheckin
 analitico.gerenciais.estatisticos.mmphDERPR=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioMmphDer
+analitico.gerenciais.estatisticos.relatorioDescontoPorCupom=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioDescontoPorCupom
 #------------------------------RELATORIOS FINANCEIROS-----------------------------------------------------------------------------------------------------------------------------------------------
 analitico.gerenciais.financeiro=com.rjconsultores.ventaboletos.web.utilerias.menu.item.analitico.gerenciais.financeiro.SubMenuRelatorioFinanceiro
 analitico.gerenciais.financeiro.aproveitamentoFinanceiro=com.rjconsultores.ventaboletos.web.utilerias.menu.item.relatorios.ItemMenuRelatorioAproveitamentoFinanceiro

web/WEB-INF/i3-label_en.label

@@ -10050,6 +10050,17 @@ winMovimentacionBilhetesPuntoVenta.origem.label = Origem
 winMovimentacionBilhetesPuntoVenta.puntoventa.label = Ag.
 winMovimentacionBilhetesPuntoVenta.tipoMovimentacion.label = Natureza
 
+
+
+indexController.mniRelatorioDescontoPorCupom.label = Relatório Desconto Por Cupom
+relatorioDescontoPorCupomController.window.title = RELATÓRIO DESCONTO POR CUPOM
+relatorioDescontoPorCupomController.lbDatInicial.value=Data Inicial da Venda
+relatorioDescontoPorCupomController.lbDatFinal.value=Data Final da Venda
+relatorioDescontoPorCupomController.lbDatResgateInicial.value=Data Inicial do Resgate
+relatorioDescontoPorCupomController.lbDatResgateFinal.value=Data Final do Resgate
+winFiltroRelatorioDescontoPorCupom.lbEmpresa.value=Empresa
+winFiltroRelatorioDescontoPorCupom.lbPuntoVenta.value=Agência
+
 editarIntComprovantePassagem.MSG.borrarOK = Configuration Deleted Successfully.
 editarIntComprovantePassagem.MSG.borrarPergunta = Remove Enterprise Integration settings?
 editarIntComprovantePassagem.MSG.cadastroExistent = There is already a configuration for this Company, Integration and Via.

web/WEB-INF/i3-label_es_MX.label

@@ -10174,6 +10174,16 @@ winMovimentacionBilhetesPuntoVenta.origem.label = Origen
 winMovimentacionBilhetesPuntoVenta.puntoventa.label = Ag.
 winMovimentacionBilhetesPuntoVenta.tipoMovimentacion.label = Naturaleza
 
+
+indexController.mniRelatorioDescontoPorCupom.label = Relatório Desconto Por Cupom
+relatorioDescontoPorCupomController.window.title = RELATÓRIO DESCONTO POR CUPOM
+relatorioDescontoPorCupomController.lbDatInicial.value=Data Inicial da Venda
+relatorioDescontoPorCupomController.lbDatFinal.value=Data Final da Venda
+relatorioDescontoPorCupomController.lbDatResgateInicial.value=Data Inicial do Resgate
+relatorioDescontoPorCupomController.lbDatResgateFinal.value=Data Final do Resgate
+winFiltroRelatorioDescontoPorCupom.lbEmpresa.value=Empresa
+winFiltroRelatorioDescontoPorCupom.lbPuntoVenta.value=Agência
+
 editarIntComprovantePassagem.MSG.borrarOK = Configuración eliminada correctamente.
 editarIntComprovantePassagem.MSG.borrarPergunta = ¿Eliminar la configuración de integración empresarial?
 editarIntComprovantePassagem.MSG.cadastroExistent = Ya existe una configuración para esta Empresa, Integración y Vía.

web/WEB-INF/i3-label_fr_FR.label

@@ -10156,6 +10156,16 @@ winMovimentacionBilhetesPuntoVenta.puntoventa.label = Ag.
 winMovimentacionBilhetesPuntoVenta.tipoMovimentacion.label = Nature
 
 
+indexController.mniRelatorioDescontoPorCupom.label = Relatório Desconto Por Cupom
+relatorioDescontoPorCupomController.window.title = RELATÓRIO DESCONTO POR CUPOM
+relatorioDescontoPorCupomController.lbDatInicial.value=Data Inicial da Venda
+relatorioDescontoPorCupomController.lbDatFinal.value=Data Final da Venda
+relatorioDescontoPorCupomController.lbDatResgateInicial.value=Data Inicial do Resgate
+relatorioDescontoPorCupomController.lbDatResgateFinal.value=Data Final do Resgate
+winFiltroRelatorioDescontoPorCupom.lbEmpresa.value=Empresa
+winFiltroRelatorioDescontoPorCupom.lbPuntoVenta.value=Agência
+
+
 editarIntComprovantePassagem.MSG.borrarOK = Configuration supprimée avec succès.
 editarIntComprovantePassagem.MSG.borrarPergunta = Supprimer les paramètres d'intégration d'entreprise?
 editarIntComprovantePassagem.MSG.cadastroExistent = Il existe déjà une configuration pour cette Société, Intégration et Via.

web/WEB-INF/i3-label_pt_BR.label

@@ -10158,6 +10158,16 @@ winMovimentacionBilhetesPuntoVenta.origem.label = Origem
 winMovimentacionBilhetesPuntoVenta.puntoventa.label = Ag.
 winMovimentacionBilhetesPuntoVenta.tipoMovimentacion.label = Natureza
 
+
+indexController.mniRelatorioDescontoPorCupom.label = Relatório Desconto Por Cupom
+relatorioDescontoPorCupomController.window.title = RELATÓRIO DESCONTO POR CUPOM
+relatorioDescontoPorCupomController.lbDatInicial.value=Data Inicial da Venda
+relatorioDescontoPorCupomController.lbDatFinal.value=Data Final da Venda
+relatorioDescontoPorCupomController.lbDatResgateInicial.value=Data Inicial do Resgate
+relatorioDescontoPorCupomController.lbDatResgateFinal.value=Data Final do Resgate
+winFiltroRelatorioDescontoPorCupom.lbEmpresa.value=Empresa
+winFiltroRelatorioDescontoPorCupom.lbPuntoVenta.value=Agência
+
 editarIntComprovantePassagem.window.title=Integração Comprovante Passagem
 editarIntComprovantePassagem.empresa= Empresa
 editarIntComprovantePassagem.tipoIntegracao= Tipo Integração

web/gui/relatorios/filtroRelatorioDescontoPorCupom.zul

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?page contentType="text/html;charset=UTF-8"?>
+<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winFiltroRelatorioDescontoPorCupom"?>
+<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
+<zk xmlns="http://www.zkoss.org/2005/zul">
+	<window id="winFiltroRelatorioDescontoPorCupom"
+		apply="${relatorioDescontoPorCupomController}"
+		contentStyle="overflow:auto" height="auto" width="550px"
+		border="normal">
+		<grid fixedLayout="true">
+			<columns>
+				<column width="15%" />
+				<column width="35%" />
+				<column width="15%" />
+				<column width="35%" />
+			</columns>
+			<rows>
+				<row>
+					<label
+						value="${c:l('relatorioDescontoPorCupomController.lbDatInicial.value')}" />
+					<datebox id="datInicial" width="95%"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyDatebox"
+						mold="rounded" lenient="true" constraint="no empty" />
+
+					<label
+						value="${c:l('relatorioDescontoPorCupomController.lbDatFinal.value')}" />
+					<datebox id="datFinal" width="95%"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyDatebox"
+						mold="rounded" lenient="true" constraint="no empty" />
+				</row>
+				<row>
+					<label
+						value="${c:l('relatorioDescontoPorCupomController.lbDatResgateInicial.value')}" />
+					<datebox id="datResgateInicial" width="95%"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyDatebox"
+						mold="rounded" lenient="true" constraint="no empty" />
+
+					<label
+						value="${c:l('relatorioDescontoPorCupomController.lbDatResgateFinal.value')}" />
+					<datebox id="datResgateFinal" width="95%"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyDatebox"
+						mold="rounded" lenient="true" constraint="no empty" />
+				</row>
+				
+				<row >
+					<cell rowspan="2" align="left">
+						<label
+							value="${c:l('winFiltroRelatorioDescontoPorCupom.lbEmpresa.value')}" />
+					</cell>
+					<cell rowspan="2" align="left">
+						<combobox id="cmbEmpresa" mold="rounded"
+							buttonVisible="true"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+							model="@{winFiltroRelatorioDescontoPorCupom$composer.lsEmpresa}" width="95%" />
+							
+					</cell>
+				</row>
+				
+						<row >
+					<cell rowspan="2" align="left">
+						<label
+							value="${c:l('winFiltroRelatorioDescontoPorCupom.lbPuntoVenta.value')}" />
+					</cell>
+					<cell rowspan="2" align="left">
+						<combobox id="cmbPuntoVenta" mold="rounded"
+							buttonVisible="true"
+							use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+							model="@{winFiltroRelatorioDescontoPorCupom$composer.lsPuntoVenta}" width="95%" />
+							
+					</cell>
+				</row>
+
+			</rows>
+		</grid>
+		<toolbar>
+			<button id="btnExecutarRelatorio" image="/gui/img/find.png"
+				label="${c:l('relatorio.lb.btnExecutarRelatorio')}" />
+		</toolbar>
+
+
+	</window>
+</zk>