diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceAssigment.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceAssigment.java
index 9b8b00712..33f5be8ad 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceAssigment.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceAssigment.java
@@ -11,8 +11,6 @@ public class AdvanceAssigment extends BaseEntity {
 
     private boolean reportGlobalAdvance;
 
-    private BigDecimal maxValue;
-
     private OrderElement orderElement;
 
     private AdvanceType advanceType;
@@ -21,17 +19,6 @@ public class AdvanceAssigment extends BaseEntity {
 
     public AdvanceAssigment(boolean reportGlobalAdvance, BigDecimal maxValue) {
         this.reportGlobalAdvance = reportGlobalAdvance;
-        this.maxValue = maxValue;
-        this.maxValue.setScale(2);
-    }
-
-    public void setMaxValue(BigDecimal maxValue) {
-        this.maxValue = maxValue;
-        this.maxValue.setScale(2);
-    }
-
-    public BigDecimal getMaxValue() {
-        return this.maxValue;
     }
 
     public void setReportGlobalAdvance(boolean reportGlobalAdvance) {
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java
index 29158000b..e5a22a135 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceMeasurement.java
@@ -11,12 +11,16 @@ public class AdvanceMeasurement extends BaseEntity {
 
     private BigDecimal value;
 
+    private BigDecimal maxValue;
+
     private AdvanceAssigment advanceAssigment;
 
-    public AdvanceMeasurement(Date date, BigDecimal value) {
+    public AdvanceMeasurement(Date date, BigDecimal value, BigDecimal maxValue) {
         this.date = date;
         this.value = value;
         this.value.setScale(2);
+        this.maxValue = maxValue;
+        this.maxValue.setScale(2);
     }
 
     public void setDate(Date date) {
@@ -36,6 +40,15 @@ public class AdvanceMeasurement extends BaseEntity {
         return this.value;
     }
 
+    public BigDecimal getMaxValue() {
+        return this.maxValue;
+    }
+
+    public void setMaxValue(BigDecimal maxValue) {
+        this.maxValue = maxValue;
+        this.maxValue.setScale(2);
+    }
+
     public void setAdvanceAssigment(AdvanceAssigment advanceAssigment) {
         this.advanceAssigment = advanceAssigment;
     }
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/advance/entities/Advance.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/advance/entities/Advance.hbm.xml
index 8c7456a5d..b3b2fa7d6 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/advance/entities/Advance.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/advance/entities/Advance.hbm.xml
@@ -27,7 +27,6 @@
     </id>
     <version name="version" access="property" type="long" />
 
-    <property name="maxValue" />
     <property name="reportGlobalAdvance"/>
 
     <many-to-one name="advanceType" class="AdvanceType" column="ADVANCE_TYPE_ID"/>
@@ -51,7 +50,7 @@
 
     <property name="date"/>
     <property name="value" scale="2"/>
-
+    <property name="maxValue" scale="2"/>
     <many-to-one name="advanceAssigment" class="AdvanceAssigment" column="ADVANCE_ASSIGMENT_ID" />
 </class>
 </hibernate-mapping>