From e6c5a8b4377a9b83d912a49a0b30567b0310c9d9 Mon Sep 17 00:00:00 2001
From: "wallace.henrique" <wallace.henrique@BHN330100022.bh01.local>
Date: Fri, 23 Feb 2024 19:37:29 -0300
Subject: [PATCH] fixes bug#AL-3859

---
 pom.xml                                       |   2 +-
 .../relatorios/impl/RelatorioEstoque.java     |  27 ++++-
 .../templates/RelatorioEstoque.jasper         | Bin 32809 -> 35001 bytes
 .../templates/RelatorioEstoque.jrxml          |  96 ++++++++++++------
 .../RelatorioAidfDetalhadoController.java     |   3 +-
 web/WEB-INF/i3-label_es_MX.label              |  10 +-
 web/WEB-INF/i3-label_pt_BR.label              |   4 +-
 .../filtroRelatorioAidfDetalhado.zul          |  21 +++-
 8 files changed, 114 insertions(+), 49 deletions(-)

diff --git a/pom.xml b/pom.xml
index 975be39ff..6606ec9a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.53.2</version> 
+	<version>1.53.3</version> 
 	<packaging>war</packaging>  
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
index e137d6e65..b241506ce 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
@@ -2,12 +2,15 @@ package com.rjconsultores.ventaboletos.relatorios.impl;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 import com.rjconsultores.ventaboletos.enums.EnumTipoVenda;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
+import com.rjconsultores.ventaboletos.utilerias.DateUtil;
 import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
 public class RelatorioEstoque extends Relatorio {
@@ -22,7 +25,17 @@ public class RelatorioEstoque extends Relatorio {
 				String sql = getSql();
 
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
-
+				Date dtInicio = (Date) parametros.get("DATA_INICIO");
+				Date dtFim = (Date) parametros.get("DATA_FIM");
+				
+				if(dtInicio != null && dtFim != null) {
+					stmt.setString("dataInicio", DateUtil.getStringDate(dtInicio, "dd/MM/yyyy") + " 00:00:00");
+					stmt.setString("dataFinal", DateUtil.getStringDate(dtFim, "dd/MM/yyyy") + " 23:59:59");
+				}else if(dtInicio != null) {
+					stmt.setString("dataInicio", DateUtil.getStringDate(dtInicio, "dd/MM/yyyy") + " 00:00:00");
+				}
+				
+				
 				ResultSet rset = stmt.executeQuery();
 
 				while (rset.next()) {
@@ -55,6 +68,8 @@ public class RelatorioEstoque extends Relatorio {
 						}
 					}
 
+					dataResult.put("dataVencimento", rset.getDate("dataVencimento"));
+					dataResult.put("dataAquicision", rset.getDate("dataAquicision"));
 					dataResult.put("aidf", rset.getString("aidf"));
 					dataResult.put("empresa", rset.getString("nombempresa"));
 					dataResult.put("estacao", rset.getString("estacao"));
@@ -64,6 +79,7 @@ public class RelatorioEstoque extends Relatorio {
 					dataResult.put("formfinal", formfinal);
 					dataResult.put("estado", rset.getString("nombestado"));
 					dataResult.put("tipo", rset.getString("tipo"));
+					
 					this.dados.add(dataResult);
 				}
 
@@ -78,7 +94,7 @@ public class RelatorioEstoque extends Relatorio {
 
 	private String getSql() {
 		StringBuilder sql = new StringBuilder();
-		sql.append("SELECT dab.aidf_id AS aidf, ");
+		sql.append("SELECT ai.fecvencimiento as dataVencimento, ai.fecadquisicion as dataAquicision, dab.aidf_id AS aidf, ");
 		sql.append("	e.nombempresa, ");
 		sql.append("	p.nombpuntoventa, ");
 		sql.append("	dab.NUMSERIEPREIMPRESA AS serie, ");
@@ -116,7 +132,7 @@ public class RelatorioEstoque extends Relatorio {
 		sql.append(" 	INNER JOIN det_abasto_boleto dab ON ( dab.abastoboleto_id = ab.abastoboleto_id and dab.ACTIVO = 1 )");
 		sql.append(" 	INNER JOIN punto_venta p ON ( p.puntoventa_id = ab.puntoventa_id and p.ACTIVO = 1 )");
 		sql.append(" 	LEFT JOIN  TIPO_PTOVTA tp ON ( tp.TIPOPTOVTA_ID = p.TIPOPTOVTA_ID and tp.ACTIVO = 1 )");
-		sql.append(" 	INNER JOIN estacion es ON ( es.ESTACION_ID = ab.ESTACION_ID )");
+		sql.append(" 	LEFT JOIN estacion es ON ( es.ESTACION_ID = ab.ESTACION_ID )");
 		sql.append(" 	INNER JOIN ARTICULO ar ON ( ar.ARTICULO_ID = ab.ARTICULO_ID )");
 		sql.append(" 	LEFT JOIN  FOLIO_PREIMPRESO fp ON ( fp.AIDF_ID = dab.AIDF_ID and fp.EMPRESA_ID = e.EMPRESA_ID and fp.ESTACION_ID = ab.ESTACION_ID and fp.activo = 1 )");
 		sql.append(" 	INNER JOIN aidf ai ON ( ai.aidf_id =dab.aidf_id )");
@@ -130,6 +146,11 @@ public class RelatorioEstoque extends Relatorio {
 		if (parametros.get("NUMPUNTOVENTA") != null) {
 			sql.append(" AND ab.puntoventa_id in(").append(parametros.get("NUMPUNTOVENTA")).append(") ");
 		}
+		if(parametros.get("DATA_INICIO") != null && parametros.get("DATA_FIM") != null) {
+			sql.append(" AND fecadquisicion BETWEEN TO_DATE(:dataInicio,'dd/mm/yyyy hh24:mi:ss') AND TO_DATE(:dataFinal,'dd/mm/yyyy hh24:mi:ss') ");
+		}else if(parametros.get("DATA_INICIO") != null) {
+			sql.append(" AND fecadquisicion >= TO_DATE(:dataInicio,'dd/mm/yyyy hh24:mi:ss') ");
+		}
 		sql.append(" ORDER BY e.nombempresa, p.nombpuntoventa,es.descestacion, ar.descarticulo, forminicial");
 
 		return sql.toString();
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jasper
index 95809d320b480513a571add1045d6a718dce9dd7..b73b1c52b3189318dff7d8575d655533c4dfd1ca 100644
GIT binary patch
literal 35001
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
W_|N3BZ3wYrC01hRW0#6(Nd7;L;?5KR

literal 32809
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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml
index 83b3c756b..612f7b535 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioEstoque" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="/ventaboletosadm/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioAidfDetalhado_es_BR" uuid="c092ef85-9334-4225-93d7-1acb7cf4d021">
-	<property name="ireport.zoom" value="1.6105100000000032"/>
-	<property name="ireport.x" value="658"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.zoom" value="9.849732675807681"/>
+	<property name="ireport.x" value="6655"/>
+	<property name="ireport.y" value="1143"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/>
 	<parameter name="NOME_RELATORIO" class="java.lang.String"/>
@@ -25,13 +25,17 @@
 	<field name="estacao" class="java.lang.String"/>
 	<field name="tipo" class="java.lang.String"/>
 	<field name="estado" class="java.lang.String"/>
+	<field name="dataAquicision" class="java.util.Date">
+		<fieldDescription><![CDATA[fecadquisicionFinal]]></fieldDescription>
+	</field>
+	<field name="dataVencimento" class="java.util.Date"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<pageHeader>
 		<band height="82" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="136a5066-d141-4362-af36-0780f0d16542" mode="Transparent" x="0" y="0" width="457" height="41" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="0" y="0" width="457" height="41" forecolor="#000000" backcolor="#FFFFFF" uuid="136a5066-d141-4362-af36-0780f0d16542"/>
 				<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"/>
@@ -39,14 +43,14 @@
 				<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="a9d471fb-1e1d-4d9a-9783-bbf988931192" x="513" y="0" width="185" height="25"/>
+				<reportElement x="513" y="0" width="185" height="25" uuid="a9d471fb-1e1d-4d9a-9783-bbf988931192"/>
 				<textElement textAlignment="Right">
 					<font size="9" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
-				<reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="698" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="698" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9"/>
 				<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"/>
@@ -54,10 +58,10 @@
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement uuid="bbf33a72-515f-42fc-8c79-e859aebca31d" x="0" y="57" width="802" height="1"/>
+				<reportElement x="0" y="57" width="802" height="1" uuid="bbf33a72-515f-42fc-8c79-e859aebca31d"/>
 			</line>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="bae9bec6-8c42-4bee-a070-34b0a7f1aee4" mode="Transparent" x="513" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="513" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="bae9bec6-8c42-4bee-a070-34b0a7f1aee4"/>
 				<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"/>
@@ -65,7 +69,7 @@
 				<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
-				<reportElement uuid="314e312c-8f24-42de-8354-3c1f7241a985" mode="Transparent" x="781" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="781" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="314e312c-8f24-42de-8354-3c1f7241a985"/>
 				<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"/>
@@ -73,7 +77,7 @@
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="4e030613-9cee-443e-9eaa-b19fa3090976" mode="Transparent" x="698" y="42" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="698" y="42" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4e030613-9cee-443e-9eaa-b19fa3090976"/>
 				<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"/>
@@ -81,10 +85,10 @@
 				<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement uuid="6ca45088-a58d-43b3-b196-8fc26e128fbf" x="0" y="77" width="802" height="1"/>
+				<reportElement x="0" y="77" width="802" height="1" uuid="6ca45088-a58d-43b3-b196-8fc26e128fbf"/>
 			</line>
 			<textField>
-				<reportElement uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda" x="0" y="58" width="803" height="15"/>
+				<reportElement x="0" y="58" width="803" height="15" uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda"/>
 				<textElement verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
@@ -95,84 +99,98 @@
 	<columnHeader>
 		<band height="35" splitType="Stretch">
 			<line>
-				<reportElement uuid="a11636cc-5ee1-44cc-8cd1-cbe2ebc47abb" x="1" y="34" width="801" height="1"/>
+				<reportElement x="1" y="34" width="801" height="1" uuid="a11636cc-5ee1-44cc-8cd1-cbe2ebc47abb"/>
 			</line>
 			<staticText>
-				<reportElement uuid="d60cb698-201c-4315-bec2-498effeea474" x="131" y="15" width="139" height="19"/>
+				<reportElement x="63" y="16" width="85" height="18" uuid="d60cb698-201c-4315-bec2-498effeea474"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Agência]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a26b9060-8bd5-4586-af31-e01b0ccf88f9" x="380" y="15" width="77" height="20"/>
+				<reportElement x="246" y="16" width="49" height="19" uuid="a26b9060-8bd5-4586-af31-e01b0ccf88f9"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[De]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="fcf366c0-0f13-44f7-84de-38ae1122b647" x="513" y="15" width="102" height="20"/>
+				<reportElement x="350" y="16" width="102" height="18" uuid="fcf366c0-0f13-44f7-84de-38ae1122b647"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Tipo]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="6db7e341-bc01-4843-8be5-fe74d78b7529" x="1" y="15" width="130" height="19"/>
+				<reportElement x="1" y="16" width="62" height="18" uuid="6db7e341-bc01-4843-8be5-fe74d78b7529"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Empresa]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ed0c0a45-151a-400e-a30c-fd8afa88438b" x="270" y="15" width="65" height="19"/>
+				<reportElement x="148" y="16" width="55" height="18" uuid="ed0c0a45-151a-400e-a30c-fd8afa88438b"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[AIDF]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="0bc3df3b-544b-4e68-ace9-f725d4541781" x="336" y="15" width="44" height="19"/>
+				<reportElement x="203" y="16" width="43" height="18" uuid="0bc3df3b-544b-4e68-ace9-f725d4541781"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Série]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="dbf9b898-7cb2-4271-84f3-32aa65056b5d" x="457" y="15" width="56" height="20"/>
+				<reportElement x="295" y="16" width="55" height="18" uuid="dbf9b898-7cb2-4271-84f3-32aa65056b5d"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Até]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ea11f3f2-8b0d-4fc9-a87b-c190b8dab51f" x="615" y="15" width="83" height="20"/>
+				<reportElement x="452" y="16" width="83" height="18" uuid="ea11f3f2-8b0d-4fc9-a87b-c190b8dab51f"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Estação]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="e8f84740-2a73-4631-a584-349b7c263496" x="698" y="15" width="104" height="20"/>
+				<reportElement x="535" y="16" width="68" height="18" uuid="e8f84740-2a73-4631-a584-349b7c263496"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Estado]]></text>
 			</staticText>
+			<staticText>
+				<reportElement x="603" y="16" width="104" height="18" uuid="05254957-d41e-4996-8c5d-ccf9786f1f8a"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="10" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Data  Aquisição]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="707" y="16" width="95" height="18" uuid="8ad497bf-a305-41d2-a412-40dd3a7d6b88"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="10" isBold="true"/>
+				</textElement>
+				<text><![CDATA[Data Vencimento ]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="22" splitType="Stretch">
 			<textField>
-				<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" x="131" y="2" width="139" height="18"/>
+				<reportElement x="63" y="2" width="85" height="18" uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="false" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="3dbaaef7-dae9-402d-89d4-a8055462f563" mode="Transparent" x="380" y="2" width="77" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="246" y="2" width="49" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="3dbaaef7-dae9-402d-89d4-a8055462f563"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -180,28 +198,28 @@
 				<textFieldExpression><![CDATA[$F{forminicio}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="f1e52aa0-f61d-4c94-bb09-e51cde37f2cc" x="513" y="2" width="102" height="18"/>
+				<reportElement x="350" y="2" width="102" height="18" uuid="f1e52aa0-f61d-4c94-bb09-e51cde37f2cc"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="73582b2a-b21b-4637-990c-aff7423a8e27" x="1" y="2" width="130" height="18"/>
+				<reportElement x="1" y="2" width="62" height="18" uuid="73582b2a-b21b-4637-990c-aff7423a8e27"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="false" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa" x="270" y="2" width="66" height="18"/>
+				<reportElement x="148" y="2" width="55" height="18" uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="false" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{aidf}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3" mode="Transparent" x="336" y="2" width="44" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="203" y="2" width="43" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -209,7 +227,7 @@
 				<textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="117054b3-9ee6-488b-ae15-0de5362e939e" mode="Transparent" x="457" y="2" width="56" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement mode="Transparent" x="295" y="2" width="55" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="117054b3-9ee6-488b-ae15-0de5362e939e"/>
 				<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -217,19 +235,33 @@
 				<textFieldExpression><![CDATA[$F{formfinal}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="a0ee8a4d-39ef-458a-895d-b12b794876d9" x="615" y="2" width="83" height="18"/>
+				<reportElement x="452" y="2" width="83" height="18" uuid="a0ee8a4d-39ef-458a-895d-b12b794876d9"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{estacao}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="ecc06a2b-2970-4bd0-abf0-e4f4ad0063fd" x="698" y="2" width="104" height="18"/>
+				<reportElement x="535" y="2" width="68" height="18" uuid="ecc06a2b-2970-4bd0-abf0-e4f4ad0063fd"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{estado}]]></textFieldExpression>
 			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement x="603" y="2" width="104" height="18" uuid="3cebea71-ec6a-4b99-a775-ed36a59d94ea"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataAquicision}]]></textFieldExpression>
+			</textField>
+			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement x="707" y="2" width="95" height="18" uuid="efb76809-2760-4e07-abd7-182d252318a0"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{dataVencimento}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>
@@ -238,7 +270,7 @@
 	<noData>
 		<band height="50">
 			<textField>
-				<reportElement uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83" x="1" y="24" width="575" height="26"/>
+				<reportElement x="1" y="24" width="575" height="26" uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83"/>
 				<textElement markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java
index f0cd221e0..792286782 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAidfDetalhadoController.java
@@ -111,7 +111,8 @@ public class RelatorioAidfDetalhadoController extends MyGenericForwardComposer {
 		parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioAidfDetalhadoController.window.title"));
 		parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString());
 		parametros.put("USUARIO_NOME", UsuarioLogado.getUsuarioLogado().getNombusuario());
-		
+		parametros.put("DATA_INICIO", datInicial.getValue());
+		parametros.put("DATA_FIM", datFinal.getValue());
 		filtro.append("Empresa: ");
 		Comboitem itemEmpresa = cmbEmpresa.getSelectedItem();
 		if (itemEmpresa != null) {
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 8f0e600e3..2d0636668 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -1066,14 +1066,14 @@ relatorioAidfController.lbEmpresa.value = Empresa
 relatorioAidfController.lbSerie.value = Série
 
 #Relatorio Aidf Detalhado
-relatorioAidfDetalhadoController.window.title = Relatório Aidf Detalhado
-relatorioAidfDetalhadoController.datainicial.value = Data Inicial
-relatorioAidfDetalhadoController.dataFinal.value = Data Final
+relatorioAidfDetalhadoController.window.title = Relatório Estoque
+relatorioAidfDetalhadoController.datainicial.value = Data Inicial Aquisição
+relatorioAidfDetalhadoController.dataFinal.value = Data Final Aquisição
 relatorioAidfDetalhadoController.lbEmpresa.value = Empresa
-relatorioAidfDetalhadoController.lbSerie.value = Série
-relatorioAidfDetalhadoController.lbAidf.value = AIDF
+relatorioAidfDetalhadoController.lbAidf.value = AIDF/Série/SubSerie
 relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial
 relatorioAidfDetalhadoController.lbFormFinal.value = Form. Final
+relatorioAidfDetalhadoController.msg.agencia.obrigatorio = Uma Agência deve ser selecionada
 
 #Relatório de Vendas PTA
 relatorioVendasPTAController.window.title = Reporte de Ventas PTA
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 0582c3505..d22f0ebcb 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -1213,8 +1213,8 @@ relatorioAidfController.lbSerie.value = Série
 
 #Relatorio Aidf Detalhado
 relatorioAidfDetalhadoController.window.title = Relatório Estoque
-relatorioAidfDetalhadoController.datainicial.value = Data Inicial
-relatorioAidfDetalhadoController.dataFinal.value = Data Final
+relatorioAidfDetalhadoController.datainicial.value = Data Inicial Aquisição
+relatorioAidfDetalhadoController.dataFinal.value = Data Final Aquisição
 relatorioAidfDetalhadoController.lbEmpresa.value = Empresa
 relatorioAidfDetalhadoController.lbAidf.value = AIDF/Série/SubSerie
 relatorioAidfDetalhadoController.lbFormInicial.value = Form. Inicial
diff --git a/web/gui/relatorios/filtroRelatorioAidfDetalhado.zul b/web/gui/relatorios/filtroRelatorioAidfDetalhado.zul
index 441270bdd..591bea194 100644
--- a/web/gui/relatorios/filtroRelatorioAidfDetalhado.zul
+++ b/web/gui/relatorios/filtroRelatorioAidfDetalhado.zul
@@ -7,15 +7,25 @@
 <zk xmlns="http://www.zkoss.org/2005/zul">
 	<window id="winFiltroRelatorioAidfDetalhado" apply="${relatorioAidfDetalhadoController}" 
 		 contentStyle="overflow:auto"
-		height="280px" width="538px" border="normal">
+		height="300px" width="738px" border="normal">
 			<grid fixedLayout="true">
 			<columns>
 				<column width="25%" />
-				<column width="30%" />
-				<column width="15%" />
-				<column width="30%" />
+				<column width="25%" />
+				<column width="25%" />
+				<column width="25%" />
 			</columns>
-			<rows>					
+			<rows>	
+				<row>
+					<label
+						value="${c:l('relatorioAidfDetalhadoController.datainicial.value')}" />
+					<datebox id="datInicial" width="90%"
+						format="dd/MM/yyyy" maxlength="10" />
+					<label
+						value="${c:l('relatorioAidfDetalhadoController.dataFinal.value')}" />
+					<datebox id="datFinal" width="90%"
+						format="dd/MM/yyyy"  maxlength="10" />
+				</row>					
 				<row spans="1,3">
 					<label
 						value="${c:l('relatorioAidfDetalhadoController.lbEmpresa.value')}" />
@@ -80,6 +90,7 @@
 					</listbox>
 					<paging id="pagingSelPuntoVenta" pageSize="10" />
 				</row>
+
 			</rows>
 		</grid>
 		<toolbar>