From fe85ca28be400de820c68132510a506c94e4d8e3 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 15 Jun 2010 10:57:20 +0200 Subject: [PATCH] ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #523] Removing of advance consolidation was not working properly. The original hours calculation was wrong. --- .../business/planner/entities/ResourceAllocation.java | 5 +++-- 1 file changed, 3 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 4de04253e..20fc1b5b2 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 @@ -410,8 +410,9 @@ public abstract class ResourceAllocation extends .getConsolidatedValues().last().getValue(); originalTotalAssignment = new BigDecimal(getNonConsolidatedHours()) .divide( - BigDecimal.ONE.subtract(lastConslidation.divide( - new BigDecimal(100), RoundingMode.DOWN)), + BigDecimal.ONE.subtract(lastConslidation + .setScale(2).divide(new BigDecimal(100), + RoundingMode.DOWN)), RoundingMode.DOWN).intValue(); } }