diff --git a/ganttzk/src/main/resources/i18n/es.po b/ganttzk/src/main/resources/i18n/es.po
index 272061676..c7b895e41 100644
--- a/ganttzk/src/main/resources/i18n/es.po
+++ b/ganttzk/src/main/resources/i18n/es.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 13:36+0100\n"
-"PO-Revision-Date: 2010-02-03 13:57+0100\n"
+"POT-Creation-Date: 2010-03-08 19:27+0100\n"
+"PO-Revision-Date: 2010-03-02 14:13+0100\n"
 "Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
 "Language-Team: Spanish <>\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:21
-msgid "Zoom"
-msgstr "Zoom"
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:195
 msgid "Erase"
 msgstr "Borrar"
@@ -30,11 +25,19 @@ msgstr "Borrar"
 msgid "0% - 100%"
 msgstr "0% - 100%"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:30
+#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:303
+msgid "Add Dependency"
+msgstr "Añadir dependencia"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37
+msgid "Expand/Collapse all"
+msgstr "Expandir/plegar todo"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32
 msgid "Year"
 msgstr "Año"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:46
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:58
 msgid "Month"
 msgstr "Mes"
 
@@ -42,6 +45,11 @@ msgstr "Mes"
 msgid "Show/Hide resources"
 msgstr "Mostrar/ocultar recursos"
 
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:21
+msgid "Zoom"
+msgstr "Zoom"
+
 #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:206
 msgid "Set End-Start"
 msgstr "Asignar Fin-Inicio"
@@ -50,11 +58,11 @@ msgstr "Asignar Fin-Inicio"
 msgid "Set End-End"
 msgstr "Asignar Fin-Fin"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:225
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:232
 msgid "decreasing zoom"
 msgstr "reduciendo zoom"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:409
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:443
 msgid "Hide critical path"
 msgstr "Ocultar camino crítico"
 
@@ -62,7 +70,7 @@ msgstr "Ocultar camino crítico"
 msgid "+ 100%"
 msgstr "+ 100%"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:62
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:84
 msgid "Day"
 msgstr "Día"
 
@@ -82,27 +90,27 @@ msgstr "Mostrar/ocultar etiquetas"
 msgid "Print"
 msgstr "Imprimir"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:210
-msgid "Set Start-Start"
-msgstr "Definir Inicio-Inicio"
-
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:101
 msgid "Assignation percentage"
 msgstr "Porcentaje asignado"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:54
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:210
+msgid "Set Start-Start"
+msgstr "Definir Inicio-Inicio"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:71
 msgid "Week"
 msgstr "Semana"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:208
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:215
 msgid "increasing zoom"
 msgstr "aumentando zoom"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:188
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:221
 msgid "changing zoom"
 msgstr "cambiando zoom"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:38
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45
 msgid "Quarter"
 msgstr "Cuarto"
 
@@ -110,7 +118,7 @@ msgstr "Cuarto"
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:404
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:438
 msgid "Show critical path"
 msgstr "Mostrar camino crítico"
 
diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po
index bf5a67148..2d49a95a3 100644
--- a/navalplanner-webapp/src/main/resources/i18n/es.po
+++ b/navalplanner-webapp/src/main/resources/i18n/es.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 13:36+0100\n"
-"PO-Revision-Date: 2010-02-03 14:04+0100\n"
+"POT-Creation-Date: 2010-03-08 19:27+0100\n"
+"PO-Revision-Date: 2010-03-08 19:41+0100\n"
 "Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
 "Language-Team: Spanish <>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Work report types"
 msgstr "Tipos de partes de trabajo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:338
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:332
 msgid "The resource cannot be null"
 msgstr "El recurso no puede ser nulo"
 
@@ -29,26 +29,31 @@ msgstr "El recurso no puede ser nulo"
 msgid "Completed estimated hours"
 msgstr "Horas estimadas completadas"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:89
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:30
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:101
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31
 msgid "Customer"
 msgstr "Cliente"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:95
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:381
+msgid "criterion codes must be unique inside a criterion type"
+msgstr "el código del criterio debe ser único dentro de un tipo de criterio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:93
 msgid "No authorizations were added because you did not select any."
 msgstr "No se pueden añadir autorizaciones porque no se seleccionó ninguna."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:698
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:80
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:711
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74
 msgid "Hours type"
 msgstr "Tipo de horas"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:57
-#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:67
+#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:63
+#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:73
 msgid "en"
 msgstr "es"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:143
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:147
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:186
 msgid "criterion type name not specified"
 msgstr "nombre del tipo de criterio no especificado"
 
@@ -60,11 +65,15 @@ msgstr "Administrar cuentas de usuario"
 msgid "Create exception"
 msgstr "Crear excepción"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:302
+msgid "Up to company view"
+msgstr "Arriba a la vista de la compañía"
+
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45
 msgid "Select report data"
 msgstr "Seleccione fecha del informe"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:194
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216
 msgid "Add Exception"
 msgstr "Añadir excepción"
 
@@ -72,12 +81,16 @@ msgstr "Añadir excepción"
 msgid "Edit profile"
 msgstr "Editar perfil"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:189
+msgid "there exist multiple resource calendars with name {0}"
+msgstr "existen múltiples calendarios de recursos con el nombre {0}"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:54
 msgid "Create Virtual Worker"
 msgstr "Crear trabajador virtual"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:702
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:93
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:715
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:97
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51
@@ -87,17 +100,17 @@ msgstr "Crear trabajador virtual"
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:40
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:23
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:26
-#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:28
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35
 #: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:23
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:28
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:21
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35
 #: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:17
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:25
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107
-#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:28
-#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29
 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:63
 #: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:69
@@ -107,18 +120,18 @@ msgstr "Crear trabajador virtual"
 #: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:33
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:188
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:189
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70
 #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:35
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:39
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:80
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:128
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:172
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:218
@@ -145,21 +158,23 @@ msgstr "Añadir criterio"
 msgid "Completed estimated hours per task"
 msgstr "Horas estimadas completadas por tarea"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:32
-msgid "Heading Fields"
-msgstr "Campos de cabecera"
-
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:34
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:53
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:47
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:47
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:6
 #: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:6
 msgid "from"
 msgstr "desde"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:199
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:114
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:105
+msgid "Heading Fields"
+msgstr "Campos de cabecera"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:200
 msgid "Select"
 msgstr "Seleccionar"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:320
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:329
 msgid "there must be {0} hours instead of {1}"
 msgstr "debe haber {0} horas en lugar de {1}"
 
@@ -167,21 +182,17 @@ msgstr "debe haber {0} horas en lugar de {1}"
 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:41
 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:78
 #: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:1
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:57
-#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:32
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51
 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:1
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:125
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:40
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:35
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:90
 msgid "Materials"
 msgstr "Materiales"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:78
-msgid "Partially scheduled"
-msgstr "Parcialmente planificado"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:154
 msgid ""
 "Time period contains non valid data. Ending data must be older than starting "
@@ -190,7 +201,7 @@ msgstr ""
 "El período de tiempo contiene datos inválidos. La fecha de fin debe ser "
 "mayor que la de inicio"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:196
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:271
 msgid "Reassign"
 msgstr "Reasignar"
 
@@ -206,7 +217,7 @@ msgstr "La descripción no puede ser nula o vacía"
 msgid "Percentage of consumed budget hours / hours consumed"
 msgstr "Porcentaje de horas de presupuesto consumidas / horas consumidas"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:75
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:75
 msgid "login name not specified"
 msgstr "nombre de usuario no especificado"
 
@@ -219,12 +230,12 @@ msgstr "Debe seleccionar una fecha de inicio para la excepción"
 msgid "Variance At Completion"
 msgstr "Desviación al coste final"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:58
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:41
+#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:64
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:47
 msgid "Help"
 msgstr "Ayuda"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:305
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:337
 msgid "Please, select a calendar"
 msgstr "Por favor, seleccione un calendario"
 
@@ -232,8 +243,13 @@ msgstr "Por favor, seleccione un calendario"
 msgid "Managing fields and labels"
 msgstr "Administrar campos y etiquetas"
 
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:58
-#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:33
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28
+#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161
+msgid "Predefined"
+msgstr "Predefinido"
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52
 msgid "Quality Forms"
 msgstr "Formularios de calidad"
 
@@ -245,7 +261,7 @@ msgstr "Resumen"
 msgid "Order sequences"
 msgstr "Secuencias de pedido"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:254
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:255
 msgid "Exportation options"
 msgstr "Opciones de exportación"
 
@@ -261,14 +277,14 @@ msgstr ""
 "No se pudo guardar el período de tiempo. El período se solapa con otro "
 "período de tiempo incompatible"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:83
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:87
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:47
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:32
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:562
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:309
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:732
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:354
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49
@@ -282,14 +298,14 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:38
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:24
-#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:25
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:32
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106
 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48
-#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:26
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:34
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:25
-#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:25
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26
 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40
 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:61
 #: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25
@@ -303,17 +319,17 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:54
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:73
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:26
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:71
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:76
 #: navalplanner-webapp/src/main/webapp/planner/main.zul:48
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:64
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:182
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:183
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:56
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:26
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:68
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37
 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:72
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:167
 #: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26
@@ -341,7 +357,7 @@ msgstr ""
 msgid "please, select an item"
 msgstr "por favor, seleccione un elemento"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:358
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:352
 msgid "Time Start cannot be null"
 msgstr "La hora de inicio no puede ser nula"
 
@@ -353,7 +369,7 @@ msgstr "Gráfico de dedicación"
 msgid "Day of week"
 msgstr "Día de la semana"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:470
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:477
 msgid "It not could remove the order element "
 msgstr "No se pudo borrar el elemento de pedido "
 
@@ -361,15 +377,15 @@ msgstr "No se pudo borrar el elemento de pedido "
 msgid "Not the same hours group, impossible to update"
 msgstr "No es el mismo grupo de horas, imposible actualizar"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:913
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1095
 msgid "Stretches with Interpolation"
 msgstr "Tramos con interpolación"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:120
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:120
 msgid "The end date cannot be before the init date"
 msgstr "La fecha de fin no puede ser anterior a la fecha de inicio"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:132
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:143
 msgid "cost assignment with end date less than start date"
 msgstr "la asignación de coste tiene fecha de fin anterior a la de inicio"
 
@@ -382,7 +398,11 @@ msgstr "Nombre de la categoría"
 msgid "Maximum/minimum of the worked hours"
 msgstr "Máximo/mínimo de las horas trabajadas"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:57
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:8
+msgid "Active period from"
+msgstr "Período activo desde"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:51
 msgid "hours type :"
 msgstr "tipo de horas :"
 
@@ -390,7 +410,7 @@ msgstr "tipo de horas :"
 msgid "Not the same material, impossible to update"
 msgstr "No es el mismo material, imposible actualizar"
 
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:63
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:67
 msgid "Quality form items list"
 msgstr "Lista de elementos del formulario de calidad"
 
@@ -398,19 +418,19 @@ msgstr "Lista de elementos del formulario de calidad"
 msgid "Name/Code"
 msgstr "Nombre/Código"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:585
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:743
 msgid "Create order"
 msgstr "Crear pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:189
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:222
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:197
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:229
 msgid ""
 "End date is not valid, the new end date must be later the current end date"
 msgstr ""
 "La fecha de fin no es válida, la nueva fecha de fin debe ser posterior a la "
 "actual"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:39
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:46
 msgid "Main menu"
 msgstr "Menú principal"
 
@@ -418,19 +438,19 @@ msgstr "Menú principal"
 msgid "cannot include an Advance of the same Advance type twice"
 msgstr "no se puede asignar un avance del mismo tipo dos veces"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:684
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:697
 msgid "Hour start"
 msgstr "Hora de inicio"
 
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:40
-#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39
-msgid "Create From Template"
-msgstr "Crear a partir de plantilla"
-
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:63
 msgid "Select print visualization options"
 msgstr "Seleccione las opciones de impresión de la visualización"
 
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42
+msgid "Create From Template"
+msgstr "Crear a partir de plantilla"
+
 #: navalplanner-webapp/src/main/webapp/planner/main.zul:52
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:68
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:149
@@ -441,7 +461,7 @@ msgstr "Comienzo"
 msgid "There exists other workReportType with the same name."
 msgstr "Ya existe otro tipo de parte de trabajo con el mismo nombre."
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:107
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118
 msgid "cost assignment's category not specified"
 msgstr "categoría de la asignación de coste no especificada"
 
@@ -449,7 +469,7 @@ msgstr "categoría de la asignación de coste no especificada"
 msgid "Delete Template element"
 msgstr "Borrar elemento de plantilla"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:121
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:122
 #: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:28
 msgid "Schedule"
 msgstr "Planificar"
@@ -458,10 +478,17 @@ msgstr "Planificar"
 msgid "Unexpected: {0}"
 msgstr "Inesperado: {0}"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:113
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:128
 msgid "worker's NIF not specified"
 msgstr "NIF del trabajador no especificado"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:111
+msgid ""
+"Complete, Partially or Not Scheduled. (Drag and drop to move order elements)"
+msgstr ""
+"Completa, parcialmente o no planificado. (Pinche y arrastre para mover "
+"elementos de pedido)"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DBUserDetailsService.java:65
 msgid "User with login name '{0}': not found"
 msgstr "Usuario con login '{0}': no encontrado"
@@ -475,12 +502,12 @@ msgstr "Capacidad de recursos"
 msgid "Notes"
 msgstr "Notas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:149
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:153
 msgid "The first stretch must be after the first day for doing interpolation"
 msgstr ""
 "El primer tramo debe estar después del primer día para hacer interpolación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:170
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:94
 msgid "changing perspective"
 msgstr "cambio de perspectiva"
 
@@ -488,7 +515,7 @@ msgstr "cambio de perspectiva"
 msgid "Filter quality forms by :"
 msgstr "Filtrar formularios de calidad por :"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:123
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:121
 msgid ""
 "Could not add those authorizations to profile {0} because they were already "
 "present."
@@ -500,7 +527,7 @@ msgstr ""
 msgid "Default calendar"
 msgstr "Calendario por defecto"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:76
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:70
 msgid "Order Element Code"
 msgstr "Código del elemento de pedido"
 
@@ -508,7 +535,7 @@ msgstr "Código del elemento de pedido"
 msgid "Changes saved"
 msgstr "Cambios guardados"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:766
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:931
 msgid "See scheduling"
 msgstr "Ver planificación"
 
@@ -521,7 +548,7 @@ msgstr ""
 "actualizar la tabla de secuencia de pedido. Por favor, inténtelo otra vez "
 "luego"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:238
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:233
 msgid "Work report saved"
 msgstr "Parte de trabajo guardado"
 
@@ -542,6 +569,10 @@ msgstr "Relación"
 msgid "End"
 msgstr "Fin"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:967
+msgid "The date is not valid, the date must be not empty"
+msgstr "La fecha no es válida, no debe ser vacía"
+
 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:25
 msgid "User login name"
 msgstr "Nombre de usuario"
@@ -551,16 +582,16 @@ msgstr "Nombre de usuario"
 msgid "Materials needs at date"
 msgstr "Necesidades de materiales en fecha"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:134
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:156
 msgid "criterion type not specified"
 msgstr "tipo de criterio no especificado"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:275
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:522
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:539
 msgid "Indent"
 msgstr "Indentar"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:144
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142
 msgid "must be not empty"
 msgstr "no puede ser vacío"
 
@@ -572,13 +603,13 @@ msgstr "Mostrar todas las asignaciones de recursos"
 msgid "New template"
 msgstr "Plantilla nueva"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java:97
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java:97
 msgid "type code has to be unique. It is already used"
 msgstr "el código del tipo debe ser único. Ya está en uso"
 
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:44
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:41
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:54
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:51
 msgid "Task quality forms"
 msgstr "Formularios de calidad de tarea"
 
@@ -602,7 +633,7 @@ msgstr "El advanceType no puede ser modificado"
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:70
 msgid "New quality form item"
 msgstr "Nuevo elemento del formulario de calidad"
 
@@ -617,7 +648,7 @@ msgstr "Asignación de recursos"
 msgid "Templates list"
 msgstr "Lista de plantillas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:167
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:170
 msgid "please, select a quality form"
 msgstr "por favor, seleccione un formulario de calidad"
 
@@ -625,11 +656,11 @@ msgstr "por favor, seleccione un formulario de calidad"
 msgid "Exist other workReportType with the same code."
 msgstr "Ya existe otro tipo de parte de trabajo con el mismo código."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:139
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:143
 msgid "For interpolation at least two stretches are needed"
 msgstr "Para interpolar se necesitan al menos dos tramos"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:660
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:673
 msgid "Order Code"
 msgstr "Código de pedido"
 
@@ -649,17 +680,16 @@ msgstr "Código de referencia del cliente"
 msgid "Add New Label Type Field"
 msgstr "Añadir nuevo campo de tipo de etiqueta"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:12
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:14
 msgid "Current"
 msgstr "Actual"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:366
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:360
 msgid "Time finish cannot be null"
 msgstr "La hora de fin no puede ser nula"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:96
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:108
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:32
 msgid "Customer reference"
 msgstr "Referencia de cliente"
 
@@ -668,10 +698,12 @@ msgid "Dependencies"
 msgstr "Dependencias"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:102
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:491
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:511
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:520
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:541
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:474
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:519
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:606
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:637
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:646
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:681
 msgid "Information"
 msgstr "Información"
 
@@ -679,11 +711,11 @@ msgstr "Información"
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:155
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:174
 msgid "Worker saved"
 msgstr "Trabajador guardado"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:931
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1008
 msgid ""
 "there exist criterion satisfactions referring to criterion types not "
 "applicable to this resource"
@@ -695,16 +727,17 @@ msgstr ""
 msgid "Create new advance type"
 msgstr "Crear un nuevo tipo de avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:239
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:251
 msgid "can not pass until the previous item is passed."
 msgstr "no se puede pasar mientras el elemento no anterior sea pasado."
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:41
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:39
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:61
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:47
 msgid "Criterion Requirement"
 msgstr "Criterio requerido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementModel.java:320
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:205
 msgid "New hours group "
 msgstr "Nuevo grupo de horas "
 
@@ -720,14 +753,14 @@ msgstr "Planificación de la compañía"
 msgid "Filter by orders"
 msgstr "Filtrar por pedidos"
 
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:21
-msgid "Navalpro: Configuration"
-msgstr "Navalpro: Configuración"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:443
 msgid "percentage cannot be duplicated"
 msgstr "el porcentaje no puede estar duplicado"
 
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:21
+msgid "Navalpro: Configuration"
+msgstr "Navalpro: Configuración"
+
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26
 msgid "Heading"
 msgstr "Cabecera"
@@ -740,7 +773,7 @@ msgstr "Crear versión nueva"
 msgid "Derived"
 msgstr "Derivado"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:181
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:226
 msgid "a disabled resource has enabled subresources"
 msgstr "un recurso deshabilitado tiene subrecursos habilitados"
 
@@ -753,27 +786,31 @@ msgstr "Cliente"
 msgid "Add new advance assignment"
 msgstr "Añadir nueva asignación de avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:130
-msgid "there exist multiple calendars with name {0}"
-msgstr "existen múltiples calendarios con el nombre {0}"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:234
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:266
 msgid "Could not save machine"
 msgstr "No se pudo guardar la máquina"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:73
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:81
 msgid "Unable to convert value to {0} type"
 msgstr "No se pudo convertir el valor a tipo {0}"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:174
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:179
 msgid "Worker must be not-null"
 msgstr "El trabajador no debe ser nulo"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:846
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:460
+msgid ""
+"there are no resources for required criteria: {0}. So the generic allocation "
+"can't be added"
+msgstr ""
+"no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede "
+"añadir la asignación genérica"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:923
 msgid "Some criterion satisfactions overlap in time"
 msgstr "Algunos criterios satisfechos se solapan en el tiempo"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:120
+#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:120
 msgid "material category name has to be unique. It is already used"
 msgstr "el nombre de la categoría de materiales debe ser único. Ya está en uso"
 
@@ -791,17 +828,19 @@ msgid "Confirm deleting this hour cost. Are you sure?"
 msgstr "Confirmar el borrado de este coste por hora. ¿Está seguro?"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:133
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:96
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:116
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:101
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:128
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:307
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:389
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:411
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:458
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:466
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:752
+#, java-format
 msgid "{0} already exists"
 msgstr "{0} ya existe"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:231
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:250
 msgid "Create Worker"
 msgstr "Crear trabajador"
 
@@ -809,7 +848,7 @@ msgstr "Crear trabajador"
 msgid "Delete Milestone"
 msgstr "Borrar hito"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:510
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:636
 msgid "The order has no scheduled elements"
 msgstr "El pedido no tiene elementos planificados"
 
@@ -821,7 +860,7 @@ msgstr "Ubicaciones no asignadas"
 msgid "Code "
 msgstr "Código"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:380
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:405
 msgid ""
 "The {0} is not valid, criterionType overlaps with other "
 "criterionSatisfaction from the same criterionType"
@@ -829,7 +868,7 @@ msgstr ""
 "{0} no es válido, criterionType se solapa con otro criterionSatisfaction del "
 "mismo criterionType"
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:74
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75
 msgid "Application URI"
 msgstr "URI de la aplicación"
 
@@ -841,11 +880,11 @@ msgstr "Tamaño del papel"
 msgid "Password confirmation"
 msgstr "Confirmación de contraseña"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:851
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1033
 msgid "None"
 msgstr "Ninguno"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:81
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:75
 msgid "Work Report"
 msgstr "Parte de trabajo"
 
@@ -854,20 +893,20 @@ msgstr "Parte de trabajo"
 msgid "Scheduling progress per order"
 msgstr "Progreso de la planificación por pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:952
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1137
 msgid "Configure"
 msgstr "Configurar"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:120
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:132
 msgid "Work"
 msgstr "Trabajo"
 
 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:25
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:32
 msgid "First name"
 msgstr "Nombre"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:201
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:221
 msgid "Could not execute print command"
 msgstr "No se pudo ejecutar el comando de impresión"
 
@@ -875,8 +914,9 @@ msgstr "No se pudo ejecutar el comando de impresión"
 msgid "Complementary text fields"
 msgstr "Campos de texto complementario"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:92
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:119
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:408
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:389
 #: navalplanner-webapp/src/main/webapp/common/event_error.zul:21
 msgid "Error"
 msgstr "Error"
@@ -885,7 +925,7 @@ msgstr "Error"
 msgid "Cost Performance Index"
 msgstr "Eficiencia en coste"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:153
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:161
 msgid ""
 "Criterion is not valid, the criterion overlap other criterionSatisfaction "
 "whith same criterion"
@@ -893,11 +933,12 @@ msgstr ""
 "Criterion no es válido, otro criterionSatisfaction se solapa con el mismo "
 "criterion"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:194
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1113
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:189
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1080
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:204
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:195
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:477
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:198
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:592
 msgid "Confirm deleting {0}. Are you sure?"
 msgstr "Confirmar el borrado de {0}. ¿Está seguro?"
 
@@ -905,11 +946,15 @@ msgstr "Confirmar el borrado de {0}. ¿Está seguro?"
 msgid "ETC"
 msgstr "ETC"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:52
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:59
 msgid "Log out"
 msgstr "Salir"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:69
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:53
+msgid "Edit template"
+msgstr "Editar plantilla"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:81
 msgid "External code"
 msgstr "Código externo"
 
@@ -921,7 +966,7 @@ msgstr "Añadir nueva unidad de configuración"
 msgid "Main preferences"
 msgstr "Preferencias principales"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:154
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:161
 msgid ""
 "Criterion is not valid, it overlaps other criterionSatisfaction with the "
 "same criterion"
@@ -929,10 +974,6 @@ msgstr ""
 "Criterion no válido, otro criterionSatisfaction se solapa con el mismo "
 "criterionType"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:214
-msgid "The order {0} must be scheduled"
-msgstr "El pedido {0} debe ser planificado"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:165
 msgid "Label type saved"
 msgstr "Tipo de etiqueta guardado"
@@ -945,7 +986,7 @@ msgstr "Añadir nueva asignación de trabajador"
 msgid "View"
 msgstr "Ver"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:475
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:482
 msgid "resources per day must be not empty and bigger than zero"
 msgstr "los recursos por día deben ser no vacíos y mayores que cero"
 
@@ -953,20 +994,19 @@ msgstr "los recursos por día deben ser no vacíos y mayores que cero"
 msgid "Show dependencies:"
 msgstr "Mostrar dependencias:"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:128
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:130
 msgid "Hours Group at "
 msgstr "Grupo de horas en "
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:267
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:94
-msgid "Up"
-msgstr "Arriba"
-
 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:23
 msgid "Edit type of work hour"
 msgstr "Editar tipo de horas de trabajo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:158
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:98
+msgid "Up"
+msgstr "Arriba"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:165
 msgid ""
 "CriterionType is not valid, it overlaps other criterionSatisfaction with the "
 "same criterionType"
@@ -978,6 +1018,12 @@ msgstr ""
 msgid "Work Report types"
 msgstr "Tipos de partes de trabajo"
 
+#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:26
+msgid "Your session has expired after inactivity period. Please log in again."
+msgstr ""
+"Su sesión ha expirado tras un tiempo de inactividad. Por favor, inicie "
+"sesión de nuevo."
+
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:134
 msgid "Total Estimated hours"
 msgstr "Horas totales estimadas"
@@ -1003,15 +1049,28 @@ msgstr "Lista de trabajadores virtuales"
 msgid "Name cannot be null or empty"
 msgstr "El nombre no puede ser nulo o vacío"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:129
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:133
 msgid "Some stretch has higher or equal values than the previous stretch"
 msgstr "Algún tramo tiene valores mayores o iguales que el tramo anterior"
 
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:107
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:118
+msgid "Total hours order element"
+msgstr "Total de horas del elemento de pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:140
+msgid ""
+"Value is not valid, the default max value must be greater than the precision "
+"value "
+msgstr ""
+"El valor no es válido, el valor máximo por defecto debe ser mayor que el "
+"valor de precisión"
+
 #: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:16
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:250
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:251
 msgid "End date"
 msgstr "Fecha de fin"
 
@@ -1027,11 +1086,11 @@ msgstr "Crear pedido"
 msgid "Cost Variance"
 msgstr "Desviación en coste"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:343
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:432
 msgid "criterion type does not allow resource hierarchy"
 msgstr "el tipo de criterio no permite jerarquía de recursos"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:130
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:142
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:53
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:79
 msgid "Total"
@@ -1041,7 +1100,7 @@ msgstr "Total"
 msgid "A1"
 msgstr "A1"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87
 msgid "profile name is already being used by another profile"
 msgstr "el nombre del perfil ya está siendo usado por otro perfil"
 
@@ -1056,7 +1115,7 @@ msgid "E-mail"
 msgstr "Correo electrónico"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:198
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:86
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:95
 msgid "Invalidate"
 msgstr "Invalidar"
 
@@ -1068,7 +1127,7 @@ msgstr "Lista de formularios de calidad"
 msgid "Order Details"
 msgstr "Detalles de pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:511
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:610
 #: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:120
 msgid "Criteria"
@@ -1098,8 +1157,7 @@ msgstr "Líneas"
 msgid "Orders List"
 msgstr "Lista de pedidos"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1221
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1542
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1487
 msgid "OrderElement not found"
 msgstr "OrderElement no encontrado"
 
@@ -1108,17 +1166,29 @@ msgid "Error on showing warning message removing workReportType: "
 msgstr ""
 "Error al mostrar mensaje de advertencia borrando tipo de parte de trabajo: "
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:461
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:247
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:304
+msgid ""
+"Another order element in the same branch is already reporting advance for "
+"this quality form"
+msgstr ""
+"Otro elemento de pedido en la misma rama ya está informando de un avance "
+"para este formulario de calidad"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:506
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:259
 msgid "must be greater than the previous date."
 msgstr "debe ser mayor que la fecha anterior"
 
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:21
+msgid "NavalPlan: Advanced allocation"
+msgstr "NavalPlan: Asignación avanzada"
+
 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29
 msgid "Personal data"
 msgstr "Datos personales"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:498
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1375
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1317
 msgid "Show all"
 msgstr "Mostrar todo"
 
@@ -1130,6 +1200,10 @@ msgstr "Partes de trabajo"
 msgid "A4"
 msgstr "A4"
 
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41
+msgid "Save Order"
+msgstr "Guardar pedido"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:92
 msgid "{0} annotation required on {1}"
 msgstr "{0} anotación obligatoria en {1}"
@@ -1143,7 +1217,7 @@ msgstr "Precio por defecto"
 msgid "Estimated hours"
 msgstr "Horas estimadas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:597
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:624
 msgid "Modified"
 msgstr "Modificado"
 
@@ -1151,24 +1225,20 @@ msgstr "Modificado"
 msgid "Edit virtual resource"
 msgstr "Editar recurso virtual"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:208
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:209
 msgid "Apply tab changes"
 msgstr "Aplicar cambios de la pestaña"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:190
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212
 msgid "Add Criterion"
 msgstr "Añadir criterio"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:196
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:201
 msgid "Fattened Tree {0}"
 msgstr "Árbol aplanado {0}"
 
-#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:10
-msgid "include order elements"
-msgstr "incluir elementos de pedido"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:249
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:62
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:268
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:67
 msgid "MessagesContainer is needed"
 msgstr "Es necesario un MessagesContainer"
 
@@ -1178,14 +1248,14 @@ msgstr "las contraseñas no conciden"
 
 #: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:21
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:19
 #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60
 msgid "Ending date"
 msgstr "Fecha de fin"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:262
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:263
 msgid "Hours groups"
 msgstr "Grupos de horas"
 
@@ -1202,7 +1272,7 @@ msgstr "Administrar categorías de coste"
 msgid "Last value"
 msgstr "Último valor"
 
-#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:31
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:33
 msgid "Create new order"
 msgstr "Crear pedido nuevo"
 
@@ -1210,7 +1280,7 @@ msgstr "Crear pedido nuevo"
 msgid "General resource allocation"
 msgstr "Asignación de recursos general"
 
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65
 msgid "Statistics log"
 msgstr "Histórico de estadísticas"
 
@@ -1230,11 +1300,15 @@ msgstr "Consulta de partes de trabajo"
 msgid "Cannot be empty or null"
 msgstr "No puede ser vacío o nulo"
 
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:32
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:229
+msgid "filtering"
+msgstr "filtrado"
+
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33
 msgid "Total Budget"
 msgstr "Presupuesto total"
 
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:49
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:50
 msgid "Hierarchy"
 msgstr "Jerarquía"
 
@@ -1247,10 +1321,6 @@ msgstr "Fecha de referencia"
 msgid "Print configuration"
 msgstr "Imprimir configuración"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:66
-msgid "C"
-msgstr "C"
-
 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:26
 msgid "Overload due to other assignments"
 msgstr "Sobrecarga debido a otras asignaciones"
@@ -1263,10 +1333,6 @@ msgstr "Período de tiempo guardado"
 msgid "CV"
 msgstr "CV"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:264
-msgid "Not Unindent"
-msgstr "No desindentar"
-
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30
 msgid "Stretches function configuration"
 msgstr "Configuración de la función de tramos"
@@ -1275,12 +1341,17 @@ msgstr "Configuración de la función de tramos"
 msgid "Week"
 msgstr "Semana"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:25
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:22
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:39
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34
 msgid "Filter work report by :"
 msgstr "Filtrar parte de trabajo por :"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:86
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:264
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:278
+msgid "Not indentable"
+msgstr "No indentable"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:92
 msgid "User disabled"
 msgstr "Usuario deshabilitado"
 
@@ -1297,36 +1368,31 @@ msgstr "Asociación con perfiles"
 msgid "Workers"
 msgstr "Trabajadores"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:908
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:42
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:475
+msgid "end date: {0} must be after start date: {1}"
+msgstr "fecha de fin: {0} debe ser posterior a la fecha de inicio {1}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48
 #: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35
 msgid "Order element code"
 msgstr "Código del elemento de pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:468
-msgid "end date: {0} must be after start date: {1}"
-msgstr "fecha de fin: {0} debe ser posterior a la fecha de inicio {1}"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:216
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:222
 msgid "Advance measurements: "
 msgstr "Medidas de avance: "
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:100
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:115
 msgid "worker's surname not specified"
 msgstr "apellidos del trabajador no especificados"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47
-#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40
-msgid "Save changes"
-msgstr "Guardar cambios"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:207
 msgid "Error on removing workReportType: "
 msgstr "Error al borrar tipo de parte de trabajo: "
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:171
-msgid "code is used by another machine being imported"
-msgstr "código usado por otra máquina que está siendo importada"
+#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47
+#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40
+msgid "Save changes"
+msgstr "Guardar cambios"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:114
 msgid "Total dedication"
@@ -1340,24 +1406,24 @@ msgstr "Año"
 msgid "Is subcontracted"
 msgstr "Está subcontratado"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66
 msgid "profile name not specified"
 msgstr "nombre del perfil no especificado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:842
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:924
 msgid "Value is not valid, the current value must be less than max value"
 msgstr ""
 "El valor no es válido, el valor actual debe ser menor que el valor máximo"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:228
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:60
+msgid "Date Start"
+msgstr "Fecha de inicio"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:229
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42
 msgid "Subcontratation date"
 msgstr "Fecha de subcontratación"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:47
-msgid "Date Start"
-msgstr "Fecha de inicio"
-
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:23
 msgid "Edit external company"
 msgstr "Editar empresa externas"
@@ -1367,10 +1433,6 @@ msgstr "Editar empresa externas"
 msgid "Day"
 msgstr "Día"
 
-#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3
-msgid "Filter by label:"
-msgstr "Filtrar por etiqueta:"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:202
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33
 msgid "Report advances"
@@ -1390,8 +1452,8 @@ msgstr "Costes por hora"
 msgid "Value"
 msgstr "Valor"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:798
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1081
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:814
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1053
 msgid "Please, select an item"
 msgstr "Por favor, seleccione un elemento"
 
@@ -1411,6 +1473,10 @@ msgstr ""
 msgid "Work report type saved"
 msgstr "Tipo de partes de trabajo guardado"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1003
+msgid "Cannot be higher than finish hour"
+msgstr "No puede ser mayor que la fecha de fin"
+
 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:79
 msgid "Prefix"
 msgstr "Prefijo"
@@ -1419,12 +1485,12 @@ msgstr "Prefijo"
 msgid "New Template element"
 msgstr "Nuevo elemento de plantilla"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:246
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:247
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46
 msgid "Subcontracted code"
 msgstr "Código subcontratado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:377
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:402
 msgid ""
 "The {0} can not be assigned to this resource. Its interval overlaps with "
 "other criterion"
@@ -1444,7 +1510,7 @@ msgstr "Índice de rendimiento de la planificación"
 msgid "Label types"
 msgstr "Tipos de etiqueta"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:449
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:481
 msgid "Create virtual resource"
 msgstr "Crear recurso virtual"
 
@@ -1452,7 +1518,7 @@ msgstr "Crear recurso virtual"
 msgid "Type data"
 msgstr "Datos del tipo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:349
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:343
 msgid "The order element code cannot be null"
 msgstr "El código del elemento de pedido no puede ser nulo"
 
@@ -1460,17 +1526,17 @@ msgstr "El código del elemento de pedido no puede ser nulo"
 msgid "Reassigning type"
 msgstr "Tipo de reasignación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:688
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:701
 msgid "Hour finish"
 msgstr "Hora de fin"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:62
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:69
 msgid "Perspectives"
 msgstr "Perspectivas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:902
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:114
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:39
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:47
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:117
+#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java:66
 msgid "Order"
 msgstr "Pedido"
 
@@ -1478,10 +1544,10 @@ msgstr "Pedido"
 msgid "The field name must be unique, not null and not empty"
 msgstr "El nombre del campo debe ser único, no nulo y no vacío"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:315
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:360
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:123
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:146
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:73
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77
 msgid "Position"
 msgstr "Posición"
 
@@ -1493,12 +1559,12 @@ msgstr "Error al borrar elemento: "
 msgid "Company name"
 msgstr "Nombre de la empresa"
 
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:36
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:36
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:105
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:96
 msgid "Edit work report"
 msgstr "Editar parte de trabajo"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:91
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:97
 msgid "Incorrect authentication"
 msgstr "Identificación incorrecta"
 
@@ -1510,11 +1576,15 @@ msgstr "Todas las tareas del pedido"
 msgid "Value last advance measurement"
 msgstr "Valor última medida de avance"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:714
+msgid "{0}"
+msgstr "{0}"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:758
 msgid "A description field of the same name already exists."
 msgstr "Ya existe un campo de descripción con el mismo nombre."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:456
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:458
 msgid "Split new assignment"
 msgstr "Dividir nueva asignación"
 
@@ -1522,12 +1592,13 @@ msgstr "Dividir nueva asignación"
 msgid "Current value"
 msgstr "Valor actual"
 
-#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:36
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:47
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:51
 msgid "Zoom level"
 msgstr "Nivel de zoom"
 
 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:27
+#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:159
 msgid "Quality form"
 msgstr "Formulario de calidad"
 
@@ -1552,10 +1623,6 @@ msgstr "Configuración"
 msgid "Categories"
 msgstr "Categorías"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:80
-msgid "Unscheduled"
-msgstr "No planificado"
-
 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:110
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:125
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:143
@@ -1566,15 +1633,15 @@ msgstr "No planificado"
 msgid " to go to output directly"
 msgstr " ir a la salida directamente"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:144
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:163
 msgid "Add new hours group"
 msgstr "Añadir nuevo grupo de horas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:319
-#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:364
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:79
 msgid "Percentage"
 msgstr "Porcentaje"
 
@@ -1582,7 +1649,7 @@ msgstr "Porcentaje"
 msgid "Manage criteria"
 msgstr "Gestionar criterios"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:69
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70
 msgid "Total order element hours"
 msgstr "Total de horas en elementos de pedido"
 
@@ -1590,18 +1657,10 @@ msgstr "Total de horas en elementos de pedido"
 msgid "Calculation type"
 msgstr "Tipo de cálculo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:136
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134
 msgid "Updated"
 msgstr "Actualizado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:116
-msgid ""
-"Value is not valid, the Precision value must be less than the defalt max "
-"value and not null"
-msgstr ""
-"El valor no es válido, el valor de precisión debe ser menor que el valor "
-"máximo por defecto y no debe ser nulo"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:130
 msgid "No worker selected"
 msgstr "Ningún trabajador seleccionado"
@@ -1615,8 +1674,8 @@ msgstr "Número de dígitos"
 msgid "Total capability"
 msgstr "Capacidad total"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:471
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:635
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:476
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:640
 msgid "Hours invested"
 msgstr "Horas invertidas"
 
@@ -1624,13 +1683,13 @@ msgstr "Horas invertidas"
 msgid "Navalpro: Calendars"
 msgstr "Navalpro: Calendarios"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:467
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:634
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:517
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:472
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:639
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:617
 msgid "Advance"
 msgstr "Avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:233
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:237
 msgid "Problems connecting with client web service"
 msgstr "Problemas al conectar con el servicio web cliente"
 
@@ -1651,26 +1710,30 @@ msgstr "Fecha último avance notificado"
 msgid "Exception Type"
 msgstr "Tipo de excepción"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:206
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:220
 msgid "criterion satisfaction's resource not specified"
 msgstr "recurso del criterio satisfecho no especificado"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202
+msgid "Advances sent successfully"
+msgstr "Avances enviados con éxito"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:461
 msgid "Derived exception"
 msgstr "Excepción derivada"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:224
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:476
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:646
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:501
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:56
-#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:31
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:258
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:38
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:215
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:481
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:651
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:597
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:259
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:186
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:206
 msgid "both {0} of category {1} and {2} of category {3} have the same code"
 msgstr ""
 "{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código"
@@ -1691,11 +1754,11 @@ msgstr "Confirmar el borrado de este perfil. ¿Está seguro?"
 msgid "Navalpro: AdvanceTypes"
 msgstr "Navalpro: AdvanceTypes"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:135
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:147
 msgid "Total hours"
 msgstr "Total de horas"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:29
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:41
 msgid "Resource :"
 msgstr "Recurso :"
 
@@ -1703,20 +1766,15 @@ msgstr "Recurso :"
 msgid "Filter by task status"
 msgstr "Filtrar por estado de tarea"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:906
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:41
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48
 msgid "Order element"
 msgstr "Elemento de pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:289
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:378
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:298
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:450
 msgid "Select date:"
 msgstr "Seleccione fecha:"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:155
-msgid "Doing Reassignation"
-msgstr "Realizando reasignación"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:197
 msgid "Company view"
 msgstr "Vista de la compañía"
@@ -1746,26 +1804,30 @@ msgstr "Código de la empresa"
 msgid "Unknown attribute '{0}' in class {1}"
 msgstr "Atributo desconocido '{0}' en la clase {1}"
 
-#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:2
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:2
 msgid "Filter by"
 msgstr "Filtrar por"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:281
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:282
 msgid "Calendar allocation"
 msgstr "Asignación de calendario"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:83
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:96
 msgid "machine name not specified"
 msgstr "nombre de la máquina no especificado"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:136
+msgid "Choose a order element from which create a template from"
+msgstr "Elija un elemento de pedido a partir del cual crear una plantilla"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:87
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:127
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:171
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174
 msgid "already assigned"
 msgstr "ya asignado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:323
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:368
 msgid "Passed"
 msgstr "Pasado"
 
@@ -1794,7 +1856,7 @@ msgstr "debe ser mayor que la fecha de fin"
 
 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33
 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:111
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:123
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -1804,7 +1866,7 @@ msgstr "Calendario"
 msgid "Resources"
 msgstr "Recursos"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:283
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:404
 msgid "[generic all workers]"
 msgstr "[genérico todos los trabajadores]"
 
@@ -1821,7 +1883,7 @@ msgstr "Leer"
 msgid "Search"
 msgstr "Buscar"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:227
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:232
 msgid "CriterionType and its criteria saved"
 msgstr "CriterionType y sus criterios guardados"
 
@@ -1829,8 +1891,10 @@ msgstr "CriterionType y sus criterios guardados"
 msgid "Add New Complementary Field"
 msgstr "Añadir nuevo campo complementario"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:36
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:55
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:49
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:10
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:9
 #: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:8
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:195
 msgid "to"
@@ -1845,10 +1909,15 @@ msgstr "Borrar calendario"
 msgid "%"
 msgstr "%"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1442
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1604
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1384
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1548
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:562
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:483
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:831
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:180
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:266
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:676
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:996
 msgid "must be lower than finish date"
 msgstr "debe ser menor que la fecha de fin"
 
@@ -1856,15 +1925,16 @@ msgstr "debe ser menor que la fecha de fin"
 msgid "Order Element"
 msgstr "Elemento de pedido"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:91
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:106
 msgid "worker's first name not specified"
 msgstr "nombre del trabajador no especificado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:653
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:666
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:239
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:46
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:128
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:69
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:119
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:71
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:75
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33
 msgid "Resource"
 msgstr "Recurso"
@@ -1873,7 +1943,7 @@ msgstr "Recurso"
 msgid "Could not load any resource"
 msgstr "No se pudo cargar un recurso"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:254
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266
 msgid "date not specified"
 msgstr "fecha no especificada"
 
@@ -1881,11 +1951,11 @@ msgstr "fecha no especificada"
 msgid "Material search"
 msgstr "Búsqueda de materiales"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:78
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:91
 msgid "Select type :"
 msgstr "Seleccione tipo :"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:337
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:342
 msgid ""
 "You must allow multiple active criteria for this type to use this assignment "
 "strategy"
@@ -1893,13 +1963,17 @@ msgstr ""
 "Debe permitir múltiples criterios activos para este tipo para usar esta "
 "estrategia de asignación"
 
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:55
-#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:30
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:37
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:43
 msgid "Advances"
 msgstr "Avances"
 
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:10
+msgid "sub elements"
+msgstr "sub elementos"
+
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73
 msgid "Shrink to fit page width"
 msgstr "Reducir para ajustar al ancho de página"
@@ -1909,8 +1983,8 @@ msgid "Default Label"
 msgstr "Etiqueta por defecto"
 
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:176
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:76
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:200
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:77
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:201
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1923,6 +1997,10 @@ msgstr "Apellidos"
 msgid "Remove"
 msgstr "Borrar"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:215
+msgid "cost category name not specified"
+msgstr "nombre de la categoría de coste no especificado"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:354
 msgid "Create copy"
 msgstr "Crear copia"
@@ -1964,15 +2042,11 @@ msgstr "Nombre nombre"
 msgid "Edit quality form"
 msgstr "Editar formulario de calidad"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:127
-msgid "{0}: calendar not found"
-msgstr "{0}: calendario no encontrado"
-
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93
 msgid "Hours Management"
 msgstr "Administración de horas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:928
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1110
 msgid "Interpolation"
 msgstr "Interpolación"
 
@@ -1985,24 +2059,21 @@ msgstr "Tareas subcontratadas"
 msgid "{0} must not be before {1}"
 msgstr "{0} no debe estar antes de {1}"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:453
-msgid ""
-"there are no workers for required criteria: {0}. So the generic allocation "
-"can't be added"
-msgstr ""
-"no hay trabajadores con los criterios solicitados: {0}. Por tanto, no se "
-"puede añadir la asignación genérica"
-
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146
+#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146
 msgid "company name has to be unique. It is already used"
 msgstr "el nombre de la empresa debe ser único. Ya está siendo usado"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:200
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:213
+msgid "Template saved"
+msgstr "Plantilla guardada"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:375
 msgid "the code must be not null or not empty"
 msgstr "el código no puede ser nulo o vacío"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:213
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:199
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:221
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:206
 msgid ""
 "Start date is not valid, the new start date must be previous the current "
 "start date"
@@ -2014,7 +2085,7 @@ msgstr ""
 msgid "Type of day"
 msgstr "Tipo de día"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:890
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1072
 msgid "Stretches list"
 msgstr "Lista de tramos"
 
@@ -2026,16 +2097,16 @@ msgstr "Usuario guardado"
 msgid "Task quality form name"
 msgstr "Nombre del formulario de calidad de tarea"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:876
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:953
 msgid "Some cost category assignments overlap in time"
 msgstr "Algunas asignaciones a categorías de coste se solapan en el tiempo"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:242
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:37
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:179
 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36
 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:37
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:72
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:169
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:73
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:36
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:38
@@ -2045,17 +2116,16 @@ msgstr "Algunas asignaciones a categorías de coste se solapan en el tiempo"
 #: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:39
 #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:44
 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:77
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:99
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100
 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:128
 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40
 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:88
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:69
 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:92
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:117
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:174
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:120
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:126
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:124
 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40
 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44
 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135
@@ -2066,6 +2136,7 @@ msgstr "Guardar"
 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:30
 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:52
 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:66
+#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java:281
 msgid "Group"
 msgstr "Grupo"
 
@@ -2074,10 +2145,10 @@ msgstr "Grupo"
 msgid "Exit session"
 msgstr "Salir de la sesión"
 
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:54
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:55
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:25
-#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45
 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57
@@ -2093,11 +2164,11 @@ msgstr "Lista de estadísticas "
 msgid "Navalpro: QualityForms"
 msgstr "Navalpro: Formularios de calidad"
 
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39
 msgid "Edit advance type data"
 msgstr "Editar datos del tipo de avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:133
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:131
 msgid "Pending update"
 msgstr "Actualización pendiente"
 
@@ -2109,16 +2180,21 @@ msgstr "Fecha de fin:"
 msgid "Criterion previously selected"
 msgstr "Criterio seleccionado previamente"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:76
-msgid "Completely scheduled"
-msgstr "Completamente planificado"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:938
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:985
+msgid ""
+"Value is not valid, the value must be greater than the value of the previous "
+"advances."
+msgstr ""
+"El valor no es válido, el valor debe ser mayor que el valor de los avances "
+"anteriores."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:301
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:295
 msgid "Order Element code cannot be null"
 msgstr "El código del elemento de pedido no puede ser nulo"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:38
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:36
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:41
 msgid "Assigned hours"
 msgstr "Horas asignadas"
 
@@ -2131,7 +2207,7 @@ msgstr "Estado de las tareas de planificacion de un pedido"
 msgid "Users authorization"
 msgstr "Autorización de usuarios"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:827
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1009
 msgid "You are going to change the assignment function. Are you sure?"
 msgstr "Va a cambiar la función de asignación. ¿Está seguro?"
 
@@ -2139,7 +2215,7 @@ msgstr "Va a cambiar la función de asignación. ¿Está seguro?"
 msgid "Problems connecting with subcontractor web service"
 msgstr "Problemas conectando con el servicio web subcontratista"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:144
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:148
 msgid "There must be at least 2 stretches for doing interpolation"
 msgstr "Debe haber al menos dos tramos para hacer interpolación"
 
@@ -2147,6 +2223,10 @@ msgstr "Debe haber al menos dos tramos para hacer interpolación"
 msgid "Show all labels"
 msgstr "Mostrar todas las etiquetas"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:257
+msgid "Incompatible update: stored resource is not of type: {0}"
+msgstr "Actualización incompatible: el recurso almacenado no es de tipo: {0}"
+
 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38
 msgid "Assigned load"
 msgstr "Carga asignada"
@@ -2159,15 +2239,16 @@ msgstr "Filtrar por trabajadores"
 msgid "End Date"
 msgstr "Fecha de fin"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:38
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:60
-#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:7
-#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:13
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:51
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:54
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:12
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:2
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:2
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29
 msgid "Filter"
 msgstr "Filtrar"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:186
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:187
 msgid "Resources Per Day"
 msgstr "Recursos por día"
 
@@ -2176,30 +2257,35 @@ msgstr "Recursos por día"
 msgid "ResourceType must be not-null"
 msgstr "ResourceType no debe ser nulo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionServiceREST.java:103
-msgid "criterion type name is used by another criterion type being imported"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:94
+msgid ""
+"Estimated end date for the task (press enter in textbox to open calendar "
+"popup or type in date directly)"
 msgstr ""
-"el nombre de tipo de criterio está siendo usado por otro tipo de criterio "
-"importado"
+"Fecha de fin estimada para la tarea (presione enter en el cuadro de texto "
+"para abrir el calendario o escriba la fecha directamente)"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:413
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:519
 msgid "Order saved"
 msgstr "Pedido guardado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:458
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:475
 msgid "Move down"
 msgstr "Mover abajo"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:471
+msgid "Name: {0}"
+msgstr "Nombre: {0}"
+
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:26
 msgid "Report structure"
 msgstr "Estructura del parte"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:84
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:84
 msgid "password not specified"
 msgstr "contraseña no especificada"
 
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:49
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:50
 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:56
 msgid "Yes"
 msgstr "Sí"
@@ -2208,8 +2294,8 @@ msgstr "Sí"
 msgid "Assigned locations"
 msgstr "Ubicaciones asignadas"
 
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:53
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:36
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:57
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39
 msgid "General data"
 msgstr "Datos generales"
 
@@ -2221,32 +2307,37 @@ msgstr "Horas trabajadas por trabajador"
 msgid "BAC"
 msgstr "BAC"
 
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:13
+msgid "Apply filtering to machines satisfying required criteria"
+msgstr ""
+"Aplicar filtrado a las máquinas que satisfacen los criterios requeridos"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:301
 msgid "Calculate Number of Hours"
 msgstr "Calcular número de horas"
 
 #: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:294
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:295
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:80
 msgid "Assign"
 msgstr "Asignar"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:121
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:121
 msgid "Two hour costs with the same type overlap in time"
 msgstr "Dos costes por hora con el mismo tipo se solapan en el tiempo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:430
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:781
-#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:129
+msgid "missing code in a criterion"
+msgstr "falta código en un criterio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:500
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:946
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39
 msgid "Create Template"
 msgstr "Crear plantilla"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:70
-msgid "U"
-msgstr "N"
-
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:63
 msgid "Ok"
 msgstr "Aceptar"
@@ -2255,16 +2346,16 @@ msgstr "Aceptar"
 msgid "ACWP"
 msgstr "ACWP"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:164
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:168
 msgid "Advance type saved"
 msgstr "Tipo de avance guardado"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:42
+#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:48
 msgid "START"
 msgstr "INICIO"
 
-#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:68
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:74
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:81
 msgid "Back"
 msgstr "Atrás"
 
@@ -2279,26 +2370,26 @@ msgstr "Subcontratista"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:219
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:40
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:32
 msgid "Administration"
 msgstr "Administración"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:74
-msgid "machine code not specified"
-msgstr "código de máquina no especificado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1425
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1586
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:814
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1367
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1530
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:545
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:466
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:163
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:247
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:658
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:979
 msgid "must be greater than start date"
 msgstr "debe ser mayor que la fecha de inicio"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:63
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:161
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:177
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:371
 msgid "Service does not manage resource of type: {0}"
 msgstr "El servicio no gestiona recursos del tipo: {0}"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:21
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:35
 msgid "Work report listing"
 msgstr "Listado de partes de trabajo"
 
@@ -2315,12 +2406,12 @@ msgstr "Asignar formulario de calidad"
 msgid "Edit worker"
 msgstr "Editar trabajador"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:380
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:382
 msgid "Delete item {0}. Are you sure?"
 msgstr "Borrar elemento {0}. ¿Está seguro?"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:843
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1025
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:57
 msgid "Warning"
 msgstr "Advertencia"
@@ -2338,11 +2429,11 @@ msgstr "Horas del día"
 msgid "worked hours"
 msgstr "horas trabajadas"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:283
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297
 msgid "criterion satisfaction with end date less than start date"
 msgstr "el criterio satisfecho tiene fecha de fin anterior a la de inicio"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:905
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1087
 msgid "Stretches"
 msgstr "Tramos"
 
@@ -2362,25 +2453,29 @@ msgstr "Duración (días)"
 msgid "Assignment Type"
 msgstr "Tipo de asignación"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122
-msgid "Length"
-msgstr "Longitud"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:26
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33
 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:64
 msgid "Capacity"
 msgstr "Capacidad"
 
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122
+msgid "Length"
+msgstr "Longitud"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:337
 msgid "Create derived"
 msgstr "Crear derivado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:430
+#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:28
+msgid "Back to log in"
+msgstr "Volver a iniciar sesión"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:437
 msgid "it must be greater than zero"
 msgstr "debe ser mayor que cero"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:473
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:475
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:477
 msgid "Error on splitting"
 msgstr "Error al dividir"
 
@@ -2388,8 +2483,11 @@ msgstr "Error al dividir"
 msgid "must be a real positive number"
 msgstr "debe ser un número real positivo"
 
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:32
+msgid "No Allocations have been done"
+msgstr "No se han hecho asignaciones"
+
 #: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21
-#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:21
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21
 #: navalplanner-webapp/src/main/webapp/planner/main.zul:21
 #: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21
@@ -2402,7 +2500,7 @@ msgstr "Navalpro: planificación"
 msgid "Removed calendar \"{0}\""
 msgstr "Borrado calendario \"{0}\""
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:256
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:257
 msgid "Node without children"
 msgstr "Nodo sin hijos"
 
@@ -2423,7 +2521,15 @@ msgstr "Perfil guardado"
 msgid "Task properties"
 msgstr "Propiedades de la tarea"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:842
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:620
+msgid ""
+"You can not remove the order element \"{0}\" because of any of its order "
+"elements are already in use in some work reports"
+msgstr ""
+"No puede borrarse el elemento de pedido \"{0}\" porque uno de sus elementos "
+"se está usando en algún parte de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1024
 msgid "You need to select some function to configure"
 msgstr "Necesita seleccionar alguna función para configurar"
 
@@ -2432,15 +2538,16 @@ msgid "as soon as possible"
 msgstr "tan pronto como sea posible"
 
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:26
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:33
 msgid "Surname"
 msgstr "Apellidos"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:636
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:327
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:42
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:649
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:372
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:124
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:73
 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45
@@ -2457,7 +2564,7 @@ msgstr "Fecha"
 msgid "the name must be not null or not empty"
 msgstr "el nombre no puede ser nulo o vacío"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163
+#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163
 msgid "company NIF has to be unique. It is already used"
 msgstr "el NIF de la empresa debe ser único. Ya está siendo usado"
 
@@ -2467,7 +2574,7 @@ msgstr ""
 "Horas humanas por hora de trabajo de máquina dentro de unidad de "
 "configuración"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:112
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:110
 msgid ""
 "Could not add those authorizations to user {0} because they were already "
 "present."
@@ -2476,7 +2583,7 @@ msgstr ""
 "presentes."
 
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:46
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:86
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:99
 msgid "New work report"
 msgstr "Nuevo parte de trabajo"
 
@@ -2494,35 +2601,27 @@ msgstr "Asignaciones de avances"
 msgid "A3"
 msgstr "A3"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:48
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:61
 msgid "Date Finish"
 msgstr "Fecha de fin"
 
-#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:32
-msgid "Save order"
-msgstr "Guardar pedido"
-
-#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:25
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:30
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:41
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:33
 msgid "Edit order element"
 msgstr "Editar elemento de pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:329
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:333
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:314
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:337
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:340
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:306
 msgid "The criterion and its type cannot be null"
 msgstr "El criterio y su tipo no pueden ser nulos"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:200
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:82
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91
 msgid "Validate"
 msgstr "Validar"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:110
-msgid "Value is not valid, the default max value must not be null"
-msgstr "El valor no es válido, el valor máximo por defecto no debe ser nulo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:204
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:199
 msgid "Error on removing element: "
 msgstr "Error al borrar elemento: "
 
@@ -2540,11 +2639,11 @@ msgstr "No se pueden calcular gráficos para los datos actuales"
 msgid "Found workers"
 msgstr "Trabajadores encontrados"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:458
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:462
 msgid "All workers"
 msgstr "Todos los trabajadores"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:238
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:239
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48
 msgid "Work description"
 msgstr "Descripción del trabajo"
@@ -2558,6 +2657,8 @@ msgstr "Etiqueta guardada"
 msgid "Split assignment"
 msgstr "Dividir asignación"
 
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:3
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3
 #: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:3
 msgid "Select required criteria set and press filter button"
 msgstr ""
@@ -2570,9 +2671,24 @@ msgid ""
 msgstr ""
 "Al subcontratar esta tarea, todas sus asignaciones de recursos se borrarán."
 
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:100
-msgid "Down"
-msgstr "Abajo"
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:181
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:75
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:80
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:91
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:71
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:128
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:127
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82
+msgid "Save &amp; Continue"
+msgstr "Guardar y continuar"
 
 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:124
@@ -2584,24 +2700,13 @@ msgstr "Abajo"
 msgid "direct link"
 msgstr "enlace directo"
 
-#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37
-#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:74
-#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:80
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:101
-#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:91
-#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82
-#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:71
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:119
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:176
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:123
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137
-#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82
-msgid "Save &amp; Continue"
-msgstr "Guardar y continuar"
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104
+msgid "Down"
+msgstr "Abajo"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:928
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:40
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:47
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -2609,14 +2714,15 @@ msgstr "Etiqueta"
 msgid "Order costs per resource"
 msgstr "Costes de pedido por recurso"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:163
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:164
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:165
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:173
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:174
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:175
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:224
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:237
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:218
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:247
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:114
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:42
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48
@@ -2634,10 +2740,10 @@ msgstr "Costes de pedido por recurso"
 msgid "cannot be null or empty"
 msgstr "no puede ser nulo o vacío"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:378
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:448
 msgid "Value is not valid, taking into account the current list of HoursGroup"
 msgstr ""
-"El valor no es válido, teniendo en cuenta la lista actual de HoursGroup"
+"El valor no es válido, teniendo en cuenta la lista actual de grupos de horas"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:51
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:61
@@ -2658,28 +2764,28 @@ msgstr "Formularios de calidad"
 msgid "Calculate Resources per Day"
 msgstr "Calcular recursos por día"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:121
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:140
 msgid "Hours group"
 msgstr "Grupo de horas"
 
-#: navalplanner-webapp/src/main/webapp/templates/_list.zul:29
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:86
-msgid "Days from Beginning to Deadline"
-msgstr "Días desde el comienzo hasta la fecha límite"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:990
-msgid "The index fields and labels must be uniques and consecutives"
-msgstr "Los campos de índice y las etiquetas deben ser únicas y consecutivas"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59
 msgid "Estimate At Completion"
 msgstr "Estimación de coste total actual"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:990
+msgid "The index fields and labels must be uniques and consecutives"
+msgstr "Los campos de índice y las etiquetas deben ser únicas y consecutivas"
+
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:29
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:92
+msgid "Days from Beginning to Deadline"
+msgstr "Días desde el comienzo hasta la fecha límite"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:27
 msgid "Indirect"
 msgstr "Indirecto"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:233
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:237
 msgid ""
 "Are you sure of changing the resource type? You will lose the criterions "
 "with different resource type."
@@ -2691,7 +2797,7 @@ msgstr ""
 msgid "Estimate To Complete"
 msgstr "Estimación del coste pendiente"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:175
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:207
 msgid "Edit machine"
 msgstr "Editar máquina"
 
@@ -2701,11 +2807,7 @@ msgstr "Editar máquina"
 msgid "Delete item. Are you sure?"
 msgstr "Borrar elemento. ¿Está seguro?"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:29
-msgid "Assigned Criterion Requirements"
-msgstr "Criterios requeridos asignados"
-
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:90
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101
 msgid "cost assignment's start date not specified"
 msgstr "fecha de inicio de la asignación de coste no especificada"
 
@@ -2716,15 +2818,14 @@ msgstr "fecha de inicio de la asignación de coste no especificada"
 msgid "Unit type"
 msgstr "Tipo de unidad"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:904
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:40
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:47
 #: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:42
 msgid "Order code"
 msgstr "Código de pedido"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/Material.java:122
+#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/Material.java:122
 msgid "materialcode has to be unique. It is already used"
 msgstr "el código del material debe ser único. Ya está en uso"
 
@@ -2762,10 +2863,6 @@ msgstr "Se perderán los cambios. ¿Está seguro?"
 msgid "Orders list"
 msgstr "Lista de pedidos"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:130
-msgid "Value is not valid, the Precision value must not be null "
-msgstr "Valor inválido, el valor de precisión no debe ser nulo "
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:207
 msgid "Virtual worker groups"
 msgstr "Grupos de trabajadores virtuales"
@@ -2774,28 +2871,32 @@ msgstr "Grupos de trabajadores virtuales"
 msgid "Calendar data"
 msgstr "Datos del calendario"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:294
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:288
 msgid "Resource cannot be null"
 msgstr "El recurso no puede ser nulo"
 
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:27
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:81
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:87
 msgid "Delay from beginning (days)"
 msgstr "Retraso desde el comienzo (en días)"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:137
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:137
 msgid "login name is already being used by another user"
 msgstr "el nombre de usuario ya está siendo usado"
 
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34
 msgid "Total Hours"
 msgstr "Horas totales"
 
+#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:102
+msgid "code is already used"
+msgstr "el código ya está siendo usado"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:71
 msgid "All orders"
 msgstr "Todos los pedidos"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:128
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:148
 msgid "Criterion Requirements"
 msgstr "Criterios requeridos"
 
@@ -2807,11 +2908,12 @@ msgstr "Confirmar cancelación"
 msgid "External companies listing"
 msgstr "Listado de empresas externas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:186
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:187
 msgid "Order from client"
 msgstr "Pedido del cliente"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:53
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:136
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:126
 msgid "OrderElement Code"
 msgstr "Código del elemento de pedido"
 
@@ -2841,22 +2943,22 @@ msgstr "SV"
 msgid "start not earlier than"
 msgstr "empezar no antes de"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1121
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1088
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:212
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:147
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:392
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:246
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:203
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:485
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:249
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:206
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:600
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:185
 msgid "Error on showing removing element: "
 msgstr "Error al mostrar el elemento a borrar: "
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1377
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1319
 msgid "Filter work reports"
 msgstr "Filtrar partes de trabajo"
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:82
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
 msgid "Our company login"
 msgstr "Nombre de usuario de nuestra empresa"
 
@@ -2868,6 +2970,18 @@ msgstr "Listado de categorías de coste"
 msgid "Direct imputation"
 msgstr "Imputación directa"
 
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50
+msgid "Criterion requirement"
+msgstr "Criterios requeridos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:148
+msgid ""
+"Still not saved changes would be lost. Are you sure you want to go to create "
+"a template?"
+msgstr ""
+"Los cambios que no hayan sido guardados se perderán. ¿Está seguro de que "
+"quiere ir a la creación de plantillas?"
+
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:34
 msgid "PDF"
 msgstr "PDF"
@@ -2888,29 +3002,34 @@ msgstr "Calendarios"
 msgid "Scheduling saved"
 msgstr "Planificación guardada"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:327
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:321
 msgid "The date cannot be null"
 msgstr "La fecha no puede ser nula"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:78
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:165
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155
 #: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:6
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:57
 msgid "Add new row"
 msgstr "Añadir nueva fila"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:386
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:388
 msgid "Error on showing delete confirm"
 msgstr "Error al mostrar la confirmación de borrado"
 
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:10
+msgid "Show only current satisfied criteria"
+msgstr "Mostrar solo los criterios satisfechos actualmente"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138
 msgid "Could not save new criterion"
 msgstr "No se pudo guardar el nuevo criterio"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:32
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:44
 msgid "order element :"
 msgstr "elemento de pedido :"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:526
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:528
 msgid "Sum of all rows"
 msgstr "Suma de todas las filas"
 
@@ -2923,28 +3042,29 @@ msgstr "Sobrecarga"
 msgid "Users listing"
 msgstr "Listado de usuarios"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:278
-msgid "Not indent"
-msgstr "No indentar"
-
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:78
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:72
 msgid "Finish hour"
 msgstr "Hora de fin"
 
 #: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64
 msgid "Assignment log"
 msgstr "Histórico de asignación"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:162
+msgid "Done {0} of {1}"
+msgstr "Hecho {0} de {1}"
+
 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:46
 msgid "Load due to current order"
 msgstr "Carga debido al pedido actual"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:101
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:93
 msgid "Deadline (days since beggining project)"
 msgstr "Fecha límite (días desde el inicio del proyecto)"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:225
+#: navalplanner-business/src/main/java/org/navalplanner/business/common/daos/OrderSequenceDAO.java:72
 msgid "You can not remove this order sequence, it is already in use"
 msgstr "No se puede borrar esta secuencia de pedido, está siendo usada"
 
@@ -2952,7 +3072,7 @@ msgstr "No se puede borrar esta secuencia de pedido, está siendo usada"
 msgid "Edit label type"
 msgstr "Editar tipo de etiqueta"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:134
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:138
 msgid ""
 "Last stretch should have one hundred percent for length and amount of work "
 "percentage"
@@ -2960,27 +3080,40 @@ msgstr ""
 "El último tramo debe tener 100% de porcentajes de longitud y cantidad de "
 "trabajo"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:376
+msgid "number of hours is not properly calculated based on clock"
+msgstr "número de horas no calculado correctamente basado en reloj"
+
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31
 msgid "Each worker configuration unit name"
 msgstr "Nombre de la unidad de configuración de cada trabajador"
 
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:39
-#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:40
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:41
 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:78
 msgid "Active"
 msgstr "Activo"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:317
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:718
+msgid "Value is not valid, the type must be not empty"
+msgstr "El valor no es válido, el tipo no debe ser vacío"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:406
 msgid "criterion type name is already being used"
 msgstr "el nombre de tipo de criterio está siendo usado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:386
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:393
 msgid "Could not get order code, please try again later"
 msgstr ""
 "No se pudo obtener código de pedido, por favor inténtelo otra vez luego"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:732
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:918
+msgid "Value is not valid, the current value must be not empty"
+msgstr "El valor no es válido, el valor actual no debe ser vacío"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:261
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:502
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:518
 msgid "Unindent"
 msgstr "Desindentar"
 
@@ -2988,15 +3121,15 @@ msgstr "Desindentar"
 msgid "Direct labels"
 msgstr "Etiquetas directas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:151
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:157
 msgid "Delete order element"
 msgstr "Borrar elemento de pedido"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:79
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:85
 msgid "Log in"
 msgstr "Entrar"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:50
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30
 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29
 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27
@@ -3014,17 +3147,17 @@ msgstr "Acciones"
 msgid "Order Scheduling"
 msgstr "Planificación de pedidos"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:217
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:218
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44
 msgid "External company"
 msgstr "Empresa externa"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:139
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:145
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72
 msgid "New order element"
 msgstr "Nuevo elemento de pedido"
 
-#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:52
 msgid "Precision"
 msgstr "Precisión"
 
@@ -3032,7 +3165,7 @@ msgstr "Precisión"
 msgid "Date last advance measurement"
 msgstr "Fecha de la última medida de avance"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:77
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:71
 msgid "Start hour"
 msgstr "Hora de inicio"
 
@@ -3040,6 +3173,14 @@ msgstr "Hora de inicio"
 msgid "Exceptions"
 msgstr "Excepciones"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:690
+msgid ""
+"You can not remove the order element \"{0}\" because of this or any of its "
+"children are already in use in some work reports"
+msgstr ""
+"No puede borrarse el elemento de pedido \"{0}\" porque uno de sus hijos se "
+"está usando en algún parte de trabajo"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:173
 msgid "format filters are not valid"
 msgstr "los filtros de formato no son válidos"
@@ -3048,12 +3189,13 @@ msgstr "los filtros de formato no son válidos"
 msgid "Indirect labels"
 msgstr "Etiquetas indirectas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:519
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:540
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:473
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:645
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:680
 msgid "You don't have read access to this order"
 msgstr "No tiene acceso de lectura a este pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:105
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:109
 msgid "Scheduling state"
 msgstr "Estado de planificación"
 
@@ -3070,7 +3212,7 @@ msgstr ""
 "El calendario no fue borrado porque aún tiene hijos. Algún otro calendario "
 "deriva de este."
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:87
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88
 msgid "Our company password"
 msgstr "Contraseña de nuestra empresa"
 
@@ -3078,11 +3220,11 @@ msgstr "Contraseña de nuestra empresa"
 msgid "Select print page properties"
 msgstr "Seleccione las propiedades de la página de impresión"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:197
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:211
 msgid "criterion satisfaction's criterion not specified"
 msgstr "criterio del criterio satisfecho no especificado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:150
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:182
 msgid "Create machine"
 msgstr "Crear máquina"
 
@@ -3094,14 +3236,6 @@ msgstr "A2"
 msgid "Machine"
 msgstr "Máquina"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:136
-msgid ""
-"Value is not valid, the Precision value must be less than the defalt max "
-"value "
-msgstr ""
-"El valor no es válido, el valor de precisión debe ser menor que el valor "
-"máximo por defecto "
-
 #: navalplanner-webapp/src/main/webapp/common/error.zul:35
 #: navalplanner-webapp/src/main/webapp/common/event_error.zul:29
 msgid "Reload"
@@ -3123,7 +3257,7 @@ msgstr ""
 msgid "Profiles authorization"
 msgstr "Autorización de perfiles"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:137
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:157
 msgid "Hours Group"
 msgstr "Grupo de horas"
 
@@ -3131,14 +3265,13 @@ msgstr "Grupo de horas"
 msgid "Unallocated name"
 msgstr "Nombre no asignado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:479
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:496
 msgid "Move up"
 msgstr "Mover arriba"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:425
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:292
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:43
-#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:47
 msgid "Not deletable"
 msgstr "Imborrable"
 
@@ -3152,18 +3285,14 @@ msgstr "Crear formulario de calidad"
 
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28
 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:60
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:34
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77
 msgid "NIF"
 msgstr "NIF"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:862
-msgid "Order element not found"
-msgstr "Elemento de pedido no encontrado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:166
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:187
 msgid ""
 "Templates can only be created from already existent order elements.\n"
 "Newly order elements cannot be used."
@@ -3172,29 +3301,29 @@ msgstr ""
 "existentes.\n"
 "No se pueden usar elementos de pedido nuevos."
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:152
+msgid "Doing {0} reassignations"
+msgstr "Realizando {0} reasignaciones"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55
 msgid "BCWP"
 msgstr "BCWP"
 
-#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:40
-msgid "Not editable"
-msgstr "No editable"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:196
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:256
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:72
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:117
 msgid "Scheduling"
 msgstr "Planificación"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:233
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:234
 msgid "Subcontract communication date"
 msgstr "Fecha de comunicación de la subcontratación"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:106
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:118
 msgid "Dependencies have priority"
 msgstr "Las dependencias tienen prioridad"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:43
+#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:45
 msgid "code not specified"
 msgstr "código no especificado"
 
@@ -3229,12 +3358,12 @@ msgstr "Listado de tipos de horas de trabajo"
 msgid "List label types"
 msgstr "Listar tipos de etiqueta"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:22
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:20
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:24
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:139
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:151
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:35
 msgid "State"
 msgstr "Estado"
 
@@ -3246,17 +3375,17 @@ msgstr "Trabajo realizado desde la fecha de inicio:"
 msgid "Must start after"
 msgstr "Debe empezar después"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:66
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:72
 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:47
 msgid "Password"
 msgstr "Contraseña"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34
 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:68
 msgid "Observations"
 msgstr "Observaciones"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:828
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1010
 msgid "Confirm change"
 msgstr "Confirmar cambio"
 
@@ -3271,6 +3400,10 @@ msgstr "Imagen simple"
 msgid "Valid from"
 msgstr "Válido desde"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:278
+msgid "There exists other template with the same name."
+msgstr "Ya existe otra plantilla con el mismo nombre."
+
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56
 msgid "Month"
 msgstr "Mes"
@@ -3283,12 +3416,12 @@ msgstr "Excepción"
 msgid "At least one order sequence is needed"
 msgstr "Se necesita al menos una secuencia de pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:552
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:676
 msgid "Edit order"
 msgstr "Editar pedido"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:196
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:194
 msgid "Send"
 msgstr "Enviar"
 
@@ -3298,11 +3431,11 @@ msgstr ""
 "No se puede insertar material en la vista general. Por favor, seleccione una "
 "categoría"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:51
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:58
 msgid "user"
 msgstr "usuario"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:180
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:194
 msgid "criterion satisfaction's start date not specified"
 msgstr "fecha de inicio del criterio satisfecho no especificada"
 
@@ -3313,8 +3446,8 @@ msgstr "La contraseña no puede ser vacía  para un usuario nuevo"
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:155
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:185
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:30
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:11
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:13
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26
 msgid "All"
 msgstr "Todo"
 
@@ -3323,11 +3456,12 @@ msgid "Type name"
 msgstr "Nombre del tipo"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:50
-#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:33
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:38
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:42
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:82
 #: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47
 #: navalplanner-webapp/src/main/webapp/planner/main.zul:65
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:272
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:273
 msgid "Accept"
 msgstr "Aceptar"
 
@@ -3335,19 +3469,19 @@ msgstr "Aceptar"
 msgid "Calendars List"
 msgstr "Lista de calendarios"
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:78
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:79
 msgid "Example: {0}"
 msgstr "Ejemplo: {0}"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:451
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:453
 msgid ""
 "Create new material assignment out of material assignment {0}. Are you sure?"
 msgstr ""
 "Crear nueva asignación de material fuera de la asignación de material {0}. "
 "¿Está seguro?"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:197
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:220
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:216
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:239
 msgid "Edit Worker"
 msgstr "Editar trabajador"
 
@@ -3355,7 +3489,8 @@ msgstr "Editar trabajador"
 msgid "Cannot be higher than Ending date"
 msgstr "No puede ser mayor que la fecha de fin"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:74
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:161
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:151
 msgid "Work report lines"
 msgstr "Líneas del parte de trabajo"
 
@@ -3367,20 +3502,25 @@ msgstr "Calculado"
 msgid "Create activation period"
 msgstr "Crear período de activación"
 
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:6
+msgid "Personal details"
+msgstr "Detalles personales"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:205
 msgid "Workers List"
 msgstr "Lista de trabajadores"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:243
+msgid "Worker"
+msgstr "Trabajador"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:188
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:168
 msgid "Criterion must be not-null"
 msgstr "El criterio no debe ser nulo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:243
-msgid "Worker"
-msgstr "Trabajador"
-
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:125
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:152
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:147
 msgid "criterion name not specified"
 msgstr "nombre del criterio no especificado"
 
@@ -3389,7 +3529,15 @@ msgstr "nombre del criterio no especificado"
 msgid " The "
 msgstr " El "
 
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:38
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:134
+msgid "Value is not valid, the default max value must not be empty "
+msgstr "El valor no es válido, el valor máximo por defecto no debe ser nulo "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:199
+msgid "the "
+msgstr "el "
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:44
 msgid "Access to the system"
 msgstr "Acceso al sistema"
 
@@ -3411,7 +3559,8 @@ msgstr "Progreso de avance"
 msgid "External overload"
 msgstr "Sobrecarga externa"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:26
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:108
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:99
 msgid "Report data"
 msgstr "Datos del informe"
 
@@ -3424,27 +3573,36 @@ msgstr "Autorizar"
 msgid "External load"
 msgstr "Carga externa"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:37
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:41
 msgid "Order elements"
 msgstr "Elementos de pedido"
 
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:59
+msgid "Report advance"
+msgstr "Notificar avance"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:45
+msgid "instance not found"
+msgstr "instancia no encontrada"
+
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:36
 msgid "Landscape"
 msgstr "Apaisado"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:298
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:387
 msgid "criterion names must be unique inside a criterion type"
 msgstr "el nombre del criterio debe ser único dentro de un tipo de criterio"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:161
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:168
 msgid "Create order from Template"
 msgstr "Crear pedido a partir de plantilla"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:74
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:50
 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:43
-#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:25
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:33
 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:89
 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25
 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40
@@ -3456,15 +3614,14 @@ msgstr "Crear pedido a partir de plantilla"
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74
 #: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:7
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:25
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:75
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:81
 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:7
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:60
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109
 msgid "Code"
 msgstr "Código"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:8
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:10
 msgid "Filters"
 msgstr "Filtros"
@@ -3481,8 +3638,8 @@ msgstr "Añadir tramo"
 msgid "Quarter"
 msgstr "Cuarto"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:209
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:195
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:217
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:202
 msgid ""
 "Start date is not valid, the new start date must be lower than the end date"
 msgstr ""
@@ -3492,7 +3649,8 @@ msgstr ""
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:539
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:980
 msgid "Hours for an exception day should be greater or equal than zero"
-msgstr "Las horas para un día de excepción deben ser mayores o iguales a cero"
+msgstr ""
+"Las horas para un día de excepción deben ser mayores o iguales que cero"
 
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:86
@@ -3504,12 +3662,13 @@ msgstr "Fecha de inicio"
 msgid "Update exception"
 msgstr "Actualizar excepción"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:168
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:189
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:202
 msgid "Operation cannot be done"
 msgstr "No se puede efectuar la operación"
 
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:118
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:130
 msgid "Budget"
 msgstr "Presupuesto"
 
@@ -3521,7 +3680,7 @@ msgstr "Ya existe otro criterio con el mismo nombre"
 msgid "Unit name"
 msgstr "Nombre de la unidad"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:197
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:217
 msgid "Could open generated PDF"
 msgstr "No se pudo abrir el PDF generado"
 
@@ -3536,7 +3695,7 @@ msgstr "El código no puede ser nulo o vacío"
 msgid "Profile name"
 msgstr "Nombre del perfil"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:103
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:106
 msgid "Disable Delete"
 msgstr "Deshabilitar borrado"
 
@@ -3549,10 +3708,18 @@ msgstr "Escribir"
 msgid "Number of applications"
 msgstr "Número de aplicaciones"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:101
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:41
 msgid "Filter type"
 msgstr "Tipo de filtro"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:81
+msgid ""
+"Date which the task must start after (press enter in textbox to open "
+"calendar popup or type in date directly)"
+msgstr ""
+"Fecha después de la cual la tarea debe empezar (presione enter en el cuadro "
+"de texto para abrir el calendario o escriba la fecha directamente)"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67
 msgid "Assigned"
 msgstr "Asignado"
@@ -3562,15 +3729,15 @@ msgstr "Asignado"
 msgid "Normal"
 msgstr "Normal"
 
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:35
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:39
 msgid "Details"
 msgstr "Detalles"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:287
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:281
 msgid "Date cannot be null"
 msgstr "La fecha no puede ser nula"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:154
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:158
 msgid ""
 "The name is not valid, there is another advance type with the same name. "
 msgstr ""
@@ -3581,12 +3748,12 @@ msgstr ""
 msgid "Advance type"
 msgstr "Tipo de avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:235
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:239
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172
 msgid "Error: {0}"
 msgstr "Error: {0}"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:125
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:135
 msgid "Company saved"
 msgstr "Empresa guardada"
 
@@ -3602,8 +3769,8 @@ msgstr "¿Quiere borrar &quot;{0}&quot;?"
 msgid "New criterion"
 msgstr "Criterio nuevo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:215
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:321
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:224
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:393
 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48
 msgid "Load"
 msgstr "Carga"
@@ -3612,14 +3779,14 @@ msgstr "Carga"
 msgid "Parent"
 msgstr "Padre"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:639
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:60
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:644
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:61
 #: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:62
 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:53
-#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35
 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:90
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:31
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:100
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:112
 #: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:38
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38
 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:46
@@ -3646,15 +3813,15 @@ msgstr "No se encontró un conversor para {0}"
 msgid "start in fixed date"
 msgstr "comenzar en fecha fija"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:209
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:210
 msgid "Go to advanced Allocation"
 msgstr "Ir a asignación avanzada"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:260
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:261
 msgid "Material assignments"
 msgstr "Asignaciones de materiales"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:459
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:466
 msgid "already exists an allocation for criteria {0}"
 msgstr "ya existe una asignación para los criterios {0}"
 
@@ -3666,28 +3833,33 @@ msgstr "Número de aplicaciones finalizadas"
 msgid "Text field"
 msgstr "Campo de texto"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:100
-msgid "code is already being used"
-msgstr "el código ya está siendo usado"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:120
+msgid ""
+"Value is not valid, the Precision value must be less than the defalt max "
+"value."
+msgstr ""
+"El valor no es válido, el valor de precisión debe ser menor que el valor "
+"máximo por defecto."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:408
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:389
 msgid "At least one HoursGroup is needed"
 msgstr "Es necesario al menos un HoursGroup"
 
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:57
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:63
+#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:156
 msgid "User"
 msgstr "Usuario"
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:68
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69
 msgid "Interacts with applications"
 msgstr "Interactúa con aplicaciones"
 
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:45
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:46
 msgid "Multiple values per resource"
 msgstr "Múltiples valores por recurso"
 
-#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:33
 msgid "Hours:"
 msgstr "Horas:"
 
@@ -3700,7 +3872,7 @@ msgstr "Dividir"
 msgid "Create new work week"
 msgstr "Crear nueva semana de trabajo"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:21
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33
 msgid "Work report lines listing"
 msgstr "Listado de líneas de parte de trabajo"
 
@@ -3712,7 +3884,7 @@ msgstr "Crear tipo de etiqueta"
 msgid "Work record"
 msgstr "Registro de trabajo"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:286
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:287
 msgid "Select the calendar"
 msgstr "Seleccionar el calendario"
 
@@ -3725,23 +3897,23 @@ msgstr "Criterio guardado"
 msgid "Output format"
 msgstr "Formato de salida"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27
-#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32
-#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:20
-#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24
-#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:22
-#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:74
-#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:24
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28
-msgid "Starting date"
-msgstr "Fecha de inicio"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:132
 msgid "Order sequence prefixes can not be repeated"
 msgstr "Los prefijos de secuencia de pedido no pueden repetirse"
 
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:18
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:22
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:86
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:24
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29
+msgid "Starting date"
+msgstr "Fecha de inicio"
+
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:77
 msgid "Print"
 msgstr "Imprimir"
@@ -3751,34 +3923,35 @@ msgstr "Imprimir"
 msgid "{0} not found type for criterion "
 msgstr "{0} no encontrado tipo para criterio "
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:374
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:368
 msgid "Hours cannot be null"
 msgstr "Las horas no pueden ser nulas"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:358
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:447
 msgid "resource type does not allow enabled criteria"
 msgstr "el tipo de recurso no permite criterios habilitados"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:185
 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38
 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:65
 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:83
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:103
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:94
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:84
 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73
 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:94
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:121
-#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:34
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84
 #: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:274
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:296
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:178
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:126
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:275
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:297
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130
 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:42
 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46
 #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:33
@@ -3787,7 +3960,7 @@ msgstr "el tipo de recurso no permite criterios habilitados"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:575
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:745
 msgid "Function"
 msgstr "Función"
 
@@ -3807,14 +3980,14 @@ msgstr "Tarea subcontratada enviada con éxito"
 msgid "Accumulated hours chart"
 msgstr "Gráfico de horas acumuladas"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21
-msgid "Virtual resources"
-msgstr "Recursos virtuales"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:206
 msgid "Machines List"
 msgstr "Lista de máquinas"
 
+#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21
+msgid "Virtual resources"
+msgstr "Recursos virtuales"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61
 msgid "CPI"
 msgstr "CPI"
@@ -3831,25 +4004,24 @@ msgstr "Formato"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:529
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:77
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:417
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:734
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:68
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:487
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:899
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:370
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:74
 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:61
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:94
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:25
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:37
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:39
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:35
-#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:38
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:45
 #: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:38
-#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:38
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:45
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:46
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:42
-#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:37
 #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24
 #: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:34
 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:40
@@ -3865,12 +4037,20 @@ msgstr "Editar"
 msgid "Workers list"
 msgstr "Lista de trabajadores"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:91
+msgid ""
+"Some lines have not allocation periods.\n"
+"Below it shows the load all company resources"
+msgstr ""
+"Algunas líneas no tienen períodos de asignación.\n"
+"Debajo se muestra la carga de todos los recursos de la empresa"
+
 #: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:15
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:67
 msgid "Init date"
 msgstr "Fecha de inicio"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:84
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:96
 msgid "Responsible"
 msgstr "Responsable"
 
@@ -3894,21 +4074,19 @@ msgstr "Por defecto"
 msgid "Create Calendar"
 msgstr "Crear Calendario"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:125
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:129
 msgid "At least one stretch is needed"
 msgstr "Se necesita al menos un tramo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelServiceREST.java:92
-msgid "label type name is used by another label type being imported"
-msgstr ""
-"el nombre de tipo de etiqueta está siendo usado por otro tipo de etiqueta "
-"importado"
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:182
+msgid "Satisfied"
+msgstr "Satisfecho"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:437
 msgid "percentage must be in range (0,100]"
 msgstr "el porcentaje debe pertenecer al rango (0,100]"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:210
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:214
 msgid "Stretch date should be greater or equals than task start date"
 msgstr ""
 "La fecha de un tramo debe ser mayor o igual que la fecha de inicio de la "
@@ -3919,8 +4097,15 @@ msgstr ""
 msgid "New Description"
 msgstr "Descripción nueva"
 
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1028
+msgid ""
+"resources cost category assignment codes must be unique inside a resource"
+msgstr ""
+"los códigos de las asignaciones de recursos a una categoría de coste deben "
+"ser únicos dentro de un recurso"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:159
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:164
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:162
 msgid "XML"
 msgstr "XML"
 
@@ -3928,7 +4113,7 @@ msgstr "XML"
 msgid "Task Properties"
 msgstr "Propiedades de la tarea"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:158
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:166
 msgid ""
 "CriterionType is not valid, the criterionType overlap other "
 "criterionSatisfaction whith same criterionType"
@@ -3938,10 +4123,10 @@ msgstr ""
 
 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35
 msgid "Create new Work Report Type"
-msgstr "Crear nueva tipo de parte de trabajo"
+msgstr "Crear nuevo tipo de parte de trabajo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:185
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:219
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:193
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:226
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:228
 msgid ""
 "End date is not valid, the new end date must be greater than the start date"
@@ -3953,6 +4138,7 @@ msgstr ""
 msgid "Cost category saved"
 msgstr "Categoría de coste guardada"
 
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:12
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27
 msgid "name"
 msgstr "nombre"
@@ -3980,7 +4166,11 @@ msgstr "{0} (máx: {1})"
 msgid "Reassigning"
 msgstr "Reasignando"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:435
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:388
+msgid "end"
+msgstr "fin"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:442
 msgid "{0} already assigned to resource allocation list"
 msgstr "{0} ya está en la lista de asignación de recursos"
 
@@ -3988,11 +4178,11 @@ msgstr "{0} ya está en la lista de asignación de recursos"
 msgid "Log"
 msgstr "Diario"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:382
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:384
 msgid "The type of hours cannot be null."
 msgstr "El tipo de horas no puede ser nulo."
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:56
 msgid "Authorizations"
 msgstr "Autorizaciones"
 
@@ -4001,26 +4191,26 @@ msgstr "Autorizaciones"
 msgid "Continue"
 msgstr "Continuar"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:191
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:198
 msgid "Start date cannot be null"
 msgstr "La fecha de inicio no puede ser nula"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:32
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:40
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:26
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:49
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:40
-#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:54
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:65
 #: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48
 #: navalplanner-webapp/src/main/webapp/templates/_advances.zul:35
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:24
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:121
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:44
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:129
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:149
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:40
 #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42
@@ -4028,15 +4218,11 @@ msgstr "La fecha de inicio no puede ser nula"
 msgid "Type"
 msgstr "Tipo"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:97
-msgid "Total Hours OrderElement"
-msgstr "Total de horas del elemento de pedido"
-
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:21
 msgid "Associated Criteria"
 msgstr "Criterios asignados"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:848
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:930
 msgid "Value is not valid, the Precision value must be exact "
 msgstr "El valor no es válido, el valor de precisión debe ser exacto "
 
@@ -4048,41 +4234,37 @@ msgstr "Genérico"
 msgid "BCWS"
 msgstr "BCWS"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:68
-msgid "P"
-msgstr "P"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:520
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:961
 msgid "Exception start date should be greater than current date"
 msgstr "La fecha de inicio de la excepción debe ser mayor que la fecha actual"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:251
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:271
 msgid " in the specified directory."
 msgstr " en el directorio especificado."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:107
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127
 msgid "Order does not exist"
 msgstr "El pedido no existe"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:64
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:76
 msgid "Autogenerated"
 msgstr "Autogenerado"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:110
-msgid "machine code has to be unique. It is already used"
-msgstr "el código de máquina debe ser único. Ya está siendo usado"
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1022
+msgid "criterion satisfaction codes must be unique inside a resource"
+msgstr "el código del criterio debe ser único dentro de un recurso"
 
 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:42
 #: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:45
 msgid "&gt;&gt;"
 msgstr "&gt;&gt;"
 
-#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:46
 msgid "Default max value"
 msgstr "Valor máximo por defecto"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35
 msgid "Add criterion requirement"
 msgstr "Añadir criterio requerido"
 
@@ -4095,6 +4277,10 @@ msgstr "Progreso de trabajo por tarea"
 msgid "New order element name:"
 msgstr "Nombre del nuevo elemento de pedido:"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37
+msgid "Criterion"
+msgstr "Criterio"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231
 msgid "Manage external companies"
 msgstr "Administrar empresas externas"
@@ -4119,13 +4305,17 @@ msgstr "Añadir perfil"
 msgid "filter already exists"
 msgstr "el filtro ya existe"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:19
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:17
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:21
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:43
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45
 #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26
 msgid "Criterion name"
 msgstr "Nombre del criterio"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:102
+msgid "missing code in a label"
+msgstr "falta el código en una etiqueta"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:117
 msgid "values are not valid, the values must not be null"
 msgstr "los valores no son válidos, no deben ser nulos"
@@ -4138,11 +4328,11 @@ msgstr "Coste de trabajo realizado"
 msgid "Task name"
 msgstr "Nombre de la tarea"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:116
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127
 msgid "cost assignment's resource not specified"
 msgstr "recurso de la asignación de coste no especificado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:295
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:336
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_' \n"
@@ -4156,7 +4346,7 @@ msgstr ""
 msgid "Average of the worked hours"
 msgstr "Media de horas trabajadas"
 
-#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42
 msgid "an authorization type must be set"
 msgstr "debe seleccionar un tipo de autorización"
 
@@ -4176,7 +4366,7 @@ msgstr "Añadir nuevo criterio requerido"
 msgid "Select the date from which the new version will be valid"
 msgstr "Seleccione la fecha a partir de la cual la versión nueva será válida"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:90
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:82
 msgid "Must start after (days since beginning project)"
 msgstr "Debe empezar después de (días desde el inicio del proyecto)"
 
@@ -4187,17 +4377,23 @@ msgstr "Coste presupuestado del trabajo realizado"
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:123
 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:54
 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:82
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:34
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:162
 msgid "Add"
 msgstr "Añadir"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:272
+msgid "the name must be not empty"
+msgstr "el nombre no puede ser vacío"
+
 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:94
 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58
 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:216
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:322
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:225
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:394
 msgid "Earned value"
 msgstr "Valor ganado"
 
@@ -4212,25 +4408,18 @@ msgstr "Deseleccionar"
 msgid "You should select the type of exception"
 msgstr "Debe seleccionar el tipo de excepción"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:89
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:79
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:92
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:91
 #: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:31
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:30
 msgid "Deadline"
 msgstr "Fecha límite"
 
-#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:12
-#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:14
-msgid "Apply filtering to order elements satisfying required criteria"
-msgstr ""
-"Aplicar filtrado a los elementos de pedido que satisfacen los criterios "
-"requeridos"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:490
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:605
 msgid "You don't have permissions to edit this order"
 msgstr "No tiene permisos para editar este pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:213
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:219
 msgid "Advance measurements"
 msgstr "Medidas de avance"
 
@@ -4238,7 +4427,7 @@ msgstr "Medidas de avance"
 msgid "Filter by categories or materials"
 msgstr "Filtrar por categorías o materiales"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:348
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:354
 msgid "Amount work percentage should be between 0 and 100"
 msgstr "El porcentaje de cantidad de trabajo debe estar entre 0 y 100"
 
@@ -4254,12 +4443,12 @@ msgstr "A partir de hoy"
 msgid "VAC"
 msgstr "VAC"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:578
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:591
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:590
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:603
 msgid "{0} not supported yet"
 msgstr "{0} aún no soportado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:178
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:177
 msgid "Advanced Allocation"
 msgstr "Asignación avanzada"
 
@@ -4269,7 +4458,7 @@ msgstr "Asignación avanzada"
 msgid "Label type"
 msgstr "Tipo de etiqueta"
 
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:54
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:58
 msgid "Template Tree"
 msgstr "Árbol de plantillas"
 
@@ -4297,8 +4486,8 @@ msgstr "Carga global de recursos"
 msgid "Changes have been canceled"
 msgstr "Cambios cancelados"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:216
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:231
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:248
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:263
 msgid "Machine saved"
 msgstr "Máquina guardada"
 
@@ -4315,16 +4504,24 @@ msgstr "Lista de tipos de avance"
 msgid "Status"
 msgstr "Estado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:694
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:569
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:68
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:79
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:30
+msgid "Assigned criterion requirements"
+msgstr "Criterios requeridos asignados"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:507
+msgid "the date must be inside the visualization area"
+msgstr "la fecha debe estar dentro del área de visualización"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:707
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:739
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:69
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:73
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:68
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:75
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:82
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:122
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:184
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:130
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:185
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:150
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:113
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:127
@@ -4332,7 +4529,7 @@ msgstr "Estado"
 msgid "Hours"
 msgstr "Horas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:454
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:499
 msgid "date not specified."
 msgstr "fecha no especificada."
 
@@ -4344,12 +4541,24 @@ msgstr "Tipo de formulario de calidad"
 msgid "The name of the criterion is empty."
 msgstr "El nombre del criterio está vacío."
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:580
+msgid "The max value must be not empty"
+msgstr "el valor máximo no puede ser vacío"
+
 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:55
 msgid "New label"
 msgstr "Nueva etiqueta"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:320
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:325
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:16
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:12
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:14
+msgid "Apply filtering to order elements satisfying required criteria"
+msgstr ""
+"Aplicar filtrado a los elementos de pedido que satisfacen los criterios "
+"requeridos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:328
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:332
 msgid "The start date cannot be null"
 msgstr "La fecha de inicio no puede ser nula"
 
@@ -4359,16 +4568,15 @@ msgid "Max value"
 msgstr "Valor máximo"
 
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:51
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:52
 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:58
 msgid "No"
 msgstr "No"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:150
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:154
 msgid "The name is not valid, the name must not be null "
 msgstr "El nombre no es válido, no debe ser nulo "
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:242
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:243
 msgid "Subcontract price"
 msgstr "Precio de subcontratación"
 
@@ -4381,13 +4589,13 @@ msgstr "Debe seleccionar una categoría"
 msgid "Spread"
 msgstr "Propagación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:210
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:229
 msgid "Edit virtual worker groups"
 msgstr "Editar grupos virtuales de trabajadores"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:140
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:206
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:501
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:145
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:187
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:625
 msgid "Removed {0}"
 msgstr "{0} borrado"
 
@@ -4398,18 +4606,18 @@ msgstr "{0} borrado"
 msgid "Assigned criteria"
 msgstr "Criterios asignados"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:40
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:46
 msgid "Help on authentication (opens a new window)"
 msgstr "Ayuda sobre la identificación (abre una ventana nueva)"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50
-msgid "Group name"
-msgstr "Nombre del grupo"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:864
 msgid "The length must be greater than 0, and not null."
 msgstr "La longitud debe ser mayor que cero y no nula."
 
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50
+msgid "Group name"
+msgstr "Nombre del grupo"
+
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
 msgid "Start date:"
 msgstr "Fecha de inicio:"
@@ -4423,15 +4631,19 @@ msgstr "Nombre del rol"
 msgid "Machines list"
 msgstr "Lista de máquinas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:461
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:469
 msgid "Could not save new calendar"
 msgstr "No se pudo guardar el calendario nuevo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:340
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:446
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:555
 msgid "h"
 msgstr "h"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:114
+msgid "Value is not valid, the precision value must not be empty"
+msgstr "El valor no es válido, el valor de precisión no debe ser vacío"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:188
 msgid "Cannot delete profile: it does not exist anymore"
 msgstr "No se puede borrar el perfil: ya no existe"
@@ -4448,17 +4660,15 @@ msgstr "Crear y asignar"
 msgid "Add Milestone"
 msgstr "Añadir hito"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:173
-msgid "first name, surname, and nif are used by another worker being imported"
-msgstr ""
-"nombre, apellidos y nif usados por otro trabajador que está siendo importado"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:367
+msgid "init"
+msgstr "inicio"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:196
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:328
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java:78
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:40
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -4466,14 +4676,13 @@ msgstr "Confirmar"
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:35
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:37
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:49
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:47
-#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:47
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:54
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:55
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:50
-#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:54
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:32
 #: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:45
 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:49
 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:45
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:38
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:59
 #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31
 #: navalplanner-webapp/src/main/webapp/calendars/_list.zul:31
@@ -4482,8 +4691,8 @@ msgstr "Confirmar"
 msgid "Create"
 msgstr "Crear"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1620
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1626
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1564
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1570
 msgid "please, select a work report type"
 msgstr "por favor, seleccione un tipo de parte de trabajo"
 
@@ -4504,7 +4713,7 @@ msgstr "Editar usuario"
 msgid "Maximum/minimum of the estimated hours"
 msgstr "Máximo/mínimo de las horas estimadas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:101
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:41
 msgid "Filter pattern"
 msgstr "Patrón de filtro"
 
@@ -4517,13 +4726,13 @@ msgstr "Precio total"
 msgid "Manage advance types"
 msgstr "Gestionar tipos de avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:873
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:974
 msgid ""
 "The date is not valid, the date must be unique for this advanced assignment"
 msgstr "La fecha no es válida, debe ser única para esta asignación de avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1101
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1113
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1068
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1080
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:430
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:289
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:184
@@ -4532,41 +4741,41 @@ msgstr "La fecha no es válida, debe ser única para esta asignación de avance"
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:160
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:219
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:384
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:530
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:360
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:543
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:381
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:196
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:339
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:911
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:750
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:556
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:562
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:366
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:545
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:383
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1024
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:915
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:685
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:895
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1108
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:177
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:67
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:80
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:40
 #: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:64
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:62
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:66
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131
 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:110
-#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:44
 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74
 #: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:39
 #: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:53
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:90
 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:37
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:78
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:187
-#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:98
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:87
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:209
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:101
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:53
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:109
 #: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:39
 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90
 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120
@@ -4578,6 +4787,310 @@ msgstr "Borrar"
 msgid "Profiles listing"
 msgstr "Listado de perfiles"
 
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32
+msgid "RESOURCE"
+msgstr "RECURSO"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:33
+msgid "WORKER"
+msgstr "TRABAJADOR"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:34
+msgid "MACHINE"
+msgstr "MÁQUINA"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:71
+#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:112
+msgid "You can not modifiy this order sequence, it is already in use"
+msgstr "No se puede modificar esta secuencia de pedido, está siendo usada"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:121
+#, java-format
+msgid "number of digits must be between {0} and {1}"
+msgstr "el número de dígitos debe estar entre {0} y {1}"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:129
+msgid "Line"
+msgstr "Línea"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29
+msgid "Pending"
+msgstr "Pendiente"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31
+msgid "Failed sent"
+msgstr "Fallo en el envío"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32
+msgid "Success sent"
+msgstr "Éxito en el envío"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27
+msgid "Finished"
+msgstr "Terminado"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28
+msgid "In progress"
+msgstr "En progreso"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:30
+msgid "Blocked"
+msgstr "Bloqueado"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:185
+msgid "the resource type should be Worker or Machine"
+msgstr "el tipo de recurso debe ser Trabajador o Máquina"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:194
+msgid "Working hours shouldn't be negative"
+msgstr "Las horas de trabajo no pueden ser negativas"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:221
+msgid "Total percentage should be less than 100%"
+msgstr "El porcentaje total debe ser menor que 100%"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:270
+#, java-format
+msgid ""
+" The criterion {0} can not be assigned to this hoursGroup because its "
+"resource type is diferent."
+msgstr ""
+" El criterio {0} no se puede asignar a este grupo de horas porque su tipo de "
+"recurso es diferente."
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:276
+#, java-format
+msgid ""
+" The criterion  {0} can not be assigned to this hoursGroup because it "
+"already exist into the hoursGroup."
+msgstr ""
+" El criterio {0} no se puede asignar a este grupo de horas porque ya existe "
+"en el grupo."
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:164
+#, java-format
+msgid "{0} is already child of another {1}"
+msgstr "{0} ya es hijo de otro {1}"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:210
+msgid "it's already somewhat scheduled"
+msgstr "ya está planificado de alguna manera"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:224
+msgid "it can't be unscheduled"
+msgstr "no se puede quitar la planificación"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:357
+msgid "Completely scheduled"
+msgstr "Completamente planificado"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:359
+msgid "Partially scheduled"
+msgstr "Parcialmente planificado"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:361
+msgid "Unscheduled"
+msgstr "No planificado"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:367
+msgid "C"
+msgstr "C"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:369
+msgid "P"
+msgstr "P"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:371
+msgid "U"
+msgstr "N"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:412
+msgid ""
+"Some ancestor has the same label assigned, so this element is already "
+"inheriting this label"
+msgstr ""
+"Algún antecesor tiene la misma etiqueta asignada, así que este elemento ya "
+"está heredando esa etiqueta"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:461
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:774
+msgid "Cannot spread two advances in the same order element"
+msgstr "No puede haber dos avances que propagan en un elemento de pedido"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:483
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:509
+msgid "Duplicate Advance Assignment For Order Element"
+msgstr "Asignación de avance duplicada en el elemento de pedido"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:536
+#, java-format
+msgid " The {0} already exist into other order element"
+msgstr " El {0} ya existe en otro elemento de pedido"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32
+msgid "OFFERED"
+msgstr "OFRECIDO"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32
+msgid "ACCEPTED"
+msgstr "ACEPTADO"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32
+msgid "STARTED"
+msgstr "EMPEZADO"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33
+msgid "FINISHED"
+msgstr "TERMINADO"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33
+msgid "CANCELLED"
+msgstr "CANCELADO"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34
+msgid "SUBCONTRACTED PENDING ORDER"
+msgstr "SUBCONTRATADO PENDIENTE PEDIDO"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34
+msgid "STORED"
+msgstr "ALMACENADO"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:259
+msgid "workHours should be greater or equals to 0"
+msgstr "Las horas de trabajo deben ser mayores o iguales a cero"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:271
+msgid ""
+"\"workHours\" value is not valid, taking into account the current list of "
+"HoursGroup"
+msgstr ""
+"El valor de horas de trabajo no es válido, teniendo en cuenta la lista "
+"actual de grupos de horas"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:32
+msgid "Read authorization"
+msgstr "Autorización de lectura"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33
+msgid "Write authorization"
+msgstr "Autorización de escritura"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:33
+msgid "Web service reader"
+msgstr "Lectura de servicios web"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34
+msgid "Web service writer"
+msgstr "Escritura de servicios web"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35
+msgid "All orders read allowed"
+msgstr "Permitida lectura de todos los pedidos"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36
+msgid "All orders edition allowed"
+msgstr "Permitida edición de todos los pedidos"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37
+msgid "Order creation allowed"
+msgstr "Permitida creación de pedidos"
+
+#~ msgid "Not Unindent"
+#~ msgstr "No desindentar"
+
+#~ msgid ""
+#~ "Value is not valid, the Precision value must be less than the defalt max "
+#~ "value and not null"
+#~ msgstr ""
+#~ "El valor no es válido, el valor de precisión debe ser menor que el valor "
+#~ "máximo por defecto y no debe ser nulo"
+
+#~ msgid "Not editable"
+#~ msgstr "No editable"
+
+#~ msgid "label type name is used by another label type being imported"
+#~ msgstr ""
+#~ "el nombre de tipo de etiqueta está siendo usado por otro tipo de etiqueta "
+#~ "importado"
+
+#~ msgid "Relationship of the resource with the enterprise "
+#~ msgstr "Relación del recurso con la empresa "
+
+#~ msgid "Location where the resource work"
+#~ msgstr "Localización donde trabaja el recurso"
+
+#~ msgid "Leave"
+#~ msgstr "Baja"
+
+#~ msgid "Training courses and labor training"
+#~ msgstr "Cursos y formación laboral"
+
+#~ msgid "Job"
+#~ msgstr "Empleo"
+
+#~ msgid "Professional category"
+#~ msgstr "Categoría profesional"
+
+#~ msgid "medicalLeave"
+#~ msgstr "baja médica"
+
+#~ msgid "paternityLeave"
+#~ msgstr "baja por paternidad"
+
+#~ msgid "children"
+#~ msgstr "hijos"
+
+#~ msgid "percentage"
+#~ msgstr "porcentaje"
+
+#~ msgid "units"
+#~ msgstr "unidades"
+
+#~ msgid "subcontractor"
+#~ msgstr "subcontratista"
+
+#, fuzzy
+#~ msgid "Apply filtering to order elements satisfying required critera"
+#~ msgstr ""
+#~ "Aplicar filtrado a los elementos de pedido que satisfacen los criterios "
+#~ "requeridos"
+
+#~ msgid "The order {0} must be scheduled"
+#~ msgstr "El pedido {0} debe ser planificado"
+
+#~ msgid "include order elements"
+#~ msgstr "incluir elementos de pedido"
+
+#~ msgid "code is used by another machine being imported"
+#~ msgstr "código usado por otra máquina que está siendo importada"
+
+#~ msgid "Filter by label:"
+#~ msgstr "Filtrar por etiqueta:"
+
+#~ msgid "{0}: calendar not found"
+#~ msgstr "{0}: calendario no encontrado"
+
+#~ msgid "criterion type name is used by another criterion type being imported"
+#~ msgstr ""
+#~ "el nombre de tipo de criterio está siendo usado por otro tipo de criterio "
+#~ "importado"
+
+#~ msgid "machine code not specified"
+#~ msgstr "código de máquina no especificado"
+
+#~ msgid "Order element not found"
+#~ msgstr "Elemento de pedido no encontrado"
+
+#~ msgid "machine code has to be unique. It is already used"
+#~ msgstr "el código de máquina debe ser único. Ya está siendo usado"
+
+#~ msgid ""
+#~ "first name, surname, and nif are used by another worker being imported"
+#~ msgstr ""
+#~ "nombre, apellidos y nif usados por otro trabajador que está siendo "
+#~ "importado"
+
 #~ msgid "Starting date:"
 #~ msgstr "Fecha de inicio:"