diff --git a/pom.xml b/pom.xml
index a8775751a..bd6b5cd58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.7.14</version>
+	<version>1.7.15</version>
 	<packaging>war</packaging>
   
 	<properties>
 		<modelWeb.version>1.5.3</modelWeb.version>
-		<flyway.version>1.4.1</flyway.version>
+		<flyway.version>1.4.2</flyway.version>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
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 e8604240f..00cd1f52a 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
@@ -1807,7 +1807,9 @@ public class EditarPricingController extends PricingController {
 		Map args = new HashMap();
 		args.put("pricingMercado", pMercado);
 		args.put("pricingMercadoList", pricingMercadoList);
-		//args.put("lsPricingMercado", lsPricingMercado);
+
+		args.put("lsPricingConexao", lsPricingConexao);
+		args.put("pricingRutaList", pricingRutaList);
 
 		openWindowPosi("/gui/pricing/editarPricingMercado.zul",
 				Labels.getLabel("editarPricingController.windowMercado.title"), args, MODAL, "center,top");
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMercadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMercadoController.java
index 0349b663b..1a7ea9617 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMercadoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMercadoController.java
@@ -4,20 +4,13 @@
  */
 package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
 
-import com.rjconsultores.ventaboletos.entidad.Parada;
-import com.rjconsultores.ventaboletos.entidad.Pricing;
-import com.rjconsultores.ventaboletos.entidad.PricingMercado;
-import com.rjconsultores.ventaboletos.service.ParadaService;
-import com.rjconsultores.ventaboletos.service.PricingMercadoService;
-import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
-import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
-import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 import java.util.Calendar;
+import java.util.List;
+
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
-import java.util.List;
 import org.zkoss.util.resource.Labels;
 import org.zkoss.zhtml.Messagebox;
 import org.zkoss.zk.ui.Component;
@@ -25,6 +18,17 @@ import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Combobox;
 
+import com.rjconsultores.ventaboletos.entidad.Parada;
+import com.rjconsultores.ventaboletos.entidad.Pricing;
+import com.rjconsultores.ventaboletos.entidad.PricingConexao;
+import com.rjconsultores.ventaboletos.entidad.PricingMercado;
+import com.rjconsultores.ventaboletos.entidad.PricingRuta;
+import com.rjconsultores.ventaboletos.service.ParadaService;
+import com.rjconsultores.ventaboletos.service.PricingMercadoService;
+import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
+import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
+import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
+
 /**
  * 
  * @author Rafius
@@ -43,12 +47,18 @@ public class EditarPricingMercadoController extends MyGenericForwardComposer {
 	private Combobox cmbOrigen;
 	private Combobox cmbDestino;
 	private static Logger log = Logger.getLogger(EditarPricingMercadoController.class);
+	
+	private List<PricingConexao> lsPricingConexao;
+	private MyListbox pricingRutaList;
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
 
 		pricingMercado = (PricingMercado) Executions.getCurrent().getArg().get("pricingMercado");
 		pricingMercadoList = (MyListbox) Executions.getCurrent().getArg().get("pricingMercadoList");
+		
+		lsPricingConexao = (List<PricingConexao>) Executions.getCurrent().getArg().get("lsPricingConexao");
+		pricingRutaList = (MyListbox) Executions.getCurrent().getArg().get("pricingRutaList");
 
 		super.doAfterCompose(comp);
 
@@ -101,6 +111,18 @@ public class EditarPricingMercadoController extends MyGenericForwardComposer {
 							Labels.getLabel("editarPricingController.windowMercado.title"),
 							Messagebox.OK, Messagebox.EXCLAMATION);
 				} else {
+					String TODAS = "TODAS";	
+					Boolean contemTodas = origen.getDescparada().equals(TODAS) || destino.getDescparada().equals(TODAS);
+					
+					//Quando existe pricing conexao permite cadastrar linha e trecho todas
+					if ( (lsPricingConexao == null || lsPricingConexao.isEmpty()) && verificarContemTodasRuta() && contemTodas) {
+						Messagebox.show(
+								Labels.getLabel("editarPricingController.MSG.noRutaTodasYTrechosTodos"),
+								Labels.getLabel("editarPricingController.window.title"),
+								Messagebox.OK, Messagebox.EXCLAMATION);
+						return;
+					}
+					
 					Boolean existe =
 							pricingMercadoService.obtenerPricingMercado(pricingMercado.getPricing(),
 									origen, destino);
@@ -168,6 +190,17 @@ public class EditarPricingMercadoController extends MyGenericForwardComposer {
 					Messagebox.OK, Messagebox.EXCLAMATION);
 		}
 	}
+	
+	private boolean verificarContemTodasRuta() {
+		Integer rutaIdTodas = -1;	
+		for(int i = 0; i < pricingRutaList.getModel().getSize(); i++ ){
+			PricingRuta princingRuta = (PricingRuta) pricingRutaList.getModel().getElementAt(i);
+			if(princingRuta.getRuta().getRutaId() == rutaIdTodas){
+				return true;
+			}					
+		}		
+		return false;
+	}
 
 	public void onClick$btnRemoverMercado(Event ev) {
 		try {