From 6f17f546b6474229d280ba15c2f66a1baf877d2e Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Tue, 1 Jun 2010 19:07:47 +0200
Subject: [PATCH]  ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #475]
 Fixed advance consolidation reassignments when consolidated date is before
 task start date.

---
 .../consolidations/AdvanceConsolidationModel.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 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 1a395f5a8..dacfaa8b5 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
@@ -199,13 +199,18 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
                         .addConsolidatedValue((CalculatedConsolidatedValue) value);
             }
 
+            LocalDate startInclusive = value.getDate().plusDays(1);
+            LocalDate taskStartDate = LocalDate.fromDateFields(task
+                    .getStartDate());
+            if (startInclusive.compareTo(taskStartDate) < 0) {
+                startInclusive = taskStartDate;
+            }
+            LocalDate endExclusive = LocalDate
+                    .fromDateFields(task.getEndDate());
+
             Set<ResourceAllocation<?>> allResourceAllocations = task
                     .getAllResourceAllocations();
             for (ResourceAllocation<?> resourceAllocation : allResourceAllocations) {
-                LocalDate startInclusive = value.getDate().plusDays(1);
-                LocalDate endExclusive = LocalDate.fromDateFields(task
-                        .getEndDate());
-
                 for (DayAssignment dayAssignment : resourceAllocation
                         .getAssignments()) {
                     if (dayAssignment.getDay().compareTo(startInclusive) < 0) {