diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java index d7cac9aa6..e62e04376 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java @@ -71,7 +71,7 @@ public class Configuration extends BaseEntity { private Boolean generateCodeForCostCategory = true; - private ProgressType progressType = ProgressType.NORMAL; + private ProgressType progressType = ProgressType.SPREAD_PROGRESS; public void setDefaultCalendar(BaseCalendar defaultCalendar) { this.defaultCalendar = defaultCalendar; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java index b31e64657..b21b5436a 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java @@ -32,7 +32,7 @@ import java.util.List; */ public enum ProgressType { - NORMAL(_("Normal")), + SPREAD_PROGRESS(_("Spread progress")), CRITICAL_PATH_DURATION(_("Critical path by duration")), CRITICAL_PATH_NUMHOURS(_("Critical path by number of hours")); diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java index cf1b0816c..fd66e6773 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java @@ -603,7 +603,7 @@ public abstract class TaskElement extends BaseEntity { } public BigDecimal getAdvancePercentage(ProgressType progressType) { - if (progressType.equals(ProgressType.NORMAL)) { + if (progressType.equals(ProgressType.SPREAD_PROGRESS)) { return advancePercentage; } return BigDecimal.ZERO;