From d12f9e5555d22b5d5c522a9f9fb865ea142fd89c Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 22 Aug 2017 14:41:49 +0000
Subject: [PATCH] fixes bug #9654

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@72793 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../EditarCatalogoDeRutaController.java                   | 1 -
 .../pricing/EditarPricingEspecificoController.java        | 8 +++++---
 web/gui/pricing/editarPricingEspecifico.zul               | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java
index 08d4eb8e0..2f4c5b196 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java
@@ -85,7 +85,6 @@ import com.rjconsultores.ventaboletos.utilerias.DateUtil;
 import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException;
 import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
 import com.rjconsultores.ventaboletos.vo.esquemaoperacional.RutaTramoVO;
-import com.rjconsultores.ventaboletos.vo.esquemaoperacional.SecuenciaRutaTramoVO;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox;
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java
index d54155c51..b7cb02121 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java
@@ -283,7 +283,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 					pricingListEspAgencia.removeItem(pricingEspecificoAgencia);
 					pricingEspecificoADesativarAgencia.add(pricingEspecificoAgencia);
 				} else {
-					pricingListEspOcupacion.removeSelectedItem();
+					pricingListEspAgencia.removeSelectedItem();
 					removerPricingAgencia(pricingEspecificoAgencia);
 				}
 			}
@@ -306,7 +306,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 					pricingListEspCanal.removeItem(pricingEspecificoCanal);
 					pricingEspecificoADesativarCanal.add(pricingEspecificoCanal);
 				} else {
-					pricingListEspOcupacion.removeSelectedItem();
+					pricingListEspCanal.removeSelectedItem();
 					removerPricingCanalVendas(pricingEspecificoCanal);
 				}
 			}
@@ -346,7 +346,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 	}
 	private void removerPricingCanalVendas(PricingEspecificoCanalVendas especificoCanalVendas) {
 		if (especificoCanalVendas.getPricingEspecificoCanalId() != null) {
-			pricingEspecifico.getPricingEspecificoAgenciasList().remove(especificoCanalVendas);
+			pricingEspecifico.getPricingEspecificoCanalVendasList().remove(especificoCanalVendas);
 		} 
 	}
 
@@ -554,6 +554,8 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
 			}
 
 			desativarPricingEspecificoOcupacionDesativados();
+			desativarPricingEspecificoAgenciaDesativados();
+			desativarPricingEspecificoCanalDesativados();
 
 			Messagebox.show(Labels.getLabel("editarPricingController.MSG.suscribirOK"),
 					Labels.getLabel("busquedaPricingEspecificoController.window.title"),
diff --git a/web/gui/pricing/editarPricingEspecifico.zul b/web/gui/pricing/editarPricingEspecifico.zul
index 4d45da1ce..e8f37036e 100644
--- a/web/gui/pricing/editarPricingEspecifico.zul
+++ b/web/gui/pricing/editarPricingEspecifico.zul
@@ -206,6 +206,7 @@
 						</rows>
 					</grid>
 				</tabpanel>
+				<!-- AGENCIA -->
 				<tabpanel>
 					<grid>
 						<rows>
@@ -244,6 +245,7 @@
 						</rows>
 					</grid>
 				</tabpanel>
+				<!-- CANAL DE VENDA -->
 				<tabpanel>
 					<grid>
 						<rows>
@@ -275,7 +277,7 @@
 											<listheader
 												image="/gui/img/create_doc.gif"
 												sort="auto(ocupacioninicial)"
-												label="${c:l('editarPricingEspecificoOcupacionController.agencia.label')}" />
+												label="${c:l('editarPricingController.ptovta.value')}" />
 										</listhead>
 									</listbox>
 								</vbox>