From 380f3ec78cfe509e4ccb1386fc040877c46f5164 Mon Sep 17 00:00:00 2001
From: alberto <alberto@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 13 Jul 2017 13:52:16 +0000
Subject: [PATCH] =?UTF-8?q?Exporta=C3=A7=C3=A3o=20Fiscal=20:=20ECF=20e=20R?=
 =?UTF-8?q?MD=20(issue=208120)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@71322 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../gui/controladores/gr/EditarAidfController.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java
index e6fe29a8c..e848822d5 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java
@@ -205,7 +205,13 @@ public class EditarAidfController extends MyGenericForwardComposer {
 				return;
 			}
 
-			if (!validarDocFiscalEstado(aidf.getAidfId(), txtDocFiscal.getValue(), aidf.getEstado())) {
+			Integer especieId = null;
+			
+			if (aidf.getAidfEspecie() != null) {
+				especieId = aidf.getAidfEspecie().getAidfespId();
+			}
+			
+			if (!validarDocFiscalEstado(aidf.getAidfId(), especieId, txtDocFiscal.getValue(), aidf.getEstado())) {
 				Messagebox.show(
 						Labels.getLabel("editarAidfController.btnSalvar.MSG.conflitoDocFiscalEstado"),
 						Labels.getLabel("editarAidfController.window.title"),
@@ -268,8 +274,8 @@ public class EditarAidfController extends MyGenericForwardComposer {
 
 	}
 
-	private Boolean validarDocFiscalEstado(Long idAidf, String docFiscal, Estado estado) {
-		return aidfService.validarDocFiscalPorEstado(idAidf, docFiscal, estado);
+	private Boolean validarDocFiscalEstado(Long idAidf, Integer especieId, String docFiscal, Estado estado) {
+		return aidfService.validarDocFiscalPorEstado(idAidf, especieId, docFiscal, estado);
 	}
 
 	private Boolean validarTipoVenda(String tipoVenda, String serie, Integer tipo) {