diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java index 7a947d68e..3fdd8aca6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java @@ -1172,10 +1172,7 @@ public abstract class ResourceAllocation extends } protected int getIntendedHours() { - if (isUnsatisfied()) { - return originalTotalAssignment; - } - return getAssignedHours(); + return originalTotalAssignment; } @OnCopy(Strategy.IGNORE) @@ -1538,15 +1535,10 @@ public abstract class ResourceAllocation extends } /** - * Calculates the intended resources per day for this allocation. If the - * allocation is not satisfied cannot be calculated on the current - * assignment values and must be retrieved from the value in the field. + * Returns the last valid specified resources per day */ protected ResourcesPerDay getIntendedResourcesPerDay() { - if (isUnsatisfied()) { - return getResourcesPerDay(); - } - return getNonConsolidatedResourcePerDay(); + return getResourcesPerDay(); } public ResourcesPerDay getConsolidatedResourcePerDay() {