diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java index b45941284..31125cbd5 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java @@ -688,10 +688,16 @@ public abstract class TaskElement extends BaseEntity { } public EffortDuration getSumOfAssignedEffort() { - return sumOfAssignedEffort; + if (this.getParent() == null) { + //it's an order, we use the cached value + return sumOfAssignedEffort; + } + else { + return getSumOfAssignedEffortCalculated(); + } } - public EffortDuration getSumOfAssignedEffortCalculated() { + private EffortDuration getSumOfAssignedEffortCalculated() { EffortDuration result = EffortDuration.hours(0); for(ResourceAllocation allocation : getAllResourceAllocations()) { result = result.plus(allocation.getAssignedEffort()); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java index 76456815d..cdf8b2fb6 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java @@ -600,15 +600,8 @@ public class TaskElementAdapter { } if (taskElement.getOrderElement() != null) { - if(taskElement.getParent() == null){ - //it's an order, we use the cached value - hours = taskElement.getSumOfAssignedEffort() - .toHoursAsDecimalWithScale(2); - } - else { - hours = taskElement.getSumOfAssignedEffortCalculated() - .toHoursAsDecimalWithScale(2);; - } + hours = taskElement.getSumOfAssignedEffort() + .toHoursAsDecimalWithScale(2); } // Calculate date according to advanceHours or advancePercentage