Merge pull request #339 from rodrigocananea/master

Correções funcionamento cálculos IBS/CBS

Author: Samuel-Oliveira

src/main/java/br/com/swconsultoria/nfe/util/IbsCbsUtil.java

@@ -89,9 +89,11 @@ public TTribNFe montaImpostosDet(String cclassTrib, TNFe.InfNFe.Det det, String
     }
 
     private boolean deveMontarGrupoIBSCBS() {
-        return Boolean.TRUE.equals(cstIbsCbs.getIndIBSCBS()) &&
-               (cstIbsCbs.getIndIBSCBSMono() || cstIbsCbs.getIndDif() ||
-                cstIbsCbs.getIndTransfCred() || cstIbsCbs.getIndRedBC());
+        return Boolean.TRUE.equals(cstIbsCbs.getIndIBSCBS())
+                || Boolean.TRUE.equals(cstIbsCbs.getIndIBSCBSMono())
+                || Boolean.TRUE.equals(cstIbsCbs.getIndRedAliq())
+                || Boolean.TRUE.equals(cstIbsCbs.getIndDif())
+                || Boolean.TRUE.equals(cstIbsCbs.getIndTransfCred());
     }
 
     private TCIBS montarGrupoIBSCBS() {
@@ -234,10 +236,7 @@ private <T> T criarGrupoImposto(
         BigDecimal percentRed = ObjetoUtil.getOrZero(percentualReducao);
         BigDecimal aliqEfet = aliq;
 
-        if (Boolean.TRUE.equals(cstIbsCbs.getIndRedAliq()) &&
-            percentRed.compareTo(BigDecimal.ZERO) > 0 &&
-            Boolean.FALSE.equals(classTribIbsCbs.getIndTribRegular())) {
-
+        if (Boolean.TRUE.equals(cstIbsCbs.getIndRedAliq()) && percentRed.compareTo(BigDecimal.ZERO) > 0) {
             TRed gRed = criarRedutor(percentRed, aliq);
             redSetter.set(grupo, gRed);
             aliqEfet = new BigDecimal(gRed.getPAliqEfet());
@@ -371,4 +370,4 @@ private TIBSCBSMonoTot.GCBS criarTotaisCBS() {
         gCbs.setVCredPresCondSus("0.00");
         return gCbs;
     }
-}
+}