diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml index c42434d24..4f34a4b36 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml @@ -1,5 +1,5 @@ - + diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth.properties index 5eebd7722..2d659ceb0 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth.properties +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth.properties @@ -1,6 +1,6 @@ # Locale for hoursWorkedPerWorkerReport.jrxml title = Work report -subtitle = Worked hours per worker in a month +subtitle = Worked hours per resource in a month parameters.year = Year: parameters.month = Month: headers.column1 = Code diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_en_US.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_en_US.properties index 228059eba..3ada80524 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_en_US.properties +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_en_US.properties @@ -1,6 +1,6 @@ # Locale for hoursWorkedPerWorkerReportInAMonth.jrxml title = Work report -subtitle = Worked hours per worker in a month +subtitle = Worked hours per resource in a month parameters.year = Year: parameters.month = Month: headers.column1 = Name diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_es_ES.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_es_ES.properties index 45b804c7f..f9cd99355 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_es_ES.properties +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_es_ES.properties @@ -1,6 +1,6 @@ # Locale for hoursWorkedPerWorkerInAMonthReport.jrxml title = Informe de trabajo -subtitle = Horas trabajadas por trabajador en un mes +subtitle = Horas trabajadas por recurso en un mes parameters.year = Año: parameters.month = Mes: headers.column1 = Nombre diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_gl_ES.properties b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_gl_ES.properties index bca0d6084..cbaf6f7bd 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_gl_ES.properties +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_gl_ES.properties @@ -1,6 +1,6 @@ # Locale for hoursWorkedPerWorkerInAMonthReport.jrxml title = Informe de traballo -subtitle = Horas traballadas por traballador nun mes +subtitle = Horas traballadas por recurso nun mes parameters.year = Ano: parameters.month = Mes: headers.column1 = Nome diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java index 58a11b709..7a5dbfee8 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java @@ -331,7 +331,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { topItem(_("Reports"), "/reports/hoursWorkedPerWorkerReport.zul", "", subItem(_("Work Report Lines"), "/workreports/workReportQuery.zul", "09-partes.html#id4"), subItem(_("Hours Worked Per Resource"),"/reports/hoursWorkedPerWorkerReport.zul","15-1-report-hours-worked-by-resource.html"), - subItem(_("Hours Worked Per Resource In A Month"),"/reports/hoursWorkedPerWorkerInAMonthReport.zul","15-2-total-hours-by-resource-month.html"), + subItem(_("Total Worked Hours By Resource In A Month"),"/reports/hoursWorkedPerWorkerInAMonthReport.zul","15-2-total-hours-by-resource-month.html"), subItem(_("Work And Progress Per Project"),"/reports/schedulingProgressPerOrderReport.zul", "15-3-work-progress-per-project.html"), subItem(_("Work And Progress Per Task"),"/reports/workingProgressPerTaskReport.zul", "15-informes.html"), subItem(_("Estimated/Planned Hours Per Task"),"/reports/completedEstimatedHoursPerTask.zul", "15-informes.html"), diff --git a/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul b/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul index 7452f7ec6..186301a96 100644 --- a/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul +++ b/navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul @@ -34,7 +34,7 @@