From da9d9544dc59005552489c35effb83f8d8e071ae Mon Sep 17 00:00:00 2001
From: celio <celio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 23 Sep 2021 12:04:20 +0000
Subject: [PATCH] fixes bug#23027 dev: VALDEVIR qua: Juliane

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@108806 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../ventaboletos/relatorios/impl/RelatorioEstoque.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
index 4d666db7c..178d57402 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
@@ -28,7 +28,8 @@ public class RelatorioEstoque extends Relatorio {
 				while (rset.next()) {
 					Map<String, Object> dataResult = new HashMap<String, Object>();
 
-					String formInicio = rset.getString("tipoVenta").equals(EnumTipoVenda.TPV_MANUAL.getId().toString()) ? rset.getString("ultimoFolioCaja") : rset.getString("forminicial");
+					String formInicio = rset.getString("tipoVenta").equals(EnumTipoVenda.TPV_MANUAL.getId().toString()) ? 
+							(rset.getString("ultimoFolioCaja") != null ? rset.getString("ultimoFolioCaja") : rset.getString("forminicial")) : rset.getString("forminicial");
 
 					dataResult.put("aidf", rset.getString("aidf"));
 					dataResult.put("empresa", rset.getString("nombempresa"));