From 33281715ee202d5a06bfde379228adfc7fb2b912 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Tue, 15 Feb 2011 19:15:26 +0100
Subject: [PATCH] [Bug #851] fix bug

set type BigDecimal to units property in the
report TimeLineRequiredMaterial.

FEA : ItEr70S04BugFixing
---
 .../jasper/timeLineRequiredMaterial.jrxml     | 26 +++++++++----------
 .../CompletedEstimatedHoursPerTaskModel.java  |  3 +--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
index 34cacf9fe..2ef249abe 100644
--- a/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
+++ b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
@@ -11,7 +11,7 @@
 	<field name="code" class="java.lang.String"/>
 	<field name="name" class="java.lang.String"/>
 	<field name="category" class="java.lang.String"/>
-	<field name="units" class="java.lang.Double"/>
+	<field name="units" class="java.math.BigDecimal"/>
 	<field name="unitPrice" class="java.math.BigDecimal"/>
 	<field name="totalPrice" class="java.math.BigDecimal"/>
 	<field name="estimatedAvailability" class="java.util.Date"/>
@@ -299,18 +299,6 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{unitPrice}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="340" y="0" width="50" height="73"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<topPen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-					<bottomPen lineWidth="1.0"/>
-					<rightPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression class="java.lang.Double"><![CDATA[$F{units}]]></textFieldExpression>
-			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement x="520" y="0" width="60" height="73">
 					<printWhenExpression><![CDATA[$P{status} == null]]></printWhenExpression>
@@ -347,6 +335,18 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{order}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="340" y="0" width="50" height="73"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{units}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java
index f43ab4e35..f8b46a49f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java
@@ -124,8 +124,7 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
 
     @Override
     @Transactional(readOnly = true)
-    public JRDataSource getCompletedEstimatedHoursReportPerTask(
-Order order,
+    public JRDataSource getCompletedEstimatedHoursReportPerTask(Order order,
             Date deadline, List<Label> labels, List<Criterion> criterions) {
         reattachmentOrder(order);
         order.useSchedulingDataFor(scenarioManager.getCurrent());