From c58614b8181ab1d1ad44573c8a7f312d76d6de57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 2 May 2011 12:29:23 +0200
Subject: [PATCH] [Bug #1036] Fix bug removing a consolidation

FEA: ItEr74S04BugFixing
---
 .../business/planner/entities/ResourceAllocation.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 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 f67b92a0c..e3b54903d 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
@@ -632,12 +632,18 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
     }
 
     private boolean isCompletelyConsolidated() {
-        return task.getConsolidation() != null
+        return hasConsolidationValues()
                 && getUnconsolidatedPercentage().setScale(2).equals(
-                BigDecimal.ZERO.setScale(2));
+                        BigDecimal.ZERO.setScale(2));
+    }
+
+    private boolean hasConsolidationValues() {
+        return task.getConsolidation() != null
+                && !task.getConsolidation().getConsolidatedValues().isEmpty();
     }
 
     private BigDecimal getUnconsolidatedPercentage() {
+        assert hasConsolidationValues();
         BigDecimal lastConslidation = task.getConsolidation()
                 .getConsolidatedValues().last().getValue();
         BigDecimal unconsolitedPercentage = BigDecimal.ONE