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

Merge branch 'master' into AL-4135

master
Lucas Taiã 2024-04-11 22:46:57 +00:00
parent 9339703b31 03c016209d
commit 1d50cccf62
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

@ -7,7 +7,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winBusquedaCategoria" title="${c:l('busquedaCategoriaController.window.title')}"
apply="${busquedaCategoriaController}" contentStyle="overflow:auto"
height="500px" width="600px" border="normal" >
height="500px" width="700px" border="normal" >
<toolbar>
<button id="btnRefresh" image="/gui/img/refresh.png" width="35px"
tooltiptext="${c:l('busquedaCategoriaController.btnRefresh.tooltiptext')}" />
@ -42,16 +42,16 @@
<listbox id="categoriaList" use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="80%">
<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')}"
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')}"
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')}"
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')}"
sort="auto(grupoCategoria.descGrupo)"/>
</listhead>

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

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