diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/OneOrderElementPerWorkReportLine.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/OneOrderElementPerWorkReportLine.java
index 52b8a9c57..f26acb90f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/OneOrderElementPerWorkReportLine.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/OneOrderElementPerWorkReportLine.java
@@ -73,7 +73,10 @@ public class OneOrderElementPerWorkReportLine implements
     @Override
     public String getOrderElementCodesBound(
             IWorkReportsElements workReportEntity) {
-        return workReportEntity.getOrderElement().getCode();
+        if (workReportEntity.getOrderElement() != null)
+            return workReportEntity.getOrderElement().getCode();
+        else
+            return "";
     }
 
     @Override
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/WorkReportLineDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/WorkReportLineDTO.java
index ab9e65a03..fcb67d69e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/WorkReportLineDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/WorkReportLineDTO.java
@@ -67,7 +67,7 @@ public class WorkReportLineDTO extends IntegrationEntityDTO implements
     public XMLGregorianCalendar clockFinish;
 
     @XmlAttribute(name = "hours")
-    public Integer numHours;
+    public String numHours;
 
     @XmlElementWrapper(name = "label-list")
     @XmlElement(name = "label")
@@ -84,7 +84,7 @@ public class WorkReportLineDTO extends IntegrationEntityDTO implements
             String resource,
  String orderElement, String typeOfWorkHours,
             XMLGregorianCalendar clockStart, XMLGregorianCalendar clockFinish,
-            Integer numHours, Set<LabelReferenceDTO> labels,
+            String numHours, Set<LabelReferenceDTO> labels,
             Set<DescriptionValueDTO> descriptionValues) {
         super(code);
         this.date = date;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java
index fc02f7b40..5ca354bee 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java
@@ -40,6 +40,7 @@ import org.navalplanner.business.labels.entities.LabelType;
 import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.resources.entities.Resource;
 import org.navalplanner.business.resources.entities.Worker;
+import org.navalplanner.business.workingday.EffortDuration;
 import org.navalplanner.business.workreports.entities.WorkReport;
 import org.navalplanner.business.workreports.entities.WorkReportLine;
 import org.navalplanner.business.workreports.entities.WorkReportType;
@@ -136,7 +137,8 @@ public final class WorkReportConverter {
 
         // Mandatory fields
         workReportLine.setCode(workReportLineDTO.code);
-        workReportLine.setNumHours(workReportLineDTO.numHours);
+        workReportLine.setEffort(EffortDuration
+                .parseFromFormattedString(workReportLineDTO.numHours));
 
         if (workReportLineDTO.typeOfWorkHours != null) {
             try {
@@ -299,9 +301,9 @@ public final class WorkReportConverter {
                     .getClockFinish());
         }
 
-        Integer numHours = null;
-        if(line.getNumHours() != null){
-            numHours = line.getNumHours();
+        String numHours = null;
+        if (line.getEffort() != null) {
+            numHours = line.getEffort().toFormattedString();
         }
 
         Set<LabelReferenceDTO> labelDTOs = LabelReferenceConverter.toDTO(line
@@ -536,7 +538,8 @@ public final class WorkReportConverter {
         }
 
         if (workReportLineDTO.numHours != null) {
-            workReportLine.setNumHours(workReportLineDTO.numHours);
+            workReportLine.setEffort(EffortDuration
+                    .parseFromFormattedString(workReportLineDTO.numHours));
         }
 
     }
diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/workreports/WorkReportServiceTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/workreports/WorkReportServiceTest.java
index e2983f804..a41f72faa 100644
--- a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/workreports/WorkReportServiceTest.java
+++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/workreports/WorkReportServiceTest.java
@@ -313,7 +313,7 @@ public class WorkReportServiceTest {
         workReportLineDTO.date = DateConverter
                 .toXMLGregorianCalendar(new Date());
         workReportLineDTO.typeOfWorkHours = typeOfWorkHoursCode;
-        workReportLineDTO.numHours = 8;
+        workReportLineDTO.numHours = "8:15";
 
         return workReportLineDTO;
     }