diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java
index d2f493a11..7483e41eb 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java
@@ -14,15 +14,16 @@ import org.springframework.stereotype.Controller;
 import org.zkoss.util.resource.Labels;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Messagebox;
 
 import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente;
 import com.rjconsultores.ventaboletos.entidad.Ruta;
-import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa;
 import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService;
 import com.rjconsultores.ventaboletos.service.RutaService;
 import com.rjconsultores.ventaboletos.service.TarifaOficialService;
+import com.rjconsultores.ventaboletos.service.TaxaEmbarqueService;
 import com.rjconsultores.ventaboletos.service.VigenciaTarifaService;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 
@@ -44,10 +45,16 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
     private TarifaOficialService tarifaOficialService;
     @Autowired
     private OrgaoConcedenteService orgaoConcedenteService;
+    @Autowired
+    private TaxaEmbarqueService taxaEmbarqueService;
     private List<Ruta> lsRuta;
     private List<OrgaoConcedente> lsOrgaoConcedente;
     private Combobox cmbRuta;
     private Combobox cmbOrgaoConcedente;
+    private Checkbox chkTarifa;
+    private Checkbox chkTaxaEmbarque;
+    private Checkbox chkSeguro;
+    private Checkbox chkPedagio;
 
     @Override
     public void doAfterCompose(Component comp) throws Exception {
@@ -64,14 +71,26 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
 
     	
     	Integer rutaId = null;
+    	Integer orgaoConcedenteId = null;
     	
     	if (cmbRuta.getSelectedItem() != null){
     		rutaId=((Ruta)cmbRuta.getSelectedItem().getValue()).getRutaId();
     	}
     	
-    	Integer qtd = tarifaOficialService.gerarAtualizarTarifaANTT(rutaId);
+    	if (cmbOrgaoConcedente.getSelectedItem() != null){
+    		orgaoConcedenteId=((OrgaoConcedente)cmbOrgaoConcedente.getSelectedItem().getValue()).getOrgaoConcedenteId();
+    	}
     	
-    	Messagebox.show(Labels.getLabel("generarTarifaOrgaoController.MSG.suscribirOK").concat(qtd.toString()),
+    	
+    	if (chkTarifa.isChecked()){
+    		tarifaOficialService.gerarAtualizarTarifaPorCoeficiente(rutaId, orgaoConcedenteId);
+    	}
+    	
+    	if (chkTaxaEmbarque.isChecked()){
+    		taxaEmbarqueService.atualizarTaxaEmbarque(rutaId);
+    	}
+    	
+    	Messagebox.show(Labels.getLabel("generarTarifaOrgaoController.MSG.suscribirOK"),
 				Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"),
 				Messagebox.OK, Messagebox.INFORMATION);
     }
diff --git a/web/gui/tarifas/generarTarifaOrgao.zul b/web/gui/tarifas/generarTarifaOrgao.zul
index 60678a200..2b9cfa5d6 100644
--- a/web/gui/tarifas/generarTarifaOrgao.zul
+++ b/web/gui/tarifas/generarTarifaOrgao.zul
@@ -4,7 +4,7 @@
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winGenerarTarifaOrgao"?>
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
 
-<zk xmlns="http://www.zkoss.org/2005/zul">
+<zk>
 	<window id="winGenerarTarifaOrgao" border="normal" apply="${generarTarifaOrgaoController}" width="400px" height="457x" contentStyle="overflow:auto"
 		title="${c:l('generarTarifaController.window.title')}">
 		<toolbar>
@@ -31,8 +31,17 @@
 					<combobox id="cmbOrgaoConcedente" constraint="no empty" mold="rounded" buttonVisible="true" width="99%"
 						model="@{winGenerarTarifaOrgao$composer.lsOrgaoConcedente}" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"/>
 				</row>
-
+				<row>
+					<label value="${c:l('generarTarifaOrgaoController.labelComponente.value')}" />
+					<vbox>
+						<checkbox id="chkTarifa" label="${c:l('generarTarifaOrgaoController.labelComponenteTarifa.value')}" checked="true"/>
+						<checkbox id="chkTaxaEmbarque" label="${c:l('generarTarifaOrgaoController.labelComponenteTaxaEmbarque.value')}"/>
+						<checkbox id="chkSeguro" label="${c:l('generarTarifaOrgaoController.labelComponenteSeguro.value')}"/>
+						<checkbox id="chkPedagio" label="${c:l('generarTarifaOrgaoController.labelComponentePedagio.value')}"/>
+					</vbox>
+				</row>
 			</rows>
+			
 		</grid>
 	</window>
 </zk>