diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaEstacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaEstacionController.java
index dc1a1e7cd..59fec9d0c 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaEstacionController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaEstacionController.java
@@ -47,6 +47,7 @@ public class BusquedaEstacionController extends MyGenericForwardComposer {
private Textbox txtDescEstacion;
private Combobox cmbPuntoVenta;
private Textbox txtMAC;
+ private Textbox txtIMEI;
private Longbox txtNumCaja;
private static Logger log = Logger.getLogger(BusquedaEstacionController.class);
@@ -100,6 +101,9 @@ public class BusquedaEstacionController extends MyGenericForwardComposer {
estacionBusqueda.addSortAsc("descestacion");
estacionBusqueda.addFilterEqual("activo", Boolean.TRUE);
+ if (txtIMEI.getValue() != null && !txtIMEI.getValue().isEmpty()) {
+ estacionBusqueda.addFilterLike("imei", txtIMEI.getValue());
+ }
if (txtMAC.getValue() != null && !txtMAC.getValue().isEmpty()) {
if(txtMAC.getValue().length() != 17){
try {
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderEstacion.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderEstacion.java
index 81a4342df..6732d87c5 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderEstacion.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderEstacion.java
@@ -65,6 +65,9 @@ public class RenderEstacion implements ListitemRenderer {
}
lc.setParent(lstm);
+ lc = new Listcell(estacion.getImei());
+ lc.setParent(lstm);
+
lstm.setAttribute("data", estacion);
}
}
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index ee62f0532..68599887a 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -4321,6 +4321,7 @@ busquedaEstacionController.lhDescMac.label = Descripción MAC
busquedaEstacionController.lhIMEI.label = IMEI
busquedaEstacionController.lhNumCaja.label = Caja
busquedaEstacionController.lhPuntoVenta.label = Punto de venta
+busquedaEstacionController.lhImei.label = IMEI
busquedaEstacionController.lhMAC.label = MAC
busquedaEstacionController.btnPesquisa.label = Búsqueda
busquedaEstacionController.nomeImpressora.label = Impresora
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 588f02ff2..4b92d6999 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -4554,6 +4554,7 @@ busquedaEstacionController.lhUtilizaCartaoLibercard.label = Utiliza cartão Libe
busquedaEstacionController.lhStockCentral.label = Stock Central
busquedaEstacionController.lblVoucherBPe.label = Gerar Voucher BPe (UF: BPe/Estação NBPe)
busquedaEstacionController.lhPuntoVenta.label = Ponto Venda
+busquedaEstacionController.lhImei.label = IMEI
busquedaEstacionController.lhMAC.label = MAC
busquedaEstacionController.btnPesquisa.label = Pesquisa
busquedaEstacionController.nomeImpressora.label = Impressora
diff --git a/web/gui/seguridad/busquedaEstacion.zul b/web/gui/seguridad/busquedaEstacion.zul
index 7d00fee5e..dc1c6c2d7 100644
--- a/web/gui/seguridad/busquedaEstacion.zul
+++ b/web/gui/seguridad/busquedaEstacion.zul
@@ -55,6 +55,11 @@
value="${c:l('busquedaEstacionController.lhMAC.label')}" />
+
+
+
+
@@ -86,6 +91,9 @@
+