From 73223506871e0998bc85601b468b16f99433bd0f Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Tue, 16 Mar 2010 09:57:08 +0100
Subject: [PATCH]  ItEr51S04ValidacionEProbasFuncionaisItEr50S04: [Bug #390]
 Fixing problem loading all the entities in the model.

---
 .../navalplanner/web/subcontract/ReportAdvancesModel.java  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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 c1a4ab955..f5c9113ea 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
@@ -38,9 +38,7 @@ import javax.xml.bind.Marshaller;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.cxf.jaxrs.client.WebClient;
-import org.navalplanner.business.advance.bootstrap.PredefinedAdvancedTypes;
 import org.navalplanner.business.advance.entities.AdvanceMeasurement;
-import org.navalplanner.business.advance.entities.AdvanceType;
 import org.navalplanner.business.advance.entities.DirectAdvanceAssignment;
 import org.navalplanner.business.common.daos.IConfigurationDAO;
 import org.navalplanner.business.externalcompanies.entities.ExternalCompany;
@@ -109,13 +107,10 @@ public class ReportAdvancesModel implements IReportAdvancesModel {
     }
 
     private void forceLoadAdvanceAssignments(Order order) {
-        AdvanceType advanceType = PredefinedAdvancedTypes.SUBCONTRACTOR
-                .getType();
         for (DirectAdvanceAssignment directAdvanceAssignment : order
-                .getAllDirectAdvanceAssignments(advanceType)) {
+                .getDirectAdvanceAssignmentsOfSubcontractedOrderElements()) {
             directAdvanceAssignment.getAdvanceMeasurements().size();
         }
-        order.getAllIndirectAdvanceAssignments(advanceType).size();
     }
 
     @Override