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

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

@ -784,6 +784,16 @@
</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>
<caption label="${c:l('editarEmpresaController.cstGratuidade.label')}" />
<hlayout>