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

fixes bug#18933 

dev: Valdevir
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@101977 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2020-06-05 14:48:01 +00:00
parent b79cd869ad
commit 203a9886f8
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
View File

@ -87,6 +87,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEmpresaInscrica
*/ */
@Controller("editarEmpresaController") @Controller("editarEmpresaController")
@Scope("prototype") @Scope("prototype")
@SuppressWarnings({"unused", "rawtypes", "unchecked"})
public class EditarEmpresaController extends MyGenericForwardComposer { public class EditarEmpresaController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -171,6 +172,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
private Checkbox chkEmiteDABpeVdaCallCenter; private Checkbox chkEmiteDABpeVdaCallCenter;
private Checkbox chkEmiteDABpeVdaInternet; private Checkbox chkEmiteDABpeVdaInternet;
private Checkbox chkEmiteDABpeVdaIntJ3; private Checkbox chkEmiteDABpeVdaIntJ3;
private Checkbox chkEmiteDABpeVdaFidelidade;
private Checkbox chkExigeClienteCompradorVdaCallCenter; private Checkbox chkExigeClienteCompradorVdaCallCenter;
private Checkbox chkIndEmiteDeclaracaoCancelamentoBpeTrocaOrigDest; private Checkbox chkIndEmiteDeclaracaoCancelamentoBpeTrocaOrigDest;
private Checkbox chkIndSubstituicaoIgualSefaz; private Checkbox chkIndSubstituicaoIgualSefaz;
@ -377,6 +379,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
chkOutrasFPVdaCallCenter.setChecked(BooleanUtils.toBoolean(empresa.getIndOutrasFPVdaCallCenter())); chkOutrasFPVdaCallCenter.setChecked(BooleanUtils.toBoolean(empresa.getIndOutrasFPVdaCallCenter()));
chkEmiteDABpeVdaInternet.setChecked(BooleanUtils.toBoolean(empresa.getIndEmiteDABpeVdaInternet())); chkEmiteDABpeVdaInternet.setChecked(BooleanUtils.toBoolean(empresa.getIndEmiteDABpeVdaInternet()));
chkEmiteDABpeVdaIntJ3.setChecked(BooleanUtils.toBoolean(empresa.getIndEmiteDABpeVdaIntJ3())); chkEmiteDABpeVdaIntJ3.setChecked(BooleanUtils.toBoolean(empresa.getIndEmiteDABpeVdaIntJ3()));
chkEmiteDABpeVdaFidelidade.setChecked(BooleanUtils.toBoolean(empresa.getIndEmiteDABpeVdaFidelidade()));
chkExigeClienteCompradorVdaCallCenter.setChecked(BooleanUtils.toBoolean(empresa.getIndExigeClienteCompradorVdaCallCenter())); chkExigeClienteCompradorVdaCallCenter.setChecked(BooleanUtils.toBoolean(empresa.getIndExigeClienteCompradorVdaCallCenter()));
chkIndEmiteDeclaracaoCancelamentoBpeTrocaOrigDest.setChecked(BooleanUtils.toBoolean(empresa.getIndEmiteDeclaracaoCancelaBpeTrocaOrigDest())); chkIndEmiteDeclaracaoCancelamentoBpeTrocaOrigDest.setChecked(BooleanUtils.toBoolean(empresa.getIndEmiteDeclaracaoCancelaBpeTrocaOrigDest()));
chkIndReaproveitarNumBPeRejeitado.setChecked(BooleanUtils.toBoolean(empresa.getIndReaproveitarNumBPeRejeitado())); chkIndReaproveitarNumBPeRejeitado.setChecked(BooleanUtils.toBoolean(empresa.getIndReaproveitarNumBPeRejeitado()));
@ -567,7 +570,6 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
} }
} }
@SuppressWarnings({ "rawtypes", "unchecked" })
private void editContaBancaria(EmpresaContaBancaria empCB) { private void editContaBancaria(EmpresaContaBancaria empCB) {
if (empCB == null) { if (empCB == null) {
return; return;
@ -602,6 +604,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
chkEmiteDABpeVdaCallCenter.getValue(); chkEmiteDABpeVdaCallCenter.getValue();
chkEmiteDABpeVdaInternet.getValue(); chkEmiteDABpeVdaInternet.getValue();
chkEmiteDABpeVdaIntJ3.getValue(); chkEmiteDABpeVdaIntJ3.getValue();
chkEmiteDABpeVdaFidelidade.getValue();
chkOutrasFPVdaCallCenter.getValue(); chkOutrasFPVdaCallCenter.getValue();
chkExibeDiferencaMenorTrocaCupomEmbarqueEcf.getValue(); chkExibeDiferencaMenorTrocaCupomEmbarqueEcf.getValue();
chkPermiteTrocaVdaAberto.getValue(); chkPermiteTrocaVdaAberto.getValue();
@ -712,6 +715,7 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
empresa.setIndOutrasFPVdaCallCenter(chkOutrasFPVdaCallCenter.isChecked()); empresa.setIndOutrasFPVdaCallCenter(chkOutrasFPVdaCallCenter.isChecked());
empresa.setIndEmiteDABpeVdaInternet(chkEmiteDABpeVdaInternet.isChecked()); empresa.setIndEmiteDABpeVdaInternet(chkEmiteDABpeVdaInternet.isChecked());
empresa.setIndEmiteDABpeVdaIntJ3(chkEmiteDABpeVdaIntJ3.isChecked()); empresa.setIndEmiteDABpeVdaIntJ3(chkEmiteDABpeVdaIntJ3.isChecked());
empresa.setIndEmiteDABpeVdaFidelidade(chkEmiteDABpeVdaFidelidade.isChecked());
empresa.setIndExigeClienteCompradorVdaCallCenter(chkExigeClienteCompradorVdaCallCenter.isChecked()); empresa.setIndExigeClienteCompradorVdaCallCenter(chkExigeClienteCompradorVdaCallCenter.isChecked());
empresa.setIndEmiteDeclaracaoCancelaBpeTrocaOrigDest(chkIndEmiteDeclaracaoCancelamentoBpeTrocaOrigDest.isChecked()); empresa.setIndEmiteDeclaracaoCancelaBpeTrocaOrigDest(chkIndEmiteDeclaracaoCancelamentoBpeTrocaOrigDest.isChecked());
empresa.setIndReaproveitarNumBPeRejeitado(chkIndReaproveitarNumBPeRejeitado.isChecked()); empresa.setIndReaproveitarNumBPeRejeitado(chkIndReaproveitarNumBPeRejeitado.isChecked());
@ -960,7 +964,6 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
} }
@SuppressWarnings({ "unchecked", "rawtypes" })
public void abrirEmpresaImposto(EmpresaImposto empresaImposto) { public void abrirEmpresaImposto(EmpresaImposto empresaImposto) {
Map args = new HashMap(); Map args = new HashMap();
args.put("empresaImposto", empresaImposto); args.put("empresaImposto", empresaImposto);
@ -971,7 +974,6 @@ public class EditarEmpresaController extends MyGenericForwardComposer {
} }
@SuppressWarnings({ "unchecked", "rawtypes" })
public void abrirInscricaoEstadual(InscricaoEstadual inscricaoEstadual) { public void abrirInscricaoEstadual(InscricaoEstadual inscricaoEstadual) {
if (inscricaoEstadual == null) { if (inscricaoEstadual == null) {
return; return;

14
web/gui/catalogos/editarEmpresa.zul
View File

@ -550,7 +550,7 @@
style="cursor: help" /> style="cursor: help" />
            </hlayout>             </hlayout>
</groupbox> </groupbox>
</row> </row>
<row> <row>
<groupbox> <groupbox>
@ -783,7 +783,17 @@
</groupbox> </groupbox>
</row> </row>
<row> <row>
<groupbox >
<caption label="${c:l('editarEmpresaController.emiteDABpeVdaFidelidade')}" />
            <hlayout>              
<checkbox id="chkEmiteDABpeVdaFidelidade"
value="@{editarEmpresaController.empresa.indEmiteDABpeVdaFidelidade}" />
<image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('editarEmpresaController.emiteDABpeVdaFidelidade.ajuda')}"
style="cursor: help" />
            </hlayout>
</groupbox>
<groupbox> <groupbox>
<caption label="${c:l('editarEmpresaController.cstGratuidade.label')}" /> <caption label="${c:l('editarEmpresaController.cstGratuidade.label')}" />
<hlayout> <hlayout>