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

Merge pull request 'fixes bug#AL-3947' (!474) from AL-3947 into master 

Reviewed-on: adm/VentaBoletosAdm#474
Reviewed-by: aristides <aristides@rjconsultores.com.br>
master 1.63.2
Gleison da Cruz 2024-04-11 20:10:41 +00:00
parent 8466261b2a aad3098bd5
commit 03c016209d
5 changed files with 9 additions and 9 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> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.63.1</version> <version>1.63.2</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jasper
View File

Binary file not shown.

4
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioReceitaServico.jrxml
View File

@ -406,8 +406,8 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
</textField> </textField>
<textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="8cf0c102-4e42-4f6d-8922-8edc808fdc0f" x="476" y="0" width="40" height="12"/> <reportElement uuid="8cf0c102-4e42-4f6d-8922-8edc808fdc0f" stretchType="RelativeToTallestObject" x="476" y="0" width="40" height="12" isPrintWhenDetailOverflows="true"/>
<textElement> <textElement>
<font size="7" isItalic="false"/> <font size="7" isItalic="false"/>
</textElement> </textElement>

10
web/gui/catalogos/busquedaCategoria.zul
View File

@ -7,7 +7,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul"> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winBusquedaCategoria" title="${c:l('busquedaCategoriaController.window.title')}" <window id="winBusquedaCategoria" title="${c:l('busquedaCategoriaController.window.title')}"
apply="${busquedaCategoriaController}" contentStyle="overflow:auto" apply="${busquedaCategoriaController}" contentStyle="overflow:auto"
height="500px" width="600px" border="normal" > height="500px" width="700px" border="normal" >
<toolbar> <toolbar>
<button id="btnRefresh" image="/gui/img/refresh.png" width="35px" <button id="btnRefresh" image="/gui/img/refresh.png" width="35px"
tooltiptext="${c:l('busquedaCategoriaController.btnRefresh.tooltiptext')}" /> tooltiptext="${c:l('busquedaCategoriaController.btnRefresh.tooltiptext')}" />
@ -42,16 +42,16 @@
<listbox id="categoriaList" use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox" <listbox id="categoriaList" use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="80%"> vflex="true" multiple="false" height="80%">
<listhead sizable="true"> <listhead sizable="true">
<listheader width="70px" image="/gui/img/builder.gif" <listheader width="10%" image="/gui/img/builder.gif"
label="${c:l('busquedaCategoriaController.lhId.label')}" label="${c:l('busquedaCategoriaController.lhId.label')}"
sort="auto(categoriaId)"/> sort="auto(categoriaId)"/>
<listheader id="lhDesc" image="/gui/img/builder.gif" <listheader width="50%" id="lhDesc" image="/gui/img/builder.gif"
label="${c:l('busquedaCategoriaController.lhDesc.label')}" label="${c:l('busquedaCategoriaController.lhDesc.label')}"
sort="auto(desccategoria)"/> sort="auto(desccategoria)"/>
<listheader id="lhCvecategoria" image="/gui/img/builder.gif" <listheader width="10%" id="lhCvecategoria" image="/gui/img/builder.gif"
label="${c:l('busquedaCategoriaController.lhCvecategoria.label')}" label="${c:l('busquedaCategoriaController.lhCvecategoria.label')}"
sort="auto(cvecategoria)"/> sort="auto(cvecategoria)"/>
<listheader id="lhGrupo" image="/gui/img/builder.gif" <listheader width="30%" id="lhGrupo" image="/gui/img/builder.gif"
label="${c:l('busquedaCategoriaController.lhGrupo.label')}" label="${c:l('busquedaCategoriaController.lhGrupo.label')}"
sort="auto(grupoCategoria.descGrupo)"/> sort="auto(grupoCategoria.descGrupo)"/>
</listhead> </listhead>

2
web/gui/relatorios/filtroRelatorioResumoLinhas.zul
View File

@ -7,7 +7,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul"> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winFiltroRelatorioResumoLinhas" <window id="winFiltroRelatorioResumoLinhas"
apply="${relatorioResumoLinhasController}" apply="${relatorioResumoLinhasController}"
contentStyle="overflow:auto" height="400px" width="500px" contentStyle="overflow:auto" width="500px"
border="normal"> border="normal">
<grid fixedLayout="true"> <grid fixedLayout="true">
<columns> <columns>