Skip to content

Commit

Permalink
Merge branch 'aiccra-list-deliverables' of https://github.com/CCAFS/M…
Browse files Browse the repository at this point in the history
…ARLO into aiccra-list-deliverables
  • Loading branch information
cristianpizociat committed May 31, 2023
2 parents 6f8ad97 + 4d67ab0 commit 90d16bf
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ public void validate(BaseAction action, Deliverable deliverable, boolean saving)
}
if (deliverable.getDeliverableInfo().getStatus() != null
&& deliverable.getDeliverableInfo().getStatus() == Integer.parseInt(ProjectStatusEnum.Complete.getStatusId())) {
if (deliverable.getDeliverableInfo().getNewExpectedYear() != null) {
if (deliverable.getDeliverableInfo().getNewExpectedYear() != null
&& deliverable.getDeliverableInfo().getNewExpectedYear() != -1) {
if (deliverable.getDeliverableInfo().getNewExpectedYear() >= action.getActualPhase().getYear()) {
validate = true;
}
Expand Down

0 comments on commit 90d16bf

Please sign in to comment.