RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename "getDirectAdvanceAssignmentOfSubcontractedOrderElements" to

Browse source 
"getDirectAdvanceAssignmentOfTypeSubcontractor"

FEA: ItEr74S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2011-05-02 09:47:38 +02:00
parent 95dd264824
commit 315208a04e
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
View file

@ -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;
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java
View file

@ -104,7 +104,7 @@ public class ReportAdvancesController extends GenericForwardComposer {
appendLabel(row, order.getName());
DirectAdvanceAssignment directAdvanceAssignment = order
.getDirectAdvanceAssignmentOfSubcontractedOrderElements();
.getDirectAdvanceAssignmentOfTypeSubcontractor();
AdvanceMeasurement lastAdvanceMeasurementReported = reportAdvancesModel
.getLastAdvanceMeasurementReported(directAdvanceAssignment);

2
navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java
View file

@ -226,7 +226,7 @@ public class ReportAdvancesModel implements IReportAdvancesModel {
List<OrderElementWithAdvanceMeasurementsDTO> orderElementWithAdvanceMeasurementsDTOs = new ArrayList<OrderElementWithAdvanceMeasurementsDTO>();
DirectAdvanceAssignment directAdvanceAssignment = order
.getDirectAdvanceAssignmentOfSubcontractedOrderElements();
.getDirectAdvanceAssignmentOfTypeSubcontractor();
Set<AdvanceMeasurementDTO> advanceMeasurementDTOs = new HashSet<AdvanceMeasurementDTO>();
for (AdvanceMeasurement advanceMeasurement : directAdvanceAssignment