campo multa relatorio devolução fixes bug#AL-4023' (!493) from AL-4023 into master

Reviewed-on: adm/VentaBoletosAdm#493
Reviewed-by: pinheiro <valdevir@rjconsultores.com.br>

pom.xml

@@ -4,13 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.68.0</version> 
+	<version>1.68.1</version> 
 	<packaging>war</packaging>  
   
 	<properties>
-		<modelWeb.version>1.51.0</modelWeb.version>
+		<modelWeb.version>1.51.1</modelWeb.version>
 		<flyway.version>1.40.0</flyway.version>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesAnalitico.java

@@ -100,6 +100,7 @@ public class RelatorioDevolucaoBilhetesAnalitico extends Relatorio {
 					db.setNombpuntoventa((String) rset.getObject("NOMBPUNTOVENTA"));
 					db.setPrecioBase((BigDecimal) rset.getObject("PRECIOBASE"));
 					db.setPrecioPagado((BigDecimal) rset.getObject("PRECIOPAGADO"));
+					db.setMulta((BigDecimal) rset.getObject("MULTA"));
 					
 					lsDev.add(db);
 				}
@@ -126,7 +127,8 @@ public class RelatorioDevolucaoBilhetesAnalitico extends Relatorio {
 		sql.append("  coalesce(b.numfoliosistema, b.numoperacion) AS numfoliosistema, ");
 		sql.append("  est.cveestado AS uf, ");
 		sql.append("  b.preciobase AS preciobase, ");
-		sql.append("  b.preciopagado AS preciopagado ");
+		sql.append("  b.preciopagado AS preciopagado, ");		
+		sql.append("  sum( coalesce(EE.IMPINGRESO,0)) as multa ");
 		sql.append("FROM BOLETO B ");
 		sql.append("INNER JOIN MARCA M ON M.MARCA_ID = B.MARCA_ID AND M.ACTIVO = 1 ");
 		sql.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ");
@@ -137,6 +139,7 @@ public class RelatorioDevolucaoBilhetesAnalitico extends Relatorio {
 		sql.append("INNER JOIN CIUDAD CD ON (CD.CIUDAD_ID = DES.CIUDAD_ID ) ");
 		sql.append("INNER JOIN ESTADO EST ON EST.ESTADO_ID = CO.ESTADO_ID ");
 		sql.append("LEFT JOIN BOLETO BORI ON BORI.BOLETO_ID = B.BOLETOORIGINAL_ID ");
+		sql.append("LEFT JOIN evento_extra ee on b.boletooriginal_id = ee.boleto_id ");
 		sql.append("WHERE B.MOTIVOCANCELACION_ID IN (31,32,10,37,99,36) ");
 		sql.append("AND B.INDSTATUSBOLETO = 'C' ");
 		sql.append("AND B.INDCANCELACION = 1 ");
@@ -166,6 +169,18 @@ public class RelatorioDevolucaoBilhetesAnalitico extends Relatorio {
 		sql.append(puntoVentas == null ? "" : "AND PTV.PUNTOVENTA_ID IN (" + puntoVentas + ") ");
 		sql.append(empresaId == null ? "" : "AND E.EMPRESA_ID IN (" + empresaId + ") ");
 		
+		sql.append(" GROUP BY ");
+		sql.append("   e.nombempresa, ");
+		sql.append("   e.empresa_id, ");
+		sql.append("   ptv.numpuntoventa, ");
+		sql.append("   ptv.nombpuntoventa, ");
+		sql.append("   bori.fechorventa, ");
+		sql.append("   b.fechorventa, ");
+		sql.append("   coalesce(b.numfoliosistema, b.numoperacion), ");
+		sql.append("   est.cveestado, ");
+		sql.append("   b.preciobase, ");
+		sql.append("   b.preciopagado ");
+
 		sql.append("ORDER BY NOMB_EMPRESA, FECHOR_VENTA ");
 
 		return sql.toString();

src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetesAnalitico.jrxml

@@ -37,7 +37,7 @@
 		<![CDATA[]]>
 	</queryString>
 	<field name="precioPagado" class="java.math.BigDecimal"/>
-	<field name="precioBase" class="java.math.BigDecimal"/>
+	<field name="multa" class="java.math.BigDecimal"/>
 	<field name="uf" class="java.lang.String"/>
 	<field name="fecVenta" class="java.util.Date"/>
 	<field name="fecDevolucao" class="java.util.Date"/>
@@ -47,13 +47,13 @@
 	<field name="numpuntoventa" class="java.lang.String"/>
 	<field name="nombpuntoventa" class="java.lang.String"/>
 	<variable name="totalTarifa" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{precioBase}]]></variableExpression>
+		<variableExpression><![CDATA[$F{precioPagado}]]></variableExpression>
 	</variable>
 	<variable name="totalMulta" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum">
-		<variableExpression><![CDATA[$V{totalTarifa}.subtract( $V{totalDevolvido} )]]></variableExpression>
+		<variableExpression><![CDATA[$F{multa}]]></variableExpression>
 	</variable>
 	<variable name="totalDevolvido" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum">
-		<variableExpression><![CDATA[$F{precioPagado}]]></variableExpression>
+		<variableExpression><![CDATA[$V{totalTarifa}.subtract( $V{totalMulta} )]]></variableExpression>
 		<initialValueExpression><![CDATA[]]></initialValueExpression>
 	</variable>
 	<group name="empresa">
@@ -152,7 +152,7 @@
 	<pageHeader>
 		<band height="77" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="2ed4524d-5c06-487c-a8f1-abc59a8ef7fc" mode="Transparent" x="1" y="1" width="577" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="2ed4524d-5c06-487c-a8f1-abc59a8ef7fc" mode="Transparent" x="1" y="1" width="580" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -254,7 +254,7 @@
 				<textFieldExpression><![CDATA[$P{dataDevolucaoInicial}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="d0446296-1d50-4558-92a4-34148b90576d" mode="Transparent" x="603" y="33" width="199" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="d0446296-1d50-4558-92a4-34148b90576d" mode="Transparent" x="581" y="33" width="221" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -262,7 +262,7 @@
 				<textFieldExpression><![CDATA[$R{label.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement uuid="88758926-3726-42c1-8aa5-32889c8a0d35" mode="Transparent" x="603" y="17" width="175" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="88758926-3726-42c1-8aa5-32889c8a0d35" mode="Transparent" x="581" y="17" width="197" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
 					<font fontName="SansSerif" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -278,7 +278,7 @@
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="c11c9c4a-b95e-4f81-8f4b-21ef9c6e7f48" x="603" y="1" width="82" height="15"/>
+				<reportElement uuid="c11c9c4a-b95e-4f81-8f4b-21ef9c6e7f48" x="581" y="1" width="104" height="15"/>
 				<textElement textAlignment="Right">
 					<font isBold="true"/>
 				</textElement>
@@ -296,7 +296,7 @@
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement uuid="b14dbaab-e9a1-4aae-a12c-6305da9d2f80" x="581" y="1" width="80" height="14"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[$F{precioBase}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{precioPagado}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
 				<reportElement uuid="a1bcec7c-0ca6-4f9f-a4c7-9757842b1b4f" x="470" y="1" width="111" height="14"/>
@@ -306,7 +306,7 @@
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement uuid="6772d6a9-3611-4cb6-9c3b-f78dc3fb5dc0" x="661" y="1" width="70" height="14"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[$F{precioBase}.subtract( $F{precioPagado} )]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{multa}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="74a5a183-6fe2-4f22-8b51-b54197aa3582" x="1" y="0" width="67" height="14"/>
@@ -342,7 +342,7 @@
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement uuid="2e695dbc-5d39-4bd1-a210-29e726b4cf12" x="731" y="1" width="70" height="14"/>
 				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA[$F{precioPagado}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{precioPagado}.subtract( $F{multa} )]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
@@ -359,12 +359,12 @@
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement uuid="5bb73e4d-a51b-4a04-bed0-8fa3eb7f8553" stretchType="RelativeToTallestObject" x="661" y="2" width="70" height="14"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$V{totalTarifa}.subtract( $V{totalDevolvido} )]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$V{totalMulta}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement uuid="7c3ce565-f549-48d2-815d-9b4d7a39b1ca" stretchType="RelativeToTallestObject" x="731" y="1" width="70" height="14"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$V{totalDevolvido}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$V{totalTarifa}.subtract( $V{totalMulta} )]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement uuid="80bddbda-0eec-4839-9510-35800aa6d742" stretchType="RelativeToTallestObject" x="581" y="2" width="80" height="14"/>

src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DevolucaoBilhetes.java

@@ -62,6 +62,7 @@ public class DevolucaoBilhetes {
 	private BigDecimal baseCalculoIcms;
 
 	private BigDecimal aliquota;
+	private BigDecimal multa;
 	private BigDecimal valorOutras;
 
 	private String cmunini;
@@ -843,4 +844,12 @@ public class DevolucaoBilhetes {
 		this.fecDevolucao = fecDevolucao;
 	}
 
+	public BigDecimal getMulta() {
+		return multa;
+	}
+
+	public void setMulta(BigDecimal multa) {
+		this.multa = multa;
+	}
+
 }

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/BusquedaAliasClasseController.java

@@ -44,7 +44,7 @@ public class BusquedaAliasClasseController extends MyGenericForwardComposer {
 	private List<OrgaoConcedente> lsOrgaoConcedente;
 	
 	private MyListbox aliasServicoList;
-	private Paging pagingAliasServico;
+	private Paging pagingAliasClasse;
 	
 	private MyComboboxEstandar cmbClasse;
 	private MyComboboxEstandar cmbAlias;
@@ -55,7 +55,7 @@ public class BusquedaAliasClasseController extends MyGenericForwardComposer {
 		
 		super.doAfterCompose(comp);
 		
-		lsClasse = claseServicioService.obtenerTodos();
+		lsClasse = claseServicioService.buscarTodosExceto(-1);
 		lsOrgaoConcedente = orgaoConcedenteService.obtenerTodos();
 /*
 		aliasServicoList.setItemRenderer(new RenderAliasServico());

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarAliasClasseController.java

@@ -0,0 +1,149 @@
+package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Controller;
+import org.zkoss.util.resource.Labels;
+import org.zkoss.zhtml.Messagebox;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.event.Event;
+
+import com.rjconsultores.ventaboletos.entidad.AliasServico;
+import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
+import com.rjconsultores.ventaboletos.entidad.Empresa;
+import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente;
+import com.rjconsultores.ventaboletos.exception.BusinessException;
+import com.rjconsultores.ventaboletos.service.AliasServicoService;
+import com.rjconsultores.ventaboletos.service.ClaseServicioService;
+import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService;
+import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
+import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
+import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
+import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
+
+@Controller("editarAliasClasseController")
+@Scope("prototype")
+public class EditarAliasClasseController extends MyGenericForwardComposer {
+
+	private static final String TITULO = "editarAliasClasseController.window.title";
+	private static final long serialVersionUID = 1L;
+	@Autowired
+	private AliasServicoService aliasClasseService;
+	@Autowired
+	private ClaseServicioService claseServicioService;
+	@Autowired
+	private OrgaoConcedenteService orgaoConcedenteService;
+
+	private AliasServico aliasClasse;
+	private MyListbox aliasClasseList;
+	
+	private List<ClaseServicio> lsClasse;
+	private List<OrgaoConcedente> lsOrgaoConcedente;
+	
+	private MyComboboxEstandar cmbClasse;
+	private MyComboboxEstandar cmbAlias;
+	private MyComboboxEstandar cmbOrgaoConcedente;
+	
+
+	@Override
+	public void doAfterCompose(Component comp) throws Exception {
+		List<Empresa> lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa();
+		List<ClaseServicio> lsClasse = claseServicioService.buscarTodosExceto(-1);
+		setLsOrgaoConcedente(orgaoConcedenteService.obtenerTodos());
+		
+		super.doAfterCompose(comp);
+		
+		AliasServico aliasClasse = (AliasServico) Executions.getCurrent().getArg().get("aliasClasse");
+		aliasClasseList = (MyListbox) Executions.getCurrent().getArg().get("aliasClasseList");
+	}
+
+	public void onClick$btnSalvar(Event ev) throws InterruptedException {
+		
+		try {
+			
+			aliasClasseService.suscribirActualizar(aliasClasse);
+			aliasClasseList.updateItem(aliasClasse);
+
+			Messagebox.show(
+					Labels.getLabel("editarAliasClasseController.MSG.suscribirOK"),
+					Labels.getLabel(TITULO),
+					Messagebox.OK, Messagebox.INFORMATION);
+
+			closeWindow();
+		} catch (BusinessException ex) {
+			Messagebox.show(
+					ex.getMessage(),
+					Labels.getLabel(TITULO),
+					Messagebox.OK, Messagebox.ERROR);
+		} catch (Exception ex) {
+			Messagebox.show(
+						Labels.getLabel("MSG.Error"),
+						Labels.getLabel(TITULO),
+						Messagebox.OK, Messagebox.ERROR);
+		}
+	}
+
+	public void onClick$btnApagar(Event ev) throws InterruptedException {
+		Integer resp = Messagebox.show(
+					Labels.getLabel("editarAliasClasseController.MSG.borrarPergunta"),
+					Labels.getLabel(TITULO),
+					Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
+
+		if (resp == Messagebox.YES) {
+
+			aliasClasseService.borrar(aliasClasse);
+
+			Messagebox.show(
+						Labels.getLabel("editarAliasClasseController.MSG.borrarOK"),
+						Labels.getLabel(TITULO),
+						Messagebox.OK, Messagebox.INFORMATION);
+
+			aliasClasseList.removeItem(aliasClasse);
+
+			closeWindow();
+		}
+	}
+
+	public List<ClaseServicio> getLsClasse() {
+		return lsClasse;
+	}
+
+	public void setLsClasse(List<ClaseServicio> lsClasse) {
+		this.lsClasse = lsClasse;
+	}
+
+	public List<OrgaoConcedente> getLsOrgaoConcedente() {
+		return lsOrgaoConcedente;
+	}
+
+	public void setLsOrgaoConcedente(List<OrgaoConcedente> lsOrgaoConcedente) {
+		this.lsOrgaoConcedente = lsOrgaoConcedente;
+	}
+
+	public MyComboboxEstandar getCmbClasse() {
+		return cmbClasse;
+	}
+
+	public void setCmbClasse(MyComboboxEstandar cmbClasse) {
+		this.cmbClasse = cmbClasse;
+	}
+
+	public MyComboboxEstandar getCmbAlias() {
+		return cmbAlias;
+	}
+
+	public void setCmbAlias(MyComboboxEstandar cmbAlias) {
+		this.cmbAlias = cmbAlias;
+	}
+
+	public MyComboboxEstandar getCmbOrgaoConcedente() {
+		return cmbOrgaoConcedente;
+	}
+
+	public void setCmbOrgaoConcedente(MyComboboxEstandar cmbOrgaoConcedente) {
+		this.cmbOrgaoConcedente = cmbOrgaoConcedente;
+	}
+}

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarAliasServicoController.java

@@ -1,4 +1,4 @@
-package com.rjconsultores.ventaboletos.web.utilerias.menu.item.esquemaoperacional;
+package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional;
 
 import java.util.List;
 

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingDiaController.java

@@ -192,7 +192,7 @@ public class EditarGP_PricingDiaController extends MyGenericForwardComposer {
 		}
 
 		if (!rdLun.isChecked() && !rdMar.isChecked() && !rdMie.isChecked() && !rdJue.isChecked() && !rdVie.isChecked() && !rdSab.isChecked() && !rdDom.isChecked()) {
-			Clients.alert(Labels.getLabel("EditarPricingDiaController.MSG.obligatorioDia"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.EXCLAMATION);
+			Clients.alert(Labels.getLabel("editarPricingDiaController.MSG.obligatorioDia"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.EXCLAMATION);
 			return;
 		}
 		try {

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/EditarManutencaoPacoteController.java

@@ -175,7 +175,7 @@ public class EditarManutencaoPacoteController extends MyGenericForwardComposer {
     		args.put("relatorio", relatorio);
 
     		openWindow("/component/reportView.zul",
-    				   Labels.getLabel("RelatorioVendaPacoteVoucher.window.title"), args, MODAL);
+    				   Labels.getLabel("relatorioVendaPacoteVoucher.window.title"), args, MODAL);
     	} catch (Exception ex) {
             log.error(ex);
         }

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java

@@ -200,7 +200,7 @@ public class EditarPricingDiaController extends MyGenericForwardComposer {
 		}
 
 		if (!rdLun.isChecked() && !rdMar.isChecked() && !rdMie.isChecked() && !rdJue.isChecked() && !rdVie.isChecked() && !rdSab.isChecked() && !rdDom.isChecked()) {
-			Clients.alert(Labels.getLabel("EditarPricingDiaController.MSG.obligatorioDia"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.EXCLAMATION);
+			Clients.alert(Labels.getLabel("editarPricingDiaController.MSG.obligatorioDia"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.EXCLAMATION);
 			return;
 		}
 		try {

web/gui/esquema_operacional/busquedaAliasClasse.zul

@@ -8,7 +8,7 @@
 	<window id="winBusquedaAliasClasse"
 		title="${c:l('busquedaAliasClasseController.window.title')}"
 		apply="${busquedaAliasClasseController}" contentStyle="overflow:auto"
-		height="500px" width="1100px" border="normal">
+		height="500px" width="600px" border="normal">
 		<toolbar>
 			<button id="btnRefresh" image="/gui/img/refresh.png"
 				width="35px"
@@ -25,26 +25,32 @@
 
 		<grid fixedLayout="true">
 			<columns>
-				<column width="15%" />
+				<column width="30%" />
-				<column width="85%" />
+				<column width="70%" />
 			</columns>
 			<rows>
 			<row >
-                    <label value="${c:l('busquedaAliasClasseController.lhClaseservicio.label')}"/>
+					<label
+						value="${c:l('busquedaCatalogoDeRutaController.lhDesc.label')} AAAA" />
+					<textbox id="txtNombre" width="95%" maxlength="30"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
+				</row>
+				<row>
+                    <label value="${c:l('label.classe')}"/>
                     <combobox id="cmbClasse" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" 
-                    model="@{winBusquedaAliasClasseController$composer.lsClasse}"
+                    model="@{winBusquedaAliasClasse$composer.lsClasse}"
                     mold="rounded" buttonVisible="true" width="90%" />
                 </row>
                 <row>
-                    <label value="${c:l('busquedaAliasClasseController.lhClaseservicio.label')}"/>
+                    <label value="${c:l('label.alias')}"/>
                     <combobox id="cmbAlias" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-                        model="@{winBusquedaAliasClasseController.lsClasse}"
+                        model="@{winBusquedaAliasClasse.lsClasse}"
                         mold="rounded" buttonVisible="true" width="90%"/>                    
                 </row>
                 <row>
-					<label value="${c:l('editarEmpresaController.lblOrgaoConcedenteIntegracao.value')}" />
+					<label value="${c:l('label.orgaoConcedente')}" />
 					<combobox id="cmbOrgaoConcedente" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-						model="@{winBusquedaAliasClasseController.lsOrgaoConcedente}" 
+						model="@{winBusquedaAliasClasse.lsOrgaoConcedente}" 
 						mold="rounded" buttonVisible="true" width="90%" />
 				</row>
 				

web/gui/esquema_operacional/editarAliasClasse.zul

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?page contentType="text/html;charset=UTF-8"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
-<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winEditarAliasServico"?>
+<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" arg0="winEditarAliasClasse"?>
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
 
 <zk xmlns="http://www.zkoss.org/2005/zul">
@@ -31,21 +31,22 @@
 			</columns>
 			<rows>
 				<row>
-                    <label value="${c:l('busquedaAliasClasseController.lhClaseservicio.label')}"/>
+                    <label value="${c:l('label.classe')}"/>
-                    <combobox id="cmbClasse" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" 
+                    <combobox id="cmbClasse" 
-                    	model="@{editarAliasClasseController$composer.lsClasse}"
+                    	use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" 
+                    	model="@{winEditarAliasClasse$composer.lsClasse}"
                     	constraint="no empty" mold="rounded" buttonVisible="true" width="90%" />
                 </row>
                 <row>
-                    <label value="${c:l('busquedaAliasClasseController.lhClaseservicio.label')}"/>
+                    <label value="${c:l('label.alias')}"/>
                     <combobox id="cmbAlias" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-                        model="@{editarAliasClasseController.lsClasse}"
+                        model="@{winEditarAliasClasse.lsClasse}"
                         constraint="no empty" mold="rounded" buttonVisible="true" width="90%"/>                    
                 </row>
                 <row>
-					<label value="${c:l('editarEmpresaController.lblOrgaoConcedenteIntegracao.value')}" />
+					<label value="${c:l('label.orgaoConcedente')}" />
 					<combobox id="cmbOrgaoConcedente" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-						model="@{editarAliasClasseController.lsOrgaoConcedente}" 
+						model="@{winEditarAliasClasse.lsOrgaoConcedente}" 
 						constraint="no empty" mold="rounded" buttonVisible="true" width="90%" />
 				</row>
 			</rows>