From 3f8e06e7cfc4eb48a847c73931bfb3f5f0d37294 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Mon, 6 Sep 2010 17:52:05 +0200
Subject: [PATCH] [Bug #620] Updating the current scenary for each order and
 its children when the report is shown.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
---
 .../web/reports/TimeLineRequiredMaterialModel.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 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 60f6035ad..f715844dd 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
@@ -106,9 +106,6 @@ public class TimeLineRequiredMaterialModel implements
 
     private void loadAllOrders() {
         allOrders = orderDAO.getOrdersByScenario(scenarioManager.getCurrent());
-        for (Order each : allOrders) {
-            initializeOrderElements(each.getAllChildren());
-        }
     }
 
     @Override
@@ -145,11 +142,22 @@ public class TimeLineRequiredMaterialModel implements
         return selectedOrders;
     }
 
+    private void reattachmentOrder(Order order) {
+        orderDAO.reattachUnmodifiedEntity(order);
+        initializeOrderElements(order.getAllOrderElements());
+    }
+
     @Override
     @Transactional(readOnly = true)
     public JRDataSource getTimeLineRequiredMaterial(Date startingDate,
             Date endingDate, MaterialStatusEnum status, List<Order> listOrders,
             List<MaterialCategory> categories, List<Material> materials) {
+
+        for (Order order : listOrders) {
+            reattachmentOrder(order);
+            order.useSchedulingDataFor(scenarioManager.getCurrent());
+        }
+
         List<TimeLineRequiredMaterialDTO> result = filterConsult(startingDate,
                 endingDate, status, listOrders, categories, materials);