diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java index ccb4e3b62..58cc32c1a 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java @@ -74,7 +74,7 @@ public class DirectAdvanceAssignment extends AdvanceAssignment { return advanceMeasurements.first(); } - public BigDecimal getLastPercentage() { + public BigDecimal getAdvancePercentage() { if (maxValue.compareTo(BigDecimal.ZERO) == 0) { return BigDecimal.ZERO; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java index e3b3ce8b1..773d1d48e 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java @@ -354,7 +354,7 @@ public class OrderLine extends OrderElement { for (DirectAdvanceAssignment directAdvanceAssignment : directAdvanceAssignments) { if (directAdvanceAssignment.getReportGlobalAdvance()) { if (date == null) { - return directAdvanceAssignment.getLastPercentage(); + return directAdvanceAssignment.getAdvancePercentage(); } return directAdvanceAssignment.getAdvancePercentage(date); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java index 6e836a50f..abd1cba89 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java @@ -181,7 +181,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup { for (DirectAdvanceAssignment directAdvanceAssignment : directAdvanceAssignments) { if (directAdvanceAssignment.getReportGlobalAdvance()) { if (date == null) { - return directAdvanceAssignment.getLastPercentage(); + return directAdvanceAssignment.getAdvancePercentage(); } return directAdvanceAssignment.getAdvancePercentage(date); } @@ -198,7 +198,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup { } else { DirectAdvanceAssignment directAdvanceAssignment = calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment); if (date == null) { - return directAdvanceAssignment.getLastPercentage(); + return directAdvanceAssignment.getAdvancePercentage(); } return directAdvanceAssignment.getAdvancePercentage(date); } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java index bbe963c6d..562c427b3 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java @@ -910,7 +910,7 @@ public class OrderElementTest { equalTo(3)); assertThat(advanceAssignment.getLastAdvanceMeasurement().getValue(), equalTo(new BigDecimal(5000))); - assertThat(advanceAssignment.getLastPercentage(), + assertThat(advanceAssignment.getAdvancePercentage(), equalTo(new BigDecimal(45).divide(new BigDecimal(100)) .setScale(2))); } @@ -957,7 +957,7 @@ public class OrderElementTest { equalTo(3)); assertThat(advanceAssignment.getLastAdvanceMeasurement().getValue(), equalTo(new BigDecimal(5000))); - assertThat(advanceAssignment.getLastPercentage(), + assertThat(advanceAssignment.getAdvancePercentage(), equalTo(new BigDecimal(45).divide(new BigDecimal(100)) .setScale(2))); }