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

fixes bug#13769 

dev:julio
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@90527 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2019-03-07 18:45:59 +00:00
parent 94886d845d
commit b4f8f2bb13
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java
View File

@ -385,6 +385,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
String vBC = null; String vBC = null;
String pICMS = null; String pICMS = null;
String vICMS = null; String vICMS = null;
String pRedBC = null;
if (StringUtils.isNotBlank(xml)) { if (StringUtils.isNotBlank(xml)) {
if (tbpe.getInfBPe().getImp().getICMS().getICMS00() != null) { if (tbpe.getInfBPe().getImp().getICMS().getICMS00() != null) {
@ -395,6 +396,7 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
vBC = tbpe.getInfBPe().getImp().getICMS().getICMS20().getVBC(); vBC = tbpe.getInfBPe().getImp().getICMS().getICMS20().getVBC();
pICMS = tbpe.getInfBPe().getImp().getICMS().getICMS20().getPICMS(); pICMS = tbpe.getInfBPe().getImp().getICMS().getICMS20().getPICMS();
vICMS = tbpe.getInfBPe().getImp().getICMS().getICMS20().getVICMS(); vICMS = tbpe.getInfBPe().getImp().getICMS().getICMS20().getVICMS();
pRedBC = tbpe.getInfBPe().getImp().getICMS().getICMS20().getPRedBC();
} }
if (tbpe.getInfBPe().getInfValorBPe() != null) { if (tbpe.getInfBPe().getInfValorBPe() != null) {
@ -452,7 +454,12 @@ public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO {
BigDecimal credPres = icms.multiply(cp.divide(BigDecimal.TEN.multiply(BigDecimal.TEN))); BigDecimal credPres = icms.multiply(cp.divide(BigDecimal.TEN.multiply(BigDecimal.TEN)));
BigDecimal icmsRec = icms.subtract(credPres); BigDecimal icmsRec = icms.subtract(credPres);
BigDecimal vRedBC = det.getRedBaseCalcIcms(); BigDecimal vRedBC = det.getRedBaseCalcIcms();
BigDecimal outros = isentos.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : passagem.subtract(isentos).subtract(baseCalculo); BigDecimal outros = isentos.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : passagem.subtract(isentos).subtract(baseCalculo);
if (pRedBC != null) {
outros = passagem.subtract(baseCalculo);
outros = outros.subtract(isentos);
}
rdis.add(new FiscalRdi(det.getEstadoOrigem(), tipoViagem, det.getTipoReceita(), tarifa, rdis.add(new FiscalRdi(det.getEstadoOrigem(), tipoViagem, det.getTipoReceita(), tarifa,
seguro, taxaEmbarque, pedagio, passagem, isentos, outros, vRedBC, seguro, taxaEmbarque, pedagio, passagem, isentos, outros, vRedBC,