diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/OrderEarnedValueCalculator.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/OrderEarnedValueCalculator.java index 788229667..64e24e899 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/OrderEarnedValueCalculator.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/OrderEarnedValueCalculator.java @@ -103,9 +103,9 @@ public class OrderEarnedValueCalculator extends EarnedValueCalculator implements @Override @Transactional(readOnly = true) public BigDecimal getBudgetAtCompletion(Order order) { - SortedMap budgedtedCost = calculateBudgetedCostWorkScheduled(order); - LocalDate lastKey = budgedtedCost.lastKey(); - return (lastKey) != null ? budgedtedCost.get(lastKey) : BigDecimal.ZERO; + SortedMap budgedtedCost = calculateBudgetedCostWorkScheduled(order); + return !budgedtedCost.isEmpty() ? budgedtedCost.get(budgedtedCost + .lastKey()) : BigDecimal.ZERO; } @Override