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

0023469: Adamantina - GLPI - 42846 Prestação de contas - conferencia de movimento 

bug#23469
dev:wallace
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@109367 d1611594-4594-4d17-8e1d-87c2c4800839
master
valdir 2021-10-29 13:41:41 +00:00
parent bb12ee85db
commit dd4018ee2e
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
View File

@ -1688,6 +1688,11 @@ public class ConferenciaController extends MyGenericForwardComposer {
private void removerLogConferenciaEventoFinanceiro(EventosFinanceirosVO eventoFinanceiro) { private void removerLogConferenciaEventoFinanceiro(EventosFinanceirosVO eventoFinanceiro) {
try { try {
LogConferencia logConferencia = conferenciaComissaoService.obtenerLogConferenciaID(eventoFinanceiro.getLogconferenciaId()); LogConferencia logConferencia = conferenciaComissaoService.obtenerLogConferenciaID(eventoFinanceiro.getLogconferenciaId());
if(logConferencia == null) {
return;
}
conferenciaComissaoService.borrarLogConferencia(logConferencia); conferenciaComissaoService.borrarLogConferencia(logConferencia);
eventoFinanceiro.setLogconferenciaId(null); eventoFinanceiro.setLogconferenciaId(null);
eventoFinanceiro.setStatus(null); eventoFinanceiro.setStatus(null);

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

@ -107,27 +107,13 @@
<column width="21%" /> <column width="21%" />
</columns> </columns>
<rows> <rows>
<row> <row spans="1,5">
<label <label
value="${c:l('conferenciaController.lhTotalDeposito.value')}" /> value="${c:l('conferenciaController.lhTotalDeposito.value')}" />
<textbox id="totalDeposito" <textbox id="totalDeposito"
width="50%" width="12%"
value="@{winConferencia$composer.resumo.valorDepositoFormatado}" value="@{winConferencia$composer.resumo.valorDepositoFormatado}"
readonly="true" style="text-align:right" /> readonly="true" style="text-align:right" />
<label id="lbValorEmCaixa"
value="${c:l('conferenciaController.lhValorEmCaixa.value')}" />
<textbox id="txtValorEmCaixa"
width="50%"
value="@{winConferencia$composer.resumo.valorEmCaixaFormatado}"
readonly="true" style="text-align:right" />
<label id="lbComissaoRetida"
value="${c:l('conferenciaController.lhComissaoRetida.value')}" />
<textbox id="txtComissaoRetida"
width="50%"
value="@{winConferencia$composer.resumo.comissaoRetidaFormatado}"
readonly="true" style="text-align:right" />
</row> </row>
<row spans="1,5"> <row spans="1,5">
<label <label