From ed4c772d4728b4e45ac9cd488660879bca3f8b8b Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 4 Oct 2018 13:32:03 +0000 Subject: [PATCH] bug#11600 dev: julio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@85899 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../ventaboletos/dao/hibernate/FiscalHibernateDAO.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 7b28c81da..d6acfea43 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -4144,9 +4144,11 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO private BigDecimal valorPassagem(DetalhadoFiscal det, boolean isReceitaTerceiros) { BigDecimal total = BigDecimal.ZERO; total = total.add(det.getTarifa() == null ? BigDecimal.ZERO : det.getTarifa()); - total = total.add(det.getTaxaEmbarque() == null ? BigDecimal.ZERO : det.getTaxaEmbarque()); - total = total.add(det.getPedagio() == null ? BigDecimal.ZERO : det.getPedagio()); - total = total.add(det.getSeguro() == null ? BigDecimal.ZERO : det.getSeguro()); + if (isReceitaTerceiros) { + total = total.add(det.getTaxaEmbarque() == null ? BigDecimal.ZERO : det.getTaxaEmbarque()); + total = total.add(det.getPedagio() == null ? BigDecimal.ZERO : det.getPedagio()); + total = total.add(det.getSeguro() == null ? BigDecimal.ZERO : det.getSeguro()); + } return total; }