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 @@ - + @@ -299,18 +299,6 @@ - - - - - - - - - - - - @@ -347,6 +335,18 @@ + + + + + + + + + + + + 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