Resolve ZK binding model exception.

Code refactoring.

libreplan-business/src/main/java/org/libreplan/business/planner/entities/consolidations/CalculatedConsolidatedValue.java

@@ -35,26 +35,24 @@ public class CalculatedConsolidatedValue extends ConsolidatedValue {
 
     private CalculatedConsolidation consolidation;
 
-    public static CalculatedConsolidatedValue create() {
-        return create(new CalculatedConsolidatedValue());
-    }
-
-    public static CalculatedConsolidatedValue create(LocalDate date,
-            BigDecimal value, IntraDayDate taskEndDate) {
-        return create(new CalculatedConsolidatedValue(date, value, taskEndDate));
-    }
-
-    protected CalculatedConsolidatedValue(LocalDate date, BigDecimal value,
-            IntraDayDate taskEndDate) {
-        super(date, value, taskEndDate);
-    }
-
     /**
      * Constructor for {@link DeepCopy}. DO NOT USE!
      */
     public CalculatedConsolidatedValue() {
     }
 
+    protected CalculatedConsolidatedValue(LocalDate date, BigDecimal value, IntraDayDate taskEndDate) {
+        super(date, value, taskEndDate);
+    }
+
+    public static CalculatedConsolidatedValue create() {
+        return create(new CalculatedConsolidatedValue());
+    }
+
+    public static CalculatedConsolidatedValue create(LocalDate date, BigDecimal value, IntraDayDate taskEndDate) {
+        return create(new CalculatedConsolidatedValue(date, value, taskEndDate));
+    }
+
     public void setConsolidation(CalculatedConsolidation consolidation) {
         this.consolidation = consolidation;
     }

libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul

@@ -63,7 +63,7 @@
                                  value="@{criterionRequirementWrapper.criterionAndType}">
                             <bandpopup>
                                 <listbox width="500px" height="150px" sizedByContent="true"
-                                         model="@{assignedCriterionRequirementController.criterionWithItsTypesMachine}"
+                                         forEach="@{assignedCriterionRequirementController.criterionWithItsTypesMachine}"
                                          onSelect="assignedCriterionRequirementController.selectCriterionToHoursGroup(self.selectedItem, self.parent.parent,self.parent.parent.parent.parent.value);">
                                     <listhead>
                                         <listheader label="Type" />