From 5aba8ae2bbdc0cd39d28a63ecd1a9cefbba51df9 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 10 Jun 2010 18:51:25 +0200 Subject: [PATCH] ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #497] Advance consolidation was not working properly. The pending hours calculation was wrong. --- .../consolidations/AdvanceConsolidationModel.java | 10 ++++++---- 1 file changed, 6 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 4bd63d619..ce9bc212e 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 @@ -229,10 +229,12 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel { .getEndDate()); Integer pendingHours = BigDecimal.ONE.subtract( - value.getValue().divide(new BigDecimal(100), - RoundingMode.DOWN)).multiply( - new BigDecimal(resourceAllocation - .getOriginalTotalAssigment())).intValue(); + value.getValue().setScale(2).divide( + new BigDecimal(100), RoundingMode.DOWN)) + .multiply( + new BigDecimal(resourceAllocation + .getOriginalTotalAssigment())) + .intValue(); resourceAllocation .setOnDayAssignmentRemoval(new DetachDayAssignmentOnRemoval());