diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java index c46bb7d51..5a50a132c 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java @@ -527,7 +527,7 @@ public class Order extends OrderLineGroup { "Order can not be converted to leaf"); } - public DirectAdvanceAssignment getDirectAdvanceAssignmentOfSubcontractedOrderElements() { + public DirectAdvanceAssignment getDirectAdvanceAssignmentOfTypeSubcontractor() { if (StringUtils.isBlank(getExternalCode())) { return null; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java index b86cf5ba2..e98787bea 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java @@ -104,7 +104,7 @@ public class ReportAdvancesController extends GenericForwardComposer { appendLabel(row, order.getName()); DirectAdvanceAssignment directAdvanceAssignment = order - .getDirectAdvanceAssignmentOfSubcontractedOrderElements(); + .getDirectAdvanceAssignmentOfTypeSubcontractor(); AdvanceMeasurement lastAdvanceMeasurementReported = reportAdvancesModel .getLastAdvanceMeasurementReported(directAdvanceAssignment); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java index 196b64a12..44c4fa2bc 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java @@ -226,7 +226,7 @@ public class ReportAdvancesModel implements IReportAdvancesModel { List orderElementWithAdvanceMeasurementsDTOs = new ArrayList(); DirectAdvanceAssignment directAdvanceAssignment = order - .getDirectAdvanceAssignmentOfSubcontractedOrderElements(); + .getDirectAdvanceAssignmentOfTypeSubcontractor(); Set advanceMeasurementDTOs = new HashSet(); for (AdvanceMeasurement advanceMeasurement : directAdvanceAssignment