From 81d3193b5b832433fa08f1fef2cc502c23ed2d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 7 Sep 2010 18:31:52 +0200 Subject: [PATCH] [Bug #628] Fix bug. Getting the scenario was causing the order to be associated to the session. In order to fix this, the orders are reattached first. FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04 --- .../web/reports/TimeLineRequiredMaterialModel.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialModel.java index bd820ccdc..0ad507748 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialModel.java @@ -153,11 +153,12 @@ public class TimeLineRequiredMaterialModel implements public JRDataSource getTimeLineRequiredMaterial(Date startingDate, Date endingDate, MaterialStatusEnum status, List listOrders, List categories, List materials) { - + for (Order each : listOrders) { + reattachmentOrder(each); + } Scenario currentScenario = scenarioManager.getCurrent(); - for (Order order : listOrders) { - reattachmentOrder(order); - order.useSchedulingDataFor(currentScenario); + for (Order each : listOrders) { + each.useSchedulingDataFor(currentScenario); } List result = filterConsult(startingDate,