fixes bug#AL-4732
parent
b8e71f7623
commit
4ab75a38de
2
pom.xml
2
pom.xml
|
@ -4,7 +4,7 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>br.com.rjconsultores</groupId>
|
||||
<artifactId>ventaboletosadm</artifactId>
|
||||
<version>1.126.4</version>
|
||||
<version>1.127.0</version>
|
||||
<packaging>war</packaging>
|
||||
|
||||
<properties>
|
||||
|
|
|
@ -15,6 +15,7 @@ import org.zkoss.zk.ui.event.Event;
|
|||
import org.zkoss.zk.ui.event.EventListener;
|
||||
import org.zkoss.zul.Combobox;
|
||||
import org.zkoss.zul.Comboitem;
|
||||
import org.zkoss.zul.Intbox;
|
||||
import org.zkoss.zul.Paging;
|
||||
import org.zkoss.zul.Textbox;
|
||||
|
||||
|
@ -63,6 +64,7 @@ public class BusquedaAidfController extends MyGenericForwardComposer {
|
|||
|
||||
private Textbox txtDocFiscal;
|
||||
private Textbox txtSerie;
|
||||
private Intbox txtAidf;
|
||||
|
||||
|
||||
@Override
|
||||
|
@ -155,6 +157,10 @@ public class BusquedaAidfController extends MyGenericForwardComposer {
|
|||
aidfBusqueda.addFilterLike("serie", txtSerie.getValue());
|
||||
}
|
||||
|
||||
if(txtAidf.getValue() != null){
|
||||
aidfBusqueda.addFilterEqual("aidfId", txtAidf.getValue());
|
||||
}
|
||||
|
||||
aidfBusqueda.addSortDesc("fecvencimiento");
|
||||
aidfBusqueda.addSortDesc("aidfId");
|
||||
|
||||
|
|
|
@ -239,6 +239,7 @@ busquedaAidfController.lbTipoValidaAIDF.value = Sale Type
|
|||
busquedaAidfController.serie.label = Series
|
||||
busquedaAidfController.subserie.label = SubSeries
|
||||
busquedaAidfController.window.title = AIDF
|
||||
busquedaAidfController.aidf.label = AIDF (ID)
|
||||
busquedaAlertaCtrlController.btnCerrar.tooltiptext = Close
|
||||
busquedaAlertaCtrlController.btnNovo.tooltiptext = Include
|
||||
busquedaAlertaCtrlController.btnPesquisa.label = Search
|
||||
|
|
|
@ -237,6 +237,7 @@ busquedaAidfController.lbTipoValidaAIDF.value = Tipo Venta
|
|||
busquedaAidfController.serie.label = Série
|
||||
busquedaAidfController.subserie.label = Subserie
|
||||
busquedaAidfController.window.title = AIDF
|
||||
busquedaAidfController.aidf.label = AIDF (ID)
|
||||
busquedaAlertaCtrlController.btnCerrar.tooltiptext = Cerrar
|
||||
busquedaAlertaCtrlController.btnNovo.tooltiptext = Incluir
|
||||
busquedaAlertaCtrlController.btnPesquisa.label = Búsqueda
|
||||
|
|
|
@ -239,6 +239,7 @@ busquedaAidfController.lbTipoValidaAIDF.value = Type de vente
|
|||
busquedaAidfController.serie.label = Série
|
||||
busquedaAidfController.subserie.label = Sous-Série
|
||||
busquedaAidfController.window.title = AIDF
|
||||
busquedaAidfController.aidf.label = AIDF (ID)
|
||||
busquedaAlertaCtrlController.btnCerrar.tooltiptext = Fermer
|
||||
busquedaAlertaCtrlController.btnNovo.tooltiptext = Inclure
|
||||
busquedaAlertaCtrlController.btnPesquisa.label = Recherche
|
||||
|
|
|
@ -236,6 +236,8 @@ busquedaAidfController.lbTipoValidaAIDF.value = Tipo Venda
|
|||
busquedaAidfController.serie.label = Série
|
||||
busquedaAidfController.subserie.label = SubSérie
|
||||
busquedaAidfController.window.title = AIDF
|
||||
busquedaAidfController.aidf.label = AIDF (ID)
|
||||
|
||||
busquedaAlertaCtrlController.btnCerrar.tooltiptext = Fechar
|
||||
busquedaAlertaCtrlController.btnNovo.tooltiptext = Incluir
|
||||
busquedaAlertaCtrlController.btnPesquisa.label = Pesquisa
|
||||
|
|
|
@ -66,6 +66,9 @@
|
|||
<label value="${c:l('busquedaAidfController.serie.label')}"/>
|
||||
<textbox id="txtSerie" width="80px"
|
||||
maxlength="8" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
|
||||
<label value="${c:l('busquedaAidfController.aidf.label')}"/>
|
||||
<intbox id="txtAidf" width="80px"
|
||||
maxlength="8" />
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
|
|
Loading…
Reference in New Issue