From 492a0470c3bc65c962b60eff04665660c9220841 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 28 Dec 2011 11:09:27 +0100
Subject: [PATCH] [Bug #1288] Return null instead of zero in a just created
 AdvanceMeasurement

Now when you add a new advance measurement, you will have an empty value.
A test was fixed due to this change.

FEA: ItEr75S04BugFixing
---
 .../business/advance/entities/AdvanceMeasurement.java       | 2 +-
 .../web/test/ws/orders/OrderElementServiceTest.java         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java
index 0b1449513..f449eca55 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java
@@ -95,7 +95,7 @@ public class AdvanceMeasurement extends BaseEntity {
 
     @NotNull(message = "value not specified")
     public BigDecimal getValue() {
-        return value != null ? value : BigDecimal.ZERO;
+        return value;
     }
 
     public void setAdvanceAssignment(AdvanceAssignment advanceAssignment) {
diff --git a/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/orders/OrderElementServiceTest.java b/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/orders/OrderElementServiceTest.java
index 3d9b610b4..c50fc8bfe 100644
--- a/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/orders/OrderElementServiceTest.java
+++ b/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/orders/OrderElementServiceTest.java
@@ -1082,10 +1082,10 @@ public class OrderElementServiceTest {
         List<ConstraintViolationDTO> constraintViolations = instanceConstraintViolationsList
                 .get(0).constraintViolations;
         // Mandatory fields: date
-        assertThat(constraintViolations.size(), equalTo(1));
+        assertThat(constraintViolations.size(), equalTo(2));
         for (ConstraintViolationDTO constraintViolationDTO : constraintViolations) {
-            System.out.println("### constraintViolationDTO.fieldName: " + constraintViolationDTO.fieldName);
-            assertThat(constraintViolationDTO.fieldName, anyOf(mustEnd("date")));
+            assertThat(constraintViolationDTO.fieldName,
+                    anyOf(mustEnd("value"), mustEnd("date")));
         }
 
         try {