From 3e9a4faabf435ec580881f829bfa484ea736c401 Mon Sep 17 00:00:00 2001
From: "igor.rodrigo" <igor.rodrigo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 30 Jul 2015 19:08:49 +0000
Subject: [PATCH] fixes bug 6517

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@46463 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../pricing/EditarPricingController.java          | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
index 38546e61c..fbd96adda 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
@@ -860,7 +860,8 @@ public class EditarPricingController extends MyGenericForwardComposer {
 					Messagebox.OK, Messagebox.INFORMATION);
 			return false;
 		}
-		if (pricingRutaList.getModel().getSize() == 0) {
+				
+		if (pricingRutaList.getModel().getSize() == 0 && verificarContemTodas()) {		
 			Messagebox.show(
 					Labels.getLabel("editarPricingController.MSG.rutaVazio"),
 					Labels.getLabel("editarPricingController.window.title"),
@@ -894,6 +895,17 @@ public class EditarPricingController extends MyGenericForwardComposer {
 		return true;
 	}
 
+	private Boolean verificarContemTodas() {
+		String TODAS = "TODAS";		
+		for(int i = 0; i < pricingMercadoList.getModel().getSize(); i++ ){
+			PricingMercado princingMercado  = (PricingMercado) pricingMercadoList.getModel().getElementAt(i);
+			if(princingMercado.getOrigen().getDescparada().equals(TODAS) || princingMercado.getDestino().getDescparada().equals(TODAS)){
+				return true;
+			}					
+		}		
+		return false;
+	}
+
 	@SuppressWarnings("unchecked")
 	public void onClick$btnSalvar(Event ev) throws InterruptedException {
 		if (!validarObligatorios()) {
@@ -1677,6 +1689,7 @@ public class EditarPricingController extends MyGenericForwardComposer {
 		Map args = new HashMap();
 		args.put("pricingMercado", pMercado);
 		args.put("pricingMercadoList", pricingMercadoList);
+		//args.put("lsPricingMercado", lsPricingMercado);
 
 		openWindowPosi("/gui/pricing/editarPricingMercado.zul",
 				Labels.getLabel("editarPricingController.windowMercado.title"), args, MODAL, "center,top");