Merge branch 'dev' into dev_frank

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java

@@ -602,7 +602,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
                     List<PCTEntity> entities = formulaMapToPCT.get(pctStr);
                     BigDecimal result = new BigDecimal("0");
                     for (PCTEntity entity : entities) {
-                        result = result.add(pctCache.get(entity));
+                        result = pctCache.containsKey(entity) ? result.add(pctCache.get(entity)) : result;
                     }
                     k.setParsedFormula(k.getParsedFormula().replace(pctStr, result.toString()));
                 });