fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fixes bug#AL-4732' (!664) from AL-4732 into master 

Reviewed-on: adm/VentaBoletosAdm#664
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
master 1.127.0
wallace 2024-08-21 01:22:31 +00:00
parent b8e71f7623 4ab75a38de
commit de18d70261
7 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -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>

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/BusquedaAidfController.java
View File

@ -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");

1
web/WEB-INF/i3-label_en.label
View File

@ -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

1
web/WEB-INF/i3-label_es_MX.label
View File

@ -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

1
web/WEB-INF/i3-label_fr_FR.label
View File

@ -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

2
web/WEB-INF/i3-label_pt_BR.label
View File

@ -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

5
web/gui/gr/busquedaAidf.zul
View File

@ -65,7 +65,10 @@
<label value="${c:l('busquedaAidfController.serie.label')}"/>
<textbox id="txtSerie" width="80px"
maxlength="8" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
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>