Issue #9790: taxa de embarque venda para agência default

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@74301 d1611594-4594-4d17-8e1d-87c2c4800839
master
luis 2017-09-27 20:28:54 +00:00
parent 4ec97ef2a4
commit 81308fab85
3 changed files with 15 additions and 0 deletions

View File

@ -73,6 +73,10 @@ public class PtoVtaSeguro implements Serializable {
@Basic(optional = false)
@Column(name = "INDPERMISOTASAEMBARQUEVTAMAN")
private Boolean indPermisoTasaEmbarqueVtaManual;
@Basic(optional = false)
@Column(name = "INDPERMISOTASAEMBARQVTAAGEN")
private Boolean indPermisoTasaEmbarqVtaAgen;
public PtoVtaSeguro() {
}
@ -192,5 +196,13 @@ public class PtoVtaSeguro implements Serializable {
public void setIndPermisoTasaEmbarqueVtaManual(Boolean indPermisoTasaEmbarqueVtaManual) {
this.indPermisoTasaEmbarqueVtaManual = indPermisoTasaEmbarqueVtaManual;
}
public Boolean getIndPermisoTasaEmbarqueVtaAgencia() {
return indPermisoTasaEmbarqVtaAgen;
}
public void setIndPermisoTasaEmbarqueVtaAgencia(Boolean indPermisoTasaEmbarqVtaAgen) {
this.indPermisoTasaEmbarqVtaAgen = indPermisoTasaEmbarqVtaAgen;
}
}

View File

@ -103,6 +103,8 @@ public class EstacionServiceImpl implements EstacionService {
errorNoChequeFolio = autorizaFolioService.noChequeFolioPreimpresos(ei, false);
} else if (validacionImpressoraFiscal(ei) && isNuevaFiscal) {
errorNoChequeFolio = autorizaFolioService.noChequeFolioPreimpresos(ei, true);
}else if(estacion.getIndStockCentral() != null && estacion.getIndStockCentral()){
errorNoChequeFolio = autorizaFolioService.noChequeFolioPreimpresos(ei, true);
}
}

View File

@ -412,6 +412,7 @@ public class PuntoVentaServiceImpl implements PuntoVentaService {
Exception respEx = null;
Constante constDesativaTotvs = constanteService.buscarPorNomeConstante("WS_TOTVS_DESATIVA_INTEGRACAO");
Boolean desativaTotvs = constDesativaTotvs != null && constDesativaTotvs.getValorconstante().equals("1");
desativaTotvs = true;
if (!desativaTotvs){
if (ApplicationProperties.getInstance().integracionTotvs()) {