Merge branch 'aiccra-staging' into aiccra-marlo-java-11-version2

CCAFS · Dec 11, 2024 · 7fb662a · 7fb662a
2 parents 889b4a5 + edf402a
commit 7fb662a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...b/src/main/java/org/cgiar/ccafs/marlo/validation/projects/ProjectInnovationValidator.java b/...b/src/main/java/org/cgiar/ccafs/marlo/validation/projects/ProjectInnovationValidator.java
@@ -201,11 +201,11 @@ public void validateAllianceAlignment(BaseAction action, Project project, Projec
         action.addMissingField("innovation.allianceLevers");
         action.getInvalidFields().put("input-innovation.allianceLevers", InvalidFieldsMessages.EMPTYFIELD);
       }
+    }
 
-      innovationAlliance = action.getMissingFields().toString();
-      if (projectInnovation.getId() != null && (innovationAlliance.length() > innovationGeneral.length())) {
-        BaseAction.getIsInnovationAllianceAlignmentCompleteMap().put("" + projectInnovation.getId(), "1");
-      }
+    innovationAlliance = action.getMissingFields().toString();
+    if (projectInnovation.getId() != null && (innovationAlliance.length() > innovationGeneral.length())) {
+      BaseAction.getIsInnovationAllianceAlignmentCompleteMap().put("" + projectInnovation.getId(), "1");
     }
   }
 
@@ -286,7 +286,7 @@ public void validateGeneralInformation(BaseAction action, Project project, Proje
     }
 
 
-    if (innovationInfo != null && (innovationInfo.getHasMilestones() == null)) {
+    if (!action.isAiccra() && innovationInfo != null && (innovationInfo.getHasMilestones() == null)) {
       action.addMessage(action.getText("projectOutcomes"));
       action.addMissingField("innovation.projectOutcomes");
       action.getInvalidFields().put("list-innovation.projectOutcomes",