From b6f76b9ee4a549198c4550aa9a8e77605b389eed Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Tue, 3 May 2011 18:30:31 +0200
Subject: [PATCH] [Bug #996] Update the end date of the task correctly.

The new date is equal to the new finish of task more one day.
So that the end date is not included in the reassigning of hours.

FEA: ItEr74S04BugFixing
---
 .../org/navalplanner/business/workingday/IntraDayDate.java    | 4 ++++
 .../web/planner/consolidations/AdvanceConsolidationModel.java | 1 +
 2 files changed, 5 insertions(+)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workingday/IntraDayDate.java b/navalplanner-business/src/main/java/org/navalplanner/business/workingday/IntraDayDate.java
index d8fc0036d..ac80534be 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/workingday/IntraDayDate.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/workingday/IntraDayDate.java
@@ -187,6 +187,10 @@ public class IntraDayDate implements Comparable<IntraDayDate> {
         return getDate().plusDays(1);
     }
 
+    public void plus(int days) {
+        this.date = this.date.plusDays(days);
+    }
+
     public int compareTo(LocalDate other) {
         int result = this.date.compareTo(other);
         if (result != 0) {
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 afab4916b..2b9afb5d4 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
@@ -253,6 +253,7 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
                                 Arrays.asList(resourceAllocation
                                         .asResourcesPerDayModification()))
                                 .untilAllocating(hours(pendingHours));
+                        date.plus(1);
                         task.setIntraDayEndDate(date);
                     }
                 } else {