From da64823b5fd9caef51e4dd3903245747633060ed Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Mon, 7 Jun 2010 17:12:53 +0200
Subject: [PATCH]  ItEr59S04ValidacionEProbasFuncionaisItEr58S04 : Fixing bug.

Fixes the rounding mode of the division to calculate the
percentage of a advance.
---
 .../business/advance/entities/DirectAdvanceAssignment.java   | 2 +-
 .../web/planner/consolidations/AdvanceConsolidationDTO.java  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java
index 4f3496d49..c329e6ce4 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java
@@ -136,7 +136,7 @@ public class DirectAdvanceAssignment extends AdvanceAssignment {
         if (advanceMeasurement == null) {
             return BigDecimal.ZERO;
         }
-        return advanceMeasurement.getValue().setScale(2).divide(maxValue,
+        return advanceMeasurement.getValue().divide(maxValue, 2,
                 RoundingMode.DOWN);
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationDTO.java
index 59c267012..af8a78b15 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationDTO.java
@@ -220,8 +220,9 @@ public class AdvanceConsolidationDTO {
             return BigDecimal.ZERO;
         }
 
-        return value.setScale(2).divide(maxValue, RoundingMode.DOWN).multiply(
-                new BigDecimal(100));
+        BigDecimal division = value.divide(maxValue, 2, RoundingMode.DOWN);
+        return (division.multiply(new BigDecimal(100))).setScale(0,
+                RoundingMode.DOWN);
     }
 
     public String getLabelPercentage() {