From 02be879a1429efb94be9956671622ce774628709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 21 Feb 2011 17:05:22 +0100
Subject: [PATCH] [Bug #855] Fix bug

The last valid resources per day and hours are used; not the
calculated ones. Otherwise when changing the calendar of a resource,
the resources per day are recalculated when reassigning. This caused
the allocation to not change.

FEA: ItEr71S04BugFixing
---
 .../planner/entities/ResourceAllocation.java       | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
index 7a947d68e..3fdd8aca6 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
@@ -1172,10 +1172,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
     }
 
     protected int getIntendedHours() {
-        if (isUnsatisfied()) {
-            return originalTotalAssignment;
-        }
-        return getAssignedHours();
+        return originalTotalAssignment;
     }
 
     @OnCopy(Strategy.IGNORE)
@@ -1538,15 +1535,10 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
     }
 
     /**
-     * Calculates the intended resources per day for this allocation. If the
-     * allocation is not satisfied cannot be calculated on the current
-     * assignment values and must be retrieved from the value in the field.
+     * Returns the last valid specified resources per day
      */
     protected ResourcesPerDay getIntendedResourcesPerDay() {
-        if (isUnsatisfied()) {
-            return getResourcesPerDay();
-        }
-        return getNonConsolidatedResourcePerDay();
+        return getResourcesPerDay();
     }
 
     public ResourcesPerDay getConsolidatedResourcePerDay() {