From 81308fab85d38a648340a34e04ad043a705be362 Mon Sep 17 00:00:00 2001 From: luis Date: Wed, 27 Sep 2017 20:28:54 +0000 Subject: [PATCH] =?UTF-8?q?Issue=20#9790:=20taxa=20de=20embarque=20venda?= =?UTF-8?q?=20para=20ag=C3=AAncia=20default?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@74301 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/entidad/PtoVtaSeguro.java | 12 ++++++++++++ .../service/impl/EstacionServiceImpl.java | 2 ++ .../service/impl/PuntoVentaServiceImpl.java | 1 + 3 files changed, 15 insertions(+) diff --git a/src/com/rjconsultores/ventaboletos/entidad/PtoVtaSeguro.java b/src/com/rjconsultores/ventaboletos/entidad/PtoVtaSeguro.java index 01b634ec1..9c2324cc8 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/PtoVtaSeguro.java +++ b/src/com/rjconsultores/ventaboletos/entidad/PtoVtaSeguro.java @@ -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; + } } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EstacionServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/EstacionServiceImpl.java index 26b03d48d..5e0bd8f8c 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EstacionServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/EstacionServiceImpl.java @@ -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); } } diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PuntoVentaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/PuntoVentaServiceImpl.java index 602fd4b67..1d969bf66 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PuntoVentaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/PuntoVentaServiceImpl.java @@ -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()) {