diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
index 4c3b5b803..c6b949430 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
@@ -36,7 +36,7 @@ public class RelatorioEstoque extends Relatorio {
 					dataResult.put("forminicio", rset.getString("forminicial"));
 					dataResult.put("formfinal", rset.getString("formfinal"));
 					dataResult.put("estado", rset.getString("nombestado"));
-					dataResult.put("descestacion", rset.getString("estacao"));
+					dataResult.put("tipo", rset.getString("tipo"));
 					this.dados.add(dataResult);
 				}
 
@@ -51,13 +51,14 @@ public class RelatorioEstoque extends Relatorio {
 
 	private String getSql() {
 		StringBuilder sql = new StringBuilder();			
-		sql.append(" select dab.aidf_id as aidf, e.nombempresa, p.nombpuntoventa, dab.NUMSERIEPREIMPRESA as serie, es.descestacion as estacao, ");
+		sql.append(" select dab.aidf_id as aidf, e.nombempresa, p.nombpuntoventa, dab.NUMSERIEPREIMPRESA as serie, es.descestacion as estacao, tp.desctipo as tipo, ");
 		sql.append(" case  when dab.STATUSOPERACION = 0 then dab.NUMFOLIOINICIAL else coalesce(fp.FOLIOPREIMPRESO,dab.NUMFOLIOINICIAL) end as forminicial, dab.NUMFOLIOFINAL as formfinal, ");
 		sql.append(" est.nombestado, ar.descarticulo ");
 		sql.append(" from abasto_boleto ab ");
 		sql.append(" inner join empresa e on e.empresa_id = ab.empresa_id and ab.ACTIVO = 1 ");
 		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(" 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 ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jasper
index cfe8a9076..95809d320 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml
index 9af226f8d..83b3c756b 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstoque.jrxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="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="684"/>
+	<property name="ireport.x" value="658"/>
 	<property name="ireport.y" value="0"/>
 	<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"/>
@@ -23,7 +23,7 @@
 	<field name="forminicio" class="java.lang.String"/>
 	<field name="formfinal" class="java.lang.String"/>
 	<field name="estacao" class="java.lang.String"/>
-	<field name="descestacion" class="java.lang.String"/>
+	<field name="tipo" class="java.lang.String"/>
 	<field name="estado" class="java.lang.String"/>
 	<background>
 		<band splitType="Stretch"/>
@@ -31,7 +31,7 @@
 	<pageHeader>
 		<band height="82" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement mode="Transparent" x="0" y="0" width="457" height="41" forecolor="#000000" backcolor="#FFFFFF" uuid="136a5066-d141-4362-af36-0780f0d16542"/>
+				<reportElement uuid="136a5066-d141-4362-af36-0780f0d16542" mode="Transparent" x="0" y="0" width="457" 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"/>
@@ -39,14 +39,14 @@
 				<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="513" y="0" width="185" height="25" uuid="a9d471fb-1e1d-4d9a-9783-bbf988931192"/>
+				<reportElement uuid="a9d471fb-1e1d-4d9a-9783-bbf988931192" x="513" y="0" width="185" height="25"/>
 				<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 mode="Transparent" x="698" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9"/>
+				<reportElement uuid="0d200750-aabf-4c7e-b27b-c0e7af4802a9" mode="Transparent" x="698" 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"/>
@@ -54,10 +54,10 @@
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement x="0" y="57" width="802" height="1" uuid="bbf33a72-515f-42fc-8c79-e859aebca31d"/>
+				<reportElement uuid="bbf33a72-515f-42fc-8c79-e859aebca31d" x="0" y="57" width="802" height="1"/>
 			</line>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement mode="Transparent" x="513" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="bae9bec6-8c42-4bee-a070-34b0a7f1aee4"/>
+				<reportElement uuid="bae9bec6-8c42-4bee-a070-34b0a7f1aee4" mode="Transparent" x="513" 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"/>
@@ -65,7 +65,7 @@
 				<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
-				<reportElement mode="Transparent" x="781" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF" uuid="314e312c-8f24-42de-8354-3c1f7241a985"/>
+				<reportElement uuid="314e312c-8f24-42de-8354-3c1f7241a985" mode="Transparent" x="781" 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"/>
@@ -73,7 +73,7 @@
 				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement mode="Transparent" x="698" y="42" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="4e030613-9cee-443e-9eaa-b19fa3090976"/>
+				<reportElement uuid="4e030613-9cee-443e-9eaa-b19fa3090976" mode="Transparent" x="698" 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"/>
@@ -81,10 +81,10 @@
 				<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement x="0" y="77" width="802" height="1" uuid="6ca45088-a58d-43b3-b196-8fc26e128fbf"/>
+				<reportElement uuid="6ca45088-a58d-43b3-b196-8fc26e128fbf" x="0" y="77" width="802" height="1"/>
 			</line>
 			<textField>
-				<reportElement x="0" y="58" width="803" height="15" uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda"/>
+				<reportElement uuid="b29d0494-2695-420b-bdc1-b13c08bdbcda" x="0" y="58" width="803" height="15"/>
 				<textElement verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
@@ -95,66 +95,66 @@
 	<columnHeader>
 		<band height="35" splitType="Stretch">
 			<line>
-				<reportElement x="1" y="34" width="801" height="1" uuid="a11636cc-5ee1-44cc-8cd1-cbe2ebc47abb"/>
+				<reportElement uuid="a11636cc-5ee1-44cc-8cd1-cbe2ebc47abb" x="1" y="34" width="801" height="1"/>
 			</line>
 			<staticText>
-				<reportElement x="131" y="15" width="139" height="19" uuid="d60cb698-201c-4315-bec2-498effeea474"/>
+				<reportElement uuid="d60cb698-201c-4315-bec2-498effeea474" x="131" y="15" width="139" height="19"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Agência]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="380" y="15" width="77" height="20" uuid="a26b9060-8bd5-4586-af31-e01b0ccf88f9"/>
+				<reportElement uuid="a26b9060-8bd5-4586-af31-e01b0ccf88f9" x="380" y="15" width="77" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[De]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="513" y="15" width="102" height="20" uuid="fcf366c0-0f13-44f7-84de-38ae1122b647"/>
+				<reportElement uuid="fcf366c0-0f13-44f7-84de-38ae1122b647" x="513" y="15" width="102" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Tipo]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="1" y="15" width="130" height="19" uuid="6db7e341-bc01-4843-8be5-fe74d78b7529"/>
+				<reportElement uuid="6db7e341-bc01-4843-8be5-fe74d78b7529" x="1" y="15" width="130" height="19"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Empresa]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="270" y="15" width="65" height="19" uuid="ed0c0a45-151a-400e-a30c-fd8afa88438b"/>
+				<reportElement uuid="ed0c0a45-151a-400e-a30c-fd8afa88438b" x="270" y="15" width="65" height="19"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[AIDF]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="336" y="15" width="44" height="19" uuid="0bc3df3b-544b-4e68-ace9-f725d4541781"/>
+				<reportElement uuid="0bc3df3b-544b-4e68-ace9-f725d4541781" x="336" y="15" width="44" height="19"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Série]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="457" y="15" width="56" height="20" uuid="dbf9b898-7cb2-4271-84f3-32aa65056b5d"/>
+				<reportElement uuid="dbf9b898-7cb2-4271-84f3-32aa65056b5d" x="457" y="15" width="56" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Até]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="615" y="15" width="83" height="20" uuid="ea11f3f2-8b0d-4fc9-a87b-c190b8dab51f"/>
+				<reportElement uuid="ea11f3f2-8b0d-4fc9-a87b-c190b8dab51f" x="615" y="15" width="83" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Estação]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="698" y="15" width="104" height="20" uuid="e8f84740-2a73-4631-a584-349b7c263496"/>
+				<reportElement uuid="e8f84740-2a73-4631-a584-349b7c263496" x="698" y="15" width="104" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10" isBold="true"/>
 				</textElement>
@@ -165,14 +165,14 @@
 	<detail>
 		<band height="22" splitType="Stretch">
 			<textField>
-				<reportElement x="131" y="2" width="139" height="18" uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0"/>
+				<reportElement uuid="c35afacb-b160-4ace-b7be-c2e2f54ac1c0" x="131" y="2" width="139" height="18"/>
 				<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 mode="Transparent" x="380" y="2" width="77" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="3dbaaef7-dae9-402d-89d4-a8055462f563"/>
+				<reportElement uuid="3dbaaef7-dae9-402d-89d4-a8055462f563" mode="Transparent" x="380" y="2" width="77" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
 				<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 +180,28 @@
 				<textFieldExpression><![CDATA[$F{forminicio}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="513" y="2" width="102" height="18" uuid="f1e52aa0-f61d-4c94-bb09-e51cde37f2cc"/>
+				<reportElement uuid="f1e52aa0-f61d-4c94-bb09-e51cde37f2cc" x="513" y="2" width="102" height="18"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{descestacion}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="1" y="2" width="130" height="18" uuid="73582b2a-b21b-4637-990c-aff7423a8e27"/>
+				<reportElement uuid="73582b2a-b21b-4637-990c-aff7423a8e27" x="1" y="2" width="130" height="18"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="false" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement x="270" y="2" width="66" height="18" uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa"/>
+				<reportElement uuid="bfb9d635-bbc1-4e92-890a-df8299bc8daa" x="270" y="2" width="66" height="18"/>
 				<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 mode="Transparent" x="336" y="2" width="44" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3"/>
+				<reportElement uuid="29ae3fa8-9db1-46c8-bcf7-cb9aa7bc6eb3" mode="Transparent" x="336" y="2" width="44" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
 				<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 +209,7 @@
 				<textFieldExpression><![CDATA[$F{serie}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
-				<reportElement mode="Transparent" x="457" y="2" width="56" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="117054b3-9ee6-488b-ae15-0de5362e939e"/>
+				<reportElement uuid="117054b3-9ee6-488b-ae15-0de5362e939e" mode="Transparent" x="457" y="2" width="56" height="18" forecolor="#000000" backcolor="#FFFFFF"/>
 				<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,14 +217,14 @@
 				<textFieldExpression><![CDATA[$F{formfinal}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="615" y="2" width="83" height="18" uuid="a0ee8a4d-39ef-458a-895d-b12b794876d9"/>
+				<reportElement uuid="a0ee8a4d-39ef-458a-895d-b12b794876d9" x="615" y="2" width="83" height="18"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{estacao}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="698" y="2" width="104" height="18" uuid="ecc06a2b-2970-4bd0-abf0-e4f4ad0063fd"/>
+				<reportElement uuid="ecc06a2b-2970-4bd0-abf0-e4f4ad0063fd" x="698" y="2" width="104" height="18"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
@@ -238,7 +238,7 @@
 	<noData>
 		<band height="50">
 			<textField>
-				<reportElement x="1" y="24" width="575" height="26" uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83"/>
+				<reportElement uuid="6f13c961-dd50-4e44-ba73-65e0752b8b83" x="1" y="24" width="575" height="26"/>
 				<textElement markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>