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

fixes bug #8826 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@67432 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-03-30 19:49:34 +00:00
parent 2481111147
commit cab3b12874
2 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
web/gui/comissao/conferencia.zul
View File

@ -8,7 +8,7 @@
<window id="winConferencia"
title="${c:l('conferenciaController.window.title')}"
apply="${conferenciaController}" contentStyle="overflow:auto"
height="500px" width="1200px" border="normal">
height="630px" width="1175px" border="normal">
<style>
.existeConferencia .z-tab-text {
@ -196,7 +196,7 @@
</grid>
<listbox id="formapagosList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="195px">
vflex="true" multiple="false" height="290px">
<listhead sizable="true">
<listheader image="/gui/img/builder.gif"
label="${c:l('conferenciaController.lhFormpago.value')}"
@ -209,15 +209,10 @@
</tabpanel>
<!-- Bilhetes Manual -->
<tabpanel height="370px" style="overflow:auto;">
<!--
<button id="btnAlterarBilheteManual"
image="/gui/img/edit.png"
label="${c:l('conferenciaController.btnAlterarBilheteManual.label')}" />
-->
<tabpanel style="overflow:auto;">
<listbox id="bilhetesManualList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="350px">
vflex="true" multiple="false" height="450px">
<listhead sizable="true">
<listheader
label="${c:l('conferenciaController.lhConferido.value')}"
@ -289,10 +284,10 @@
</tabpanel>
<!-- Bilhetes -->
<tabpanel height="370px" style="overflow:auto;">
<tabpanel style="overflow:auto;">
<listbox id="bilhetesList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="350px">
vflex="true" multiple="false" height="450px">
<listhead sizable="true">
<listheader
label="${c:l('conferenciaController.lhConferido.value')}"
@ -363,10 +358,10 @@
</tabpanel>
<!-- Bilhetes Cancelados -->
<tabpanel height="370px" style="overflow:auto;">
<tabpanel style="overflow:auto;">
<listbox id="bilhetesCanceladosList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="350px">
vflex="true" multiple="false" height="450px">
<listhead sizable="true">
<listheader
label="${c:l('conferenciaController.lhConferido.value')}"
@ -439,7 +434,7 @@
</tabpanel>
<!-- Bilhetes Devolvidos -->
<tabpanel height="370px" style="overflow:auto;">
<tabpanel style="overflow:auto;">
<grid id="pesquisaBoletoDevolvido">
<columns>
<column width="10%" />
@ -462,7 +457,7 @@
<listbox id="bilhetesDevolvidosList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="350px">
vflex="true" multiple="false" height="400px">
<listhead sizable="true">
<listheader
label="${c:l('conferenciaController.lhConferido.value')}"
@ -555,10 +550,10 @@
</tabpanel>
<!-- GAP Venda -->
<tabpanel height="370px" style="overflow:auto;">
<tabpanel style="overflow:auto;">
<listbox id="bilhetesGapList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="350px">
vflex="true" multiple="false" height="450px">
<listhead sizable="true">
<listheader
label="${c:l('conferenciaController.lhConferido.value')}"
@ -636,10 +631,10 @@
</tabpanel>
<!-- GAP Cancelado -->
<tabpanel height="370px" style="overflow:auto;">
<tabpanel style="overflow:auto;">
<listbox id="bilhetesGapCanceladosList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="350px">
vflex="true" multiple="false" height="450px">
<listhead sizable="true">
<listheader
label="${c:l('conferenciaController.lhConferido.value')}"
@ -718,10 +713,10 @@
</tabpanel>
<!-- GAP Devolvido -->
<tabpanel height="370px" style="overflow:auto;">
<tabpanel style="overflow:auto;">
<listbox id="bilhetesGapDevolvidosList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="350px">
vflex="true" multiple="false" height="450px">
<listhead sizable="true">
<listheader
label="${c:l('conferenciaController.lhConferido.value')}"
@ -820,10 +815,10 @@
</tabpanel>
<!-- Eventos Financeiros -->
<tabpanel height="370px" style="overflow:auto;">
<tabpanel style="overflow:auto;">
<listbox id="eventosFinanceirosList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="200px">
vflex="true" multiple="false" height="430px">
<listhead sizable="true">
<listheader
label="${c:l('conferenciaController.lhConferido.value')}"
@ -905,10 +900,10 @@
</tabpanel>
<!-- OCD -->
<tabpanel height="370px" style="overflow:auto;">
<tabpanel style="overflow:auto;">
<listbox id="ocdsList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="350px">
vflex="true" multiple="false" height="450px">
<listhead sizable="true">
<listheader
label="${c:l('conferenciaController.lhConferido.value')}"
@ -968,7 +963,7 @@
</tabpanel>
<!-- Observações -->
<tabpanel height="370px" style="overflow:auto;">
<tabpanel style="overflow:auto;">
<grid fixedLayout="true">
<columns>
<column width="10%" />
@ -1054,7 +1049,7 @@
<listbox id="logsConferenciaList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
vflex="true" multiple="false" height="220px">
vflex="true" multiple="false" height="265px">
<listhead sizable="true">
<listheader image="/gui/img/builder.gif"
label="${c:l('conferenciaController.lhSituacaoLog.value')}"

2
web/gui/comissao/conferenciaComissao.zul
View File

@ -69,7 +69,7 @@
<column width="16%"/>
<column width="16%"/>
<column width="16%"/>
<column width="20%"/>
<column width="21%"/>
</columns>
<rows>
<row spans="6">