From eb03750192c8680006f6afffe5024b4a43caa30d Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Wed, 2 Jun 2010 19:16:12 +0200
Subject: [PATCH]  ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #475]
 Fixed problem consolidating and advance after the end of the task.

---
 .../consolidations/AdvanceConsolidationModel.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java
index dacfaa8b5..0d8570bc9 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java
@@ -131,7 +131,7 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
     }
 
     @Override
-    @Transactional
+    @Transactional(readOnly = true)
     public void accept() {
         if (context != null && orderElement != null && isVisibleAdvances()) {
             org.zkoss.ganttz.data.Task ganttTask = context.getTask();
@@ -205,8 +205,6 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
             if (startInclusive.compareTo(taskStartDate) < 0) {
                 startInclusive = taskStartDate;
             }
-            LocalDate endExclusive = LocalDate
-                    .fromDateFields(task.getEndDate());
 
             Set<ResourceAllocation<?>> allResourceAllocations = task
                     .getAllResourceAllocations();
@@ -218,6 +216,9 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
                     }
                 }
 
+                LocalDate endExclusive = LocalDate.fromDateFields(task
+                        .getEndDate());
+
                 Integer pendingHours = BigDecimal.ONE.subtract(
                         value.getValue().divide(new BigDecimal(100),
                                 RoundingMode.DOWN)).multiply(
@@ -227,8 +228,7 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
                 resourceAllocation
                         .setOnDayAssignmentRemoval(new DetachDayAssignmentOnRemoval());
 
-                if (value.getDate().compareTo(
-                        LocalDate.fromDateFields(task.getEndDate())) > 0) {
+                if (value.getDate().compareTo(endExclusive) > 0) {
                     LocalDate date = ResourceAllocation.allocating(
                             Arrays.asList(resourceAllocation
                                     .asResourcesPerDayModification()))