From 70cd6cd60a1cf07567674b064c2ca8ba14d182cb Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Mon, 22 Feb 2010 10:58:32 +0100
Subject: [PATCH]  ItEr49S04ValidacionEProbasFuncionaisItEr48S04: [Bug #336]
 Loads the order elements of the orders optimally.

---
 .../web/reports/WorkingProgressPerTaskModel.java           | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskModel.java
index 87f4bcfef..1a1cbc255 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskModel.java
@@ -57,9 +57,6 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
     @Transactional(readOnly = true)
     public List<Order> getOrders() {
         List<Order> result = orderDAO.getOrders();
-        for (Order each: result) {
-            initializeOrderElements(each.getAllOrderElements());
-        }
         return result;
     }
 
@@ -74,9 +71,13 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
     }
 
     @Override
+    @Transactional(readOnly = true)
     public JRDataSource getWorkingProgressPerTaskReport(Order order,
             Date referenceDate) {
 
+        orderDAO.reattachUnmodifiedEntity(order);
+        initializeOrderElements(order.getAllOrderElements());
+
         final List<WorkingProgressPerTaskDTO> workingHoursPerWorkerList =
             taskDAO.getWorkingProgressPerTaskReport(order, new LocalDate(referenceDate));