diff --git a/ganttzk/src/main/resources/i18n/gl.po b/ganttzk/src/main/resources/i18n/gl.po
index f6d7c3d21..99848db44 100644
--- a/ganttzk/src/main/resources/i18n/gl.po
+++ b/ganttzk/src/main/resources/i18n/gl.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 "Engadir dependencia"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37
+msgid "Expand/Collapse all"
+msgstr "Expandir/pregar todo"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32
 msgid "Year"
 msgstr "Ano"
 
-#: 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 "Definir Fin-Inicio"
@@ -50,11 +58,11 @@ msgstr "Definir Fin-Inicio"
 msgid "Set End-End"
 msgstr "Definir 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 "reducindo 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 camiño crítico"
 
@@ -62,7 +70,7 @@ msgstr "Ocultar camiño 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 "Porcentaxe 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 camiño crítico"
 
diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po
index bfbdffdb2..5e0a45273 100644
--- a/navalplanner-webapp/src/main/resources/i18n/gl.po
+++ b/navalplanner-webapp/src/main/resources/i18n/gl.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:06+0100\n"
+"POT-Creation-Date: 2010-03-08 19:27+0100\n"
+"PO-Revision-Date: 2010-03-08 19:50+0100\n"
 "Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
 "Language-Team: Galician <>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Work report types"
 msgstr "Tipos de partes de traballo"
 
-#: 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 "O recurso non pode ser nulo"
 
@@ -29,26 +29,31 @@ msgstr "O recurso non pode 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 "o código do criterio debe ser único dentro dun 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 "Non se engadiron actualizacións porque non se seleccionou ningunha."
 
-#: 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 "gl"
 
-#: 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 "nome do tipo de criterio non especificado"
 
@@ -60,11 +65,15 @@ msgstr "Administrar contas 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 á vista da compañía"
+
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45
 msgid "Select report data"
 msgstr "Seleccione data do informe"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:194
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216
 msgid "Add Exception"
 msgstr "Engadir excepción"
 
@@ -72,12 +81,16 @@ msgstr "Engadir 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 co nome {0}"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:54
 msgid "Create Virtual Worker"
 msgstr "Crear traballador 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 traballador 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 traballador 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 "Engadir criterio"
 msgid "Completed estimated hours per task"
 msgstr "Horas estimadas completadas por tarefa"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:32
-msgid "Heading Fields"
-msgstr "Campos de cabeceira"
-
-#: 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 cabeceira"
+
+#: 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 "Materiais"
 
-#: 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 ""
 "O período de tempo contén datos inválidos. A data de fin debe ser maior cá "
 "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 "A descrición non pode ser nula ou baleira"
 msgid "Percentage of consumed budget hours / hours consumed"
 msgstr "Porcentaxe de horas de presuposto 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 "nome de usuario non especificado"
 
@@ -219,12 +230,12 @@ msgstr "Debe seleccionar unha data de inicio para a excepción"
 msgid "Variance At Completion"
 msgstr "Desviación ó 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 "Axuda"
 
-#: 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 e 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 calidade"
 
@@ -245,7 +261,7 @@ msgstr "Resumo"
 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 "Opcións de exportación"
 
@@ -261,14 +277,14 @@ msgstr ""
 "Non se puido gardar o período de tiempo. O período solápase con outro "
 "período de tempo 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 "A hora de inicio non pode ser nula"
 
@@ -353,7 +369,7 @@ msgstr "Gráfico de dedicación"
 msgid "Day of week"
 msgstr "Día da 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 "Non se puido borrar o elemento de pedido "
 
@@ -361,15 +377,15 @@ msgstr "Non se puido borrar o elemento de pedido "
 msgid "Not the same hours group, impossible to update"
 msgstr "Non están no mesmo 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 "A data de fin non pode ser anterior á data 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 "a asignación de coste ten data de fin anterior á de inicio"
 
@@ -382,7 +398,11 @@ msgstr "Nome da categoría"
 msgid "Maximum/minimum of the worked hours"
 msgstr "Máximo/mínimo das horas traballadas"
 
-#: 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 "Non é o mesmo 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 do formulario de calidade"
 
@@ -398,18 +418,18 @@ msgstr "Lista de elementos do formulario de calidade"
 msgid "Name/Code"
 msgstr "Nome/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 ""
 "A data de fin non é válida, a nova data de fin debe ser posterior á 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"
 
@@ -417,19 +437,19 @@ msgstr "Menú principal"
 msgid "cannot include an Advance of the same Advance type twice"
 msgstr "non se pode asignar un avance do mesmo tipo dúas 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 modelo"
-
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:63
 msgid "Select print visualization options"
 msgstr "Seleccione as opcións de impresión da 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 modelo"
+
 #: 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
@@ -440,7 +460,7 @@ msgstr "Comezo"
 msgid "There exists other workReportType with the same name."
 msgstr "Xa existe outro tipo de parte de traballo co mesmo nome."
 
-#: 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 da asignación de coste non especificada"
 
@@ -448,7 +468,7 @@ msgstr "categoría da asignación de coste non especificada"
 msgid "Delete Template element"
 msgstr "Borrar elemento de modelo"
 
-#: 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"
@@ -457,10 +477,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 do traballador non 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 ou non planificado. (Pinche e 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}': non atopado"
@@ -474,12 +501,12 @@ msgstr "Capacidade 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 ""
 "O primeiro tramo debe estar despois do primeiro día para facer 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"
 
@@ -487,7 +514,7 @@ msgstr "cambio de perspectiva"
 msgid "Filter quality forms by :"
 msgstr "Filtrar formularios de calidade 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."
@@ -499,7 +526,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 do elemento de pedido"
 
@@ -507,7 +534,7 @@ msgstr "Código do elemento de pedido"
 msgid "Changes saved"
 msgstr "Cambios gardados"
 
-#: 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"
 
@@ -520,7 +547,7 @@ msgstr ""
 "actualizar a táboa de secuencia de pedido. Por favor, volva intentalo máis "
 "tarde"
 
-#: 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 traballo gardado"
 
@@ -541,6 +568,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 "A data non é válida, non debe ser baleira"
+
 #: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:25
 msgid "User login name"
 msgstr "Nome de usuario"
@@ -550,16 +581,16 @@ msgstr "Nome de usuario"
 msgid "Materials needs at date"
 msgstr "Necesidades de materiais en data"
 
-#: 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 non 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 "non pode ser baleiro"
 
@@ -571,13 +602,13 @@ msgstr "Mostrar todas as asignacións de recursos"
 msgid "New template"
 msgstr "Novo modelo"
 
-#: 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 "o código do tipo debe ser único. Xa 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 calidade de tarefa"
 
@@ -601,7 +632,7 @@ msgstr "O tipo de avance non pode ser modificado"
 msgid "Locations"
 msgstr "Ubicacións"
 
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:70
 msgid "New quality form item"
 msgstr "Novo elemento de formulario de calidade"
 
@@ -616,7 +647,7 @@ msgstr "Asignación de recursos"
 msgid "Templates list"
 msgstr "Lista de modelos"
 
-#: 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 calidade"
 
@@ -624,11 +655,11 @@ msgstr "por favor, seleccione un formulario de calidade"
 msgid "Exist other workReportType with the same code."
 msgstr "Xa existe outro tipo de parte de traballo co mesmo 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 a interpolación necesítanse alo menos dous 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"
 
@@ -648,17 +679,16 @@ msgstr "Código de referencia do cliente"
 msgid "Add New Label Type Field"
 msgstr "Engadir novo 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 "A hora de fin non pode 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 del cliente"
 
@@ -667,10 +697,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"
 
@@ -678,11 +710,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 "Traballador gardado"
 
-#: 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"
@@ -694,16 +726,17 @@ msgstr ""
 msgid "Create new advance type"
 msgstr "Crear un novo 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 "non se pode pasar mentres o elemento anterior non sexa 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 requirido"
 
-#: 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 "novo grupo de horas "
 
@@ -719,14 +752,14 @@ msgstr "Planificación da 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 "a porcentaxe non pode estar duplicada"
 
+#: 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 "Cabeceira"
@@ -739,7 +772,7 @@ msgstr "Crear versión nova"
 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 ten subrecursos habilitados"
 
@@ -752,27 +785,31 @@ msgstr "Cliente"
 msgid "Add new advance assignment"
 msgstr "engadir nova 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 co nome {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 "Non se puido gardar a 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 puido convertir o 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 "O traballador non 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 ""
+"non hai recursos cos criterios solicitados: {0}. Por tanto, non se pode "
+"engadir a asignación xenérica"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:923
 msgid "Some criterion satisfactions overlap in time"
 msgstr "Algúns criterios satisfeitos solápanse no tempo"
 
-#: 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 "o nome da categoría de materiais debe ser único. Xa está en uso"
 
@@ -790,17 +827,19 @@ msgid "Confirm deleting this hour cost. Are you sure?"
 msgstr "Confirmar o borrado deste 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} xa 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 traballador"
 
@@ -808,7 +847,7 @@ msgstr "Crear traballador"
 msgid "Delete Milestone"
 msgstr "Borrar fito"
 
-#: 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 "O pedido no ten elementos planificados"
 
@@ -820,7 +859,7 @@ msgstr "Ubicacións non 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"
@@ -828,7 +867,7 @@ msgstr ""
 "{0} non é válido, criterionType solápase con outro criterionSatisfaction do "
 "mesmo criterionType"
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:74
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75
 msgid "Application URI"
 msgstr "URI da aplicación"
 
@@ -840,11 +879,11 @@ msgstr "Tamaño de papel"
 msgid "Password confirmation"
 msgstr "Confirmación de contrasinal"
 
-#: 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 "Ningún"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:81
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:75
 msgid "Work Report"
 msgstr "Parte de traballo"
 
@@ -853,20 +892,20 @@ msgstr "Parte de traballo"
 msgid "Scheduling progress per order"
 msgstr "Progreso da planificación por recurso"
 
-#: 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 "Traballo"
 
 #: 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 "Nome"
 
-#: 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 "Non se puido executar o comando de impresión"
 
@@ -874,8 +913,9 @@ msgstr "Non se puido executar o 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 "Erro"
@@ -884,7 +924,7 @@ msgstr "Erro"
 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"
@@ -892,11 +932,12 @@ msgstr ""
 "Criterion non é válido, outro criterionSatisfaction solápase co mesmo "
 "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 o borrado de {0}. ¿Está seguro?"
 
@@ -904,11 +945,15 @@ msgstr "Confirmar o 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 "Saír"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:69
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:53
+msgid "Edit template"
+msgstr "Editar modelo"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:81
 msgid "External code"
 msgstr "Código externo"
 
@@ -920,7 +965,7 @@ msgstr "engadir nova unidade de configuración"
 msgid "Main preferences"
 msgstr "Preferencias principais"
 
-#: 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"
@@ -928,10 +973,6 @@ msgstr ""
 "Criterion non válido, outro criterionSatisfaction solápase co mesmo "
 "criterionType"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:214
-msgid "The order {0} must be scheduled"
-msgstr "O 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 gardado"
@@ -944,7 +985,7 @@ msgstr "Engadir nova asignación de traballador"
 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 "os recursos por día deben ser non baleiros e maiores que cero"
 
@@ -952,20 +993,19 @@ msgstr "os recursos por día deben ser non baleiros e maiores 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 traballo"
 
-#: 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"
@@ -977,6 +1017,12 @@ msgstr ""
 msgid "Work Report types"
 msgstr "Tipos de partes de traballo"
 
+#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:26
+msgid "Your session has expired after inactivity period. Please log in again."
+msgstr ""
+"A súa sesión expirou tras un tiempo de inactividade. Por favor, inicie "
+"sesión de novo."
+
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:134
 msgid "Total Estimated hours"
 msgstr "Horas totais estimadas"
@@ -1002,15 +1048,28 @@ msgstr "Lista de traballadores virtuais"
 msgid "Name cannot be null or empty"
 msgstr "O nome non pode ser nulo ou baleiro"
 
-#: 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 ten valores maiores ou iguais có 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 do 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 ""
+"O valor non é válido, o valor máximo por defecto debe ser maior có 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 "Data de fin"
 
@@ -1026,11 +1085,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 "o tipo de criterio non permite xerarquí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"
@@ -1040,7 +1099,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 "o nome do perfil xa está a ser usado por outro perfil"
 
@@ -1055,7 +1114,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"
 
@@ -1067,7 +1126,7 @@ msgstr "Lista de formularios de calidade"
 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"
@@ -1097,8 +1156,7 @@ msgstr "Liñas"
 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 "Elemento de pedido non atopado"
 
@@ -1107,17 +1165,29 @@ msgid "Error on showing warning message removing workReportType: "
 msgstr ""
 "Erro ao mostrar mensaxe de advertencia borrando tipo de parte de traballo: "
 
-#: 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 ""
+"Outro elemento de pedido na mesma rama xa está informando dun avance para "
+"este formulario de calidade"
+
+#: 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 maior cá data 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 persoais"
 
 #: 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"
 
@@ -1129,6 +1199,10 @@ msgstr "Partes de traballo"
 msgid "A4"
 msgstr "A4"
 
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41
+msgid "Save Order"
+msgstr "Gardar pedido"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:92
 msgid "{0} annotation required on {1}"
 msgstr "{0} anotación obrigatoria en {1}"
@@ -1142,7 +1216,7 @@ msgstr "Prezo 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"
 
@@ -1150,24 +1224,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 da pestana"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:190
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212
 msgid "Add Criterion"
 msgstr "Engadir 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 "Árbore aplanada {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 "É necesario un MessagesContainer"
 
@@ -1177,14 +1247,14 @@ msgstr "os contrasinais non coinciden"
 
 #: 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 "Data 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"
 
@@ -1201,7 +1271,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 novo"
 
@@ -1209,7 +1279,7 @@ msgstr "Crear pedido novo"
 msgid "General resource allocation"
 msgstr "Asignación de recursos xeral"
 
-#: 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"
 
@@ -1229,11 +1299,15 @@ msgstr "Consulta de partes de traballo"
 msgid "Cannot be empty or null"
 msgstr "Non pode ser baleiro ou 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 "Presuposto 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 "Xerarquía"
 
@@ -1246,10 +1320,6 @@ msgstr "Data 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 outras asignacións"
@@ -1262,10 +1332,6 @@ msgstr "Período de tiempo gardado"
 msgid "CV"
 msgstr "CV"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:264
-msgid "Not Unindent"
-msgstr "Non desindentar"
-
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30
 msgid "Stretches function configuration"
 msgstr "Configuración da función de tramos"
@@ -1274,12 +1340,17 @@ msgstr "Configuración da 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 traballo 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 "Non indentable"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:92
 msgid "User disabled"
 msgstr "Usuario deshabilitado"
 
@@ -1296,36 +1367,31 @@ msgstr "Asociación con perfís"
 msgid "Workers"
 msgstr "Traballadores"
 
-#: 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 "data de fin: {0} debe ser posterior á data 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 do 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 "data de fin: {0} debe ser posterior á data 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 "apelidos do traballador non 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 "Gardar cambios"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:207
 msgid "Error on removing workReportType: "
 msgstr "Erro ao borrar tipo de parte de traballo: "
 
-#: 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 outra máquina que está sendo 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 "Gardar cambios"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:114
 msgid "Total dedication"
@@ -1339,23 +1405,23 @@ msgstr "Ano"
 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 "nome do perfil non 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 "O valor non é válido, o valor actual debe ser menor que o 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 "Data de inicio"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:229
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42
 msgid "Subcontratation date"
 msgstr "Data de subcontratación"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:47
-msgid "Date Start"
-msgstr "Data de inicio"
-
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:23
 msgid "Edit external company"
 msgstr "Editar empresas externas"
@@ -1365,10 +1431,6 @@ msgstr "Editar empresas 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"
@@ -1388,8 +1450,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"
 
@@ -1408,6 +1470,10 @@ msgstr ""
 msgid "Work report type saved"
 msgstr "Tipo de partes de traballo gardado"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1003
+msgid "Cannot be higher than finish hour"
+msgstr "Non pode ser posterior á data de fin"
+
 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:79
 msgid "Prefix"
 msgstr "Prefixo"
@@ -1416,12 +1482,12 @@ msgstr "Prefixo"
 msgid "New Template element"
 msgstr "Novo elemento de modelo"
 
-#: 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"
@@ -1441,7 +1507,7 @@ msgstr "Índice de rendemento da 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"
 
@@ -1449,7 +1515,7 @@ msgstr "Crear recurso virtual"
 msgid "Type data"
 msgstr "Datos do 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 "O código do elemento de pedido non pode ser nulo"
 
@@ -1457,17 +1523,17 @@ msgstr "O código do elemento de pedido non pode 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"
 
@@ -1475,10 +1541,10 @@ msgstr "Pedido"
 msgid "The field name must be unique, not null and not empty"
 msgstr "O nome do campo debe ser único, non nulo e non baleiro"
 
-#: 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"
 
@@ -1490,12 +1556,12 @@ msgstr "Erro ao borrar elemento: "
 msgid "Company name"
 msgstr "Nome da 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 traballo"
 
-#: 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"
 
@@ -1507,11 +1573,15 @@ msgstr "Todas as tarefas do 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 "Xa existe un campo de descrición co mesmo nome."
 
-#: 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 nova asignación"
 
@@ -1519,12 +1589,13 @@ msgstr "Dividir nova 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 calidade"
 
@@ -1549,10 +1620,6 @@ msgstr "Configuración"
 msgid "Categories"
 msgstr "Categorías"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:80
-msgid "Unscheduled"
-msgstr "Non 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
@@ -1563,15 +1630,15 @@ msgstr "Non planificado"
 msgid " to go to output directly"
 msgstr " ir á saída 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 "Engadir novo 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 "Porcentaxe"
 
@@ -1579,7 +1646,7 @@ msgstr "Porcentaxe"
 msgid "Manage criteria"
 msgstr "Xestionar 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"
 
@@ -1587,18 +1654,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 ""
-"O valor non é válido, o valor de precisión debe ser menor có valor máximo "
-"por defecto e non debe ser nulo"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:130
 msgid "No worker selected"
 msgstr "Ningún traballador seleccionado"
@@ -1612,8 +1671,8 @@ msgstr "Número de díxitos"
 msgid "Total capability"
 msgstr "Capacidade 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"
 
@@ -1621,13 +1680,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 conectando co servizo web cliente"
 
@@ -1648,26 +1707,30 @@ msgstr "Data ú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 do criterio satisfeito non especificado"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202
+msgid "Advances sent successfully"
+msgstr "Os avances enviáronse 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} da categoría {1} e {2} da categoría {3} teñen o mesmo código"
 
@@ -1687,11 +1750,11 @@ msgstr "Confirmar o borrado deste perfil. ¿Está seguro?"
 msgid "Navalpro: AdvanceTypes"
 msgstr "Navalpro: Tipos de avance"
 
-#: 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 :"
 
@@ -1699,20 +1762,15 @@ msgstr "Recurso :"
 msgid "Filter by task status"
 msgstr "Filtrar por estado da tarefa"
 
-#: 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 data:"
 
-#: 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 da compañía"
@@ -1742,26 +1800,30 @@ msgstr "Código da empresa"
 msgid "Unknown attribute '{0}' in class {1}"
 msgstr "Atributo descoñecido '{0}' na 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 "nome da máquina non 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 "Seleccione un elemento de pedido a partir do que crear unha 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 "xa 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"
 
@@ -1790,7 +1852,7 @@ msgstr "debe ser maior que a data 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"
 
@@ -1800,7 +1862,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 "[xenérico todos os traballadores]"
 
@@ -1817,7 +1879,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 "Tipo de criterio e os seus criterios gardados"
 
@@ -1825,8 +1887,10 @@ msgstr "Tipo de criterio e os seus criterios gardados"
 msgid "Add New Complementary Field"
 msgstr "Engadir novo 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"
@@ -1841,10 +1905,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 anterior á data de fin"
 
@@ -1852,15 +1921,16 @@ msgstr "debe ser anterior á data 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 "nome do traballador non 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"
@@ -1869,7 +1939,7 @@ msgstr "Recurso"
 msgid "Could not load any resource"
 msgstr "Non se puido 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 "data non especificada"
 
@@ -1877,11 +1947,11 @@ msgstr "data non especificada"
 msgid "Material search"
 msgstr "Búsqueda de materiais"
 
-#: 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"
@@ -1889,13 +1959,17 @@ msgstr ""
 "Debe permitir múltiples criterios activos para este tipo para usar esta "
 "estratexia 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 axustar ao ancho de páxina"
@@ -1905,8 +1979,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 "Pechar"
 
@@ -1919,6 +1993,10 @@ msgstr "Apelidos"
 msgid "Remove"
 msgstr "Borrar"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:215
+msgid "cost category name not specified"
+msgstr "nome da categoría de coste non especificado"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:354
 msgid "Create copy"
 msgstr "Crear copia"
@@ -1960,15 +2038,11 @@ msgstr "Nome nome"
 msgid "Edit quality form"
 msgstr "Editar formulario de calidade"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:127
-msgid "{0}: calendar not found"
-msgstr "{0}: calendario non atopado"
-
 #: 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"
 
@@ -1981,24 +2055,21 @@ msgstr "Tarefas subcontratadas"
 msgid "{0} must not be before {1}"
 msgstr "{0} non 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 ""
-"non hai traballadores cos criterios solicitados: {0}. Por tanto, non se pode "
-"engadir a asignación xené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 "o nome da empresa debe ser único. Xa está a ser 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 "Modelo gardado"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:375
 msgid "the code must be not null or not empty"
 msgstr "o código non pode ser nulo ou baleiro"
 
-#: 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"
@@ -2010,7 +2081,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"
 
@@ -2022,16 +2093,16 @@ msgstr "Usuario gardado"
 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 "Algunhas asignacións a categorías de coste solápanse no tempo"
 
 #: 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
@@ -2041,17 +2112,16 @@ msgstr "Algunhas asignacións a categorías de coste solápanse no tempo"
 #: 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
@@ -2062,6 +2132,7 @@ msgstr "Gardar"
 #: 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"
 
@@ -2070,10 +2141,10 @@ msgstr "Grupo"
 msgid "Exit session"
 msgstr "Saír da 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
@@ -2089,11 +2160,11 @@ msgstr "Lista de estatísticas"
 msgid "Navalpro: QualityForms"
 msgstr "Navalpro: Formularios de calidade"
 
-#: 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 do 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 pendente"
 
@@ -2105,16 +2176,20 @@ msgstr "Data 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 ""
+"O valor non é válido, o valor debe ser maior có valor dos avances previos."
 
-#: 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 "O código do elemento de pedido non pode 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"
 
@@ -2127,7 +2202,7 @@ msgstr "Estado das tarefas de planificacion dun 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 "Vai cambiar a función de asignación. ¿Está seguro?"
 
@@ -2135,7 +2210,7 @@ msgstr "Vai cambiar a función de asignación. ¿Está seguro?"
 msgid "Problems connecting with subcontractor web service"
 msgstr "Problemas conectando co servizo 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 alo menos dous tramos para facer interpolación"
 
@@ -2143,6 +2218,10 @@ msgstr "Debe haber alo menos dous tramos para facer interpolación"
 msgid "Show all labels"
 msgstr "Mostrar todas as 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: i recurso almacenado non é de tipo: {0}"
+
 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38
 msgid "Assigned load"
 msgstr "Carga asignada"
@@ -2155,15 +2234,16 @@ msgstr "Filtrar por traballadores"
 msgid "End Date"
 msgstr "Data 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"
 
@@ -2172,30 +2252,35 @@ msgstr "Recursos por día"
 msgid "ResourceType must be not-null"
 msgstr "ResourceType non 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 ""
-"o nome de tipo de criterio está sendo usado por outro tipo de criterio "
-"importado"
+"Data de fin estimada para a tarefa (presione enter no cadro de texto para "
+"abrir o calendario ou escriba a data 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 gardado"
 
-#: 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 abaixo"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:471
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:26
 msgid "Report structure"
 msgstr "Estrutura do 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 "contrasinal non especificado"
 
 #: 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 "Si"
@@ -2204,8 +2289,8 @@ msgstr "Si"
 msgid "Assigned locations"
 msgstr "Ubicacións 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 xerais"
 
@@ -2217,32 +2302,36 @@ msgstr "Horas traballadas por traballador"
 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 ás máquinas que satisfán os 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 "Dous costes por hora co mesmo tipo solápanse no tempo"
 
-#: 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 nun 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 modelo"
 
-#: 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"
@@ -2251,16 +2340,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 gardado"
 
-#: 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"
 
@@ -2275,26 +2364,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 da máquina non 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 maior que a data 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 "O servizo non xestiona recursos de 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 traballo"
 
@@ -2311,12 +2400,12 @@ msgstr "Asignar formulario de calidade"
 msgid "Edit worker"
 msgstr "Editar traballador"
 
-#: 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"
@@ -2334,11 +2423,11 @@ msgstr "Horas do día"
 msgid "worked hours"
 msgstr "horas traballadas"
 
-#: 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 "o criterio satisfeito ten data de fin anterior á 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"
 
@@ -2358,25 +2447,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 "Lonxitude"
-
-#: 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 "Capacidade"
 
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122
+msgid "Length"
+msgstr "Lonxitude"
+
 #: 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 maior 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 "Erro ao dividir"
 
@@ -2384,8 +2477,11 @@ msgstr "Erro ao 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 "Non se fixeron asignacións"
+
 #: 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
@@ -2398,7 +2494,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 sen fillos"
 
@@ -2419,7 +2515,15 @@ msgstr "Perfil gardado"
 msgid "Task properties"
 msgstr "Propiedades da tarefa"
 
-#: 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 ""
+"Non se pode borrar o elemento de pedido \"{0}\" porque algún dos seus "
+"elementos está a usarse nalgún parte de traballo"
+
+#: 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 algunha función para configurar"
 
@@ -2428,15 +2532,16 @@ msgid "as soon as possible"
 msgstr "tan pronto como sexa 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 "Apelidos"
 
-#: 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
@@ -2453,7 +2558,7 @@ msgstr "Data"
 msgid "the name must be not null or not empty"
 msgstr "o nome non pode ser nulo ou baleiro"
 
-#: 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 "o NIF da empresa debe ser único. Xa está a ser usado"
 
@@ -2463,7 +2568,7 @@ msgstr ""
 "Horas humanas por hora de traballo de máquina dentro de unidade 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."
@@ -2472,7 +2577,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 "Novo parte de traballo"
 
@@ -2490,35 +2595,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 "Data de fin"
 
-#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:32
-msgid "Save order"
-msgstr "Gardar 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 "O criterio e o seu tipo non poden 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 "O valor non é válido, o valor máximo por defecto non 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 "Erro ao borrar elemento: "
 
@@ -2536,11 +2633,11 @@ msgstr "Non se poden calcular gráficos para os datos actuais"
 msgid "Found workers"
 msgstr "Traballadores atopados"
 
-#: 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 os traballadores"
 
-#: 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 "Descrición do traballo"
@@ -2554,6 +2651,8 @@ msgstr "Etiqueta gardada"
 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 "Seleccione conxunto de criterios requeridos e pulse o botón de filtrar"
@@ -2566,9 +2665,24 @@ msgstr ""
 "Ao subcontratar esta tarefa, todas as súas asignacións de recursos "
 "borraranse."
 
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:100
-msgid "Down"
-msgstr "Abaixo"
+#: 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 "Gardar e continuar"
 
 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:124
@@ -2580,24 +2694,13 @@ msgstr "Abaixo"
 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 "Gardar e continuar"
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104
+msgid "Down"
+msgstr "Abaixo"
 
 #: 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"
 
@@ -2605,14 +2708,15 @@ msgstr "Etiqueta"
 msgid "Order costs per resource"
 msgstr "Costes do 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
@@ -2630,7 +2734,7 @@ msgstr "Costes do pedido por recurso"
 msgid "cannot be null or empty"
 msgstr "non pode ser nulo ou baleiro"
 
-#: 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 "O valor non é válido, tendo en conta a lista actual de HoursGroup"
 
@@ -2653,28 +2757,28 @@ msgstr "Formularios de calidade"
 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 o comezo ata a data 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 "Os campos de índice e as etiquetas deben ser únicas e 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 "Os campos de índice e as etiquetas deben ser únicas e 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 o comezo ata a data 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."
@@ -2686,7 +2790,7 @@ msgstr ""
 msgid "Estimate To Complete"
 msgstr "Estimación do coste pendente"
 
-#: 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"
 
@@ -2696,11 +2800,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 requiridos 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 "data de inicio da asignación de coste non especificada"
 
@@ -2711,15 +2811,14 @@ msgstr "data de inicio da asignación de coste non especificada"
 msgid "Unit type"
 msgstr "Tipo de unidade"
 
-#: 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 "o código do material debe ser único. Xa está en uso"
 
@@ -2757,10 +2856,6 @@ msgstr "Perderanse os 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, o valor de precisión non debe ser nulo "
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:207
 msgid "Virtual worker groups"
 msgstr "Grupos virtuais de traballadores"
@@ -2769,28 +2864,32 @@ msgstr "Grupos virtuais de traballadores"
 msgid "Calendar data"
 msgstr "Datos do 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 "O recurso non pode 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 o comezo (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 "o nome de usuario xa está sendo usado"
 
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34
 msgid "Total Hours"
 msgstr "Horas totais"
 
+#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:102
+msgid "code is already used"
+msgstr "o código xa está a ser usado"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:71
 msgid "All orders"
 msgstr "Todos os pedidos"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:128
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:148
 msgid "Criterion Requirements"
 msgstr "Criterios requiridos"
 
@@ -2802,11 +2901,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 de 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 do elemento de pedido"
 
@@ -2836,22 +2936,22 @@ msgstr "SV"
 msgid "start not earlier than"
 msgstr "empezar non 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 "Erro ao mostrar o 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 traballo"
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:82
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
 msgid "Our company login"
 msgstr "Nome de usuario da nosa empresa"
 
@@ -2863,6 +2963,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 requiridos"
+
+#: 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 ""
+"Os cambios que non foron gardados perderanse. ¿Está seguro de que quere ir á "
+"creación de modelos?"
+
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:34
 msgid "PDF"
 msgstr "PDF"
@@ -2883,29 +2995,34 @@ msgstr "Calendarios"
 msgid "Scheduling saved"
 msgstr "Planificación gardada"
 
-#: 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 "A data non pode 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 "Engadir nova 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 "Erro ao mostrar a confirmación de borrado"
 
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:10
+msgid "Show only current satisfied criteria"
+msgstr "Mostrar só os criterios satisfeitos actualmente"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138
 msgid "Could not save new criterion"
 msgstr "Non se puido gardar o novo 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 as filas"
 
@@ -2918,28 +3035,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 "Non 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óns"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:162
+msgid "Done {0} of {1}"
+msgstr "Feito {0} de {1}"
+
 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:46
 msgid "Load due to current order"
 msgstr "Carga debido ao 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 "Data límite (días desde o inicio do proxecto)"
 
 #: 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 "Non se pode borrar esta secuencia de pedido, está a ser usada"
 
@@ -2947,7 +3065,7 @@ msgstr "Non se pode borrar esta secuencia de pedido, está a ser 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"
@@ -2955,27 +3073,40 @@ msgstr ""
 "O último tramo debe ter 100% de porcentaxes de lonxitude e cantidade de "
 "traballo"
 
+#: 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 non calculado correctamente basado en reloxo"
+
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31
 msgid "Each worker configuration unit name"
 msgstr "Nome da unidade de configuración de cada traballador"
 
 #: 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 "O valor non é válido, o tipo non pode estar baleiro"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:406
 msgid "criterion type name is already being used"
 msgstr "o nome de tipo de criterio está sendo 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 ""
 "Non se puido obter o código de pedido, por favor volva intentalo máis tarde"
 
+#: 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 "O valor non é válido, o valor actual non debe estar baleiro"
+
 #: 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"
 
@@ -2983,15 +3114,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
@@ -3009,17 +3140,17 @@ msgstr "Accións"
 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 "Novo 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"
 
@@ -3027,7 +3158,7 @@ msgstr "Precisión"
 msgid "Date last advance measurement"
 msgstr "Data da ú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"
 
@@ -3035,6 +3166,14 @@ msgstr "Hora de inicio"
 msgid "Exceptions"
 msgstr "Excepcións"
 
+#: 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 ""
+"Non se pode borrar o elemento de pedido \"{0}\" porque algún dos seus fillos "
+"está a usarse nalgún parte de traballo"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:173
 msgid "format filters are not valid"
 msgstr "o formato dos filtros non é válido"
@@ -3043,12 +3182,13 @@ msgstr "o formato dos filtros non é válido"
 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 "Non ten 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"
 
@@ -3065,7 +3205,7 @@ msgstr ""
 "O calendario non foi borrado porque aínda ten fillos. Algún outro calendario "
 "deriva deste."
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:87
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88
 msgid "Our company password"
 msgstr "Contrasinal da nosa empresa"
 
@@ -3073,11 +3213,11 @@ msgstr "Contrasinal da nosa empresa"
 msgid "Select print page properties"
 msgstr "Seleccione as propiedades da páxina 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 do criterio satisfeito non 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"
 
@@ -3089,14 +3229,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 ""
-"O valor no es válido, o valor de precisión debe ser menor que o 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"
@@ -3111,14 +3243,14 @@ msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_'."
 msgstr ""
-"O valor no es válido.\n"
+"O valor non é válido.\n"
 " o código no pode conter caracteres como '_'."
 
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:25
 msgid "Profiles authorization"
 msgstr "Autorización de perfís"
 
-#: 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"
 
@@ -3126,14 +3258,13 @@ msgstr "Grupo de horas"
 msgid "Unallocated name"
 msgstr "Nome 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"
 
@@ -3147,18 +3278,14 @@ msgstr "Crear formulario de calidade"
 
 #: 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 non atopado"
-
-#: 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."
@@ -3166,29 +3293,29 @@ msgstr ""
 "Os modelos só poden crearse a partir de elementos de pedido existentes.\n"
 "Non se poden usar elementos de pedido novos."
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:152
+msgid "Doing {0} reassignations"
+msgstr "Realizando {0} reasignacións"
+
 #: 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 "Non 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 "Data de comunicación da 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 "As dependencias teñen prioridade"
 
-#: 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 non especificado"
 
@@ -3223,12 +3350,12 @@ msgstr "Listado de tipos de horas de traballo"
 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"
 
@@ -3240,17 +3367,17 @@ msgstr "Traballo realizado desde a data de inicio:"
 msgid "Must start after"
 msgstr "Debe empezar despois"
 
-#: 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 "Contrasinal"
 
-#: 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 "Observacións"
 
-#: 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"
 
@@ -3265,6 +3392,10 @@ msgstr "Imaxe 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 "Xa existe outro modelo co mesmo nome."
+
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56
 msgid "Month"
 msgstr "Mes"
@@ -3277,12 +3408,12 @@ msgstr "Excepción"
 msgid "At least one order sequence is needed"
 msgstr "Necesítase alo menos unha 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"
 
@@ -3292,11 +3423,11 @@ msgstr ""
 "Non se pode insertar material na vista xeral. Por favor, seleccione unha "
 "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 "data de inicio do criterio satisfeito non especificada"
 
@@ -3307,8 +3438,8 @@ msgstr "O contrasinal non pode ser baleiro para un usuario novo"
 #: 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"
 
@@ -3317,11 +3448,12 @@ msgid "Type name"
 msgstr "Nome do 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"
 
@@ -3329,19 +3461,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 "Exemplo: {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 nova asignación de material fóra da 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 traballador"
 
@@ -3349,7 +3481,8 @@ msgstr "Editar traballador"
 msgid "Cannot be higher than Ending date"
 msgstr "Non pode ser posterior á data 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 "Liñas do parte de traballo"
 
@@ -3361,20 +3494,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 persoais"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:205
 msgid "Workers List"
 msgstr "Lista de traballadores"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:243
+msgid "Worker"
+msgstr "Traballador"
+
 #: 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 "O criterio non debe ser nulo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:243
-msgid "Worker"
-msgstr "Traballador"
-
-#: 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 "nome do criterio non especificado"
 
@@ -3383,7 +3521,16 @@ msgstr "nome do criterio non especificado"
 msgid " The "
 msgstr " O "
 
-#: 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 ""
+"O valor non é válido, o valor máximo por defecto non debe estar baleiro "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:199
+msgid "the "
+msgstr "o "
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:44
 msgid "Access to the system"
 msgstr "Acceso ao sistema"
 
@@ -3405,7 +3552,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 do informe"
 
@@ -3418,27 +3566,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 non atopada"
+
 #: 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 "o nome do criterio debe ser único dentro dun 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 modelo"
 
-#: 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
@@ -3450,15 +3607,14 @@ msgstr "Crear pedido a partir de modelo"
 #: 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"
@@ -3475,8 +3631,8 @@ msgstr "Engadir 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 ""
@@ -3498,12 +3654,13 @@ msgstr "Data 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 "Non se pode realizar a 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 "Presuposto"
 
@@ -3515,7 +3672,7 @@ msgstr "Xa existe outro criterio co mesmo nome"
 msgid "Unit name"
 msgstr "Nome da unidade"
 
-#: 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 "Non se puido abrir o PDF xerado"
 
@@ -3530,7 +3687,7 @@ msgstr "O código non pode ser nulo ou baleiro"
 msgid "Profile name"
 msgstr "Nome do 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"
 
@@ -3543,10 +3700,18 @@ msgstr "Escribir"
 msgid "Number of applications"
 msgstr "Número de aplicacións"
 
-#: 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 ""
+"Data despois da cal a tarefa debe empezar (presione enter no cadro de texto "
+"para abrir o calendario ou escriba a data directamente)"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67
 msgid "Assigned"
 msgstr "Asignado"
@@ -3556,15 +3721,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 "A data non pode 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 "O nome non é válido, xa hai outro tipo de avance co mesmo nome. "
@@ -3574,12 +3739,12 @@ msgstr "O nome non é válido, xa hai outro tipo de avance co mesmo nome. "
 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 "Erro: {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 gardada"
 
@@ -3595,8 +3760,8 @@ msgstr "¿Quere borrar &quot;{0}&quot;?"
 msgid "New criterion"
 msgstr "Criterio novo"
 
-#: 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"
@@ -3605,14 +3770,14 @@ msgstr "Carga"
 msgid "Parent"
 msgstr "Pai"
 
-#: 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
@@ -3639,15 +3804,15 @@ msgstr "Non se atopou un conversor para {0}"
 msgid "start in fixed date"
 msgstr "comezar en data fixa"
 
-#: 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 "Asignacións de materiais"
 
-#: 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 "xa existe unha asignación para os criterios {0}"
 
@@ -3659,28 +3824,33 @@ msgstr "Número de aplicacións 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 "o código xa está a ser 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 ""
+"O valor non é válido, o valor de precisión debe ser menor que o 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 "É necesario alo 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 aplicacións"
 
-#: 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:"
 
@@ -3693,7 +3863,7 @@ msgstr "Dividir"
 msgid "Create new work week"
 msgstr "Crear nova semana de traballo"
 
-#: 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 liñas de parte de traballo"
 
@@ -3705,7 +3875,7 @@ msgstr "Crear tipo de etiqueta"
 msgid "Work record"
 msgstr "Rexistro de traballo"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:286
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:287
 msgid "Select the calendar"
 msgstr "Seleccionar o calendario"
 
@@ -3718,23 +3888,23 @@ msgstr "Criterio gardado"
 msgid "Output format"
 msgstr "Formato de saída"
 
-#: 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 "Data de inicio"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:132
 msgid "Order sequence prefixes can not be repeated"
 msgstr "Os prefixos das secuencias de pedido non poden 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 "Data de inicio"
+
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:77
 msgid "Print"
 msgstr "Imprimir"
@@ -3744,34 +3914,35 @@ msgstr "Imprimir"
 msgid "{0} not found type for criterion "
 msgstr "{0} non atopado 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 "As horas non poden 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 "o tipo de recurso non 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
@@ -3780,7 +3951,7 @@ msgstr "o tipo de recurso non 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"
 
@@ -3800,14 +3971,14 @@ msgstr "A tarefa subcontratada enviouse 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 virtuais"
-
 #: 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 virtuais"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61
 msgid "CPI"
 msgstr "CPI"
@@ -3824,25 +3995,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
@@ -3858,12 +4028,20 @@ msgstr "Editar"
 msgid "Workers list"
 msgstr "Lista de traballadores"
 
+#: 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 ""
+"Algunhas liñas non teñen períodos de asignación.\n"
+"Debaixo móstrase a carga de tódolos recursos da empresa"
+
 #: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:15
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:67
 msgid "Init date"
 msgstr "Data de inicio"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:84
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:96
 msgid "Responsible"
 msgstr "Responsable"
 
@@ -3887,21 +4065,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 "Necesítase alo 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 ""
-"o nome de tipo de etiqueta está sendo usado por outro tipo de etiqueta "
-"importado"
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:182
+msgid "Satisfied"
+msgstr "Satisfeito"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:437
 msgid "percentage must be in range (0,100]"
 msgstr "a porcentaxe debe estar no 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 "A data do tramo debe ser maior ou igual cá data de inicio da tarefa"
 
@@ -3910,8 +4086,15 @@ msgstr "A data do tramo debe ser maior ou igual cá data de inicio da tarefa"
 msgid "New Description"
 msgstr "Nova descrición"
 
+#: 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 ""
+"os códigos das asignacións de recursos a unha categoría de coste deben ser "
+"únicos dentro dun 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"
 
@@ -3919,7 +4102,7 @@ msgstr "XML"
 msgid "Task Properties"
 msgstr "Propiedades da tarefa"
 
-#: 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"
@@ -3931,8 +4114,8 @@ msgstr ""
 msgid "Create new Work Report Type"
 msgstr "Crear novo tipo de parte de traballo"
 
-#: 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"
@@ -3943,6 +4126,7 @@ msgstr ""
 msgid "Cost category saved"
 msgstr "Categoría de coste gardada"
 
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:12
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27
 msgid "name"
 msgstr "nome"
@@ -3970,7 +4154,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} xa está na lista de asignación de recursos"
 
@@ -3978,11 +4166,11 @@ msgstr "{0} xa está na 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 "O tipo de horas no pode ser nulo."
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:56
 msgid "Authorizations"
 msgstr "Autorizacións"
 
@@ -3991,26 +4179,26 @@ msgstr "Autorizacións"
 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 "A data de inicio non pode 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
@@ -4018,15 +4206,11 @@ msgstr "A data de inicio non pode ser nula"
 msgid "Type"
 msgstr "Tipo"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:97
-msgid "Total Hours OrderElement"
-msgstr "Total de horas do 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 "O valor non é válido, o valor de precisión debe ser exacto "
 
@@ -4038,41 +4222,37 @@ msgstr "Xené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 "A data de inicio da excepción debe ser maior cá data 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 " no 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 "O pedido non existe"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:64
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:76
 msgid "Autogenerated"
 msgstr "Autoxerado"
 
-#: 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 "o código de máquina debe ser único. Xa está sendo 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 "o código do criterio debe ser único dentro dun 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 "Engadir criterio requirido"
 
@@ -4085,6 +4265,10 @@ msgstr "Progreso de traballo por tarefa"
 msgid "New order element name:"
 msgstr "Nome do novo 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"
@@ -4109,13 +4293,17 @@ msgstr "Engadir perfil"
 msgid "filter already exists"
 msgstr "o filtro xa 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 "Nome do criterio"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:102
+msgid "missing code in a label"
+msgstr "falta o código nunha 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 "os valores non son válidos, non deben ser nulos"
@@ -4128,11 +4316,11 @@ msgstr "Coste de traballo realizado"
 msgid "Task name"
 msgstr "Nome da tarefa"
 
-#: 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 da asignación de coste non 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"
@@ -4146,7 +4334,7 @@ msgstr ""
 msgid "Average of the worked hours"
 msgstr "Media de horas traballadas"
 
-#: 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"
 
@@ -4166,7 +4354,7 @@ msgstr "Engadir novo criterio requirido"
 msgid "Select the date from which the new version will be valid"
 msgstr "Seleccione a data a partir da cal a versión nova 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 despois de (días desde o inicio do proxecto)"
 
@@ -4177,17 +4365,23 @@ msgstr "Coste presupostado do traballo 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 "Engadir"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:272
+msgid "the name must be not empty"
+msgstr "o nome non pode ser baleiro"
+
 #: 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 gañado"
 
@@ -4202,24 +4396,18 @@ msgstr "Deseleccionar"
 msgid "You should select the type of exception"
 msgstr "Debe seleccionar o 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 "data 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 aos elementos de pedido que satisfán os 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 "Non ten 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"
 
@@ -4227,7 +4415,7 @@ msgstr "Medidas de avance"
 msgid "Filter by categories or materials"
 msgstr "Filtrar por categorías ou materiais"
 
-#: 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 "A porcentaxe de cantidade de traballo debe estar entre 0 y 100"
 
@@ -4243,12 +4431,12 @@ msgstr "A partir de hoxe"
 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índa non 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"
 
@@ -4258,7 +4446,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 "Árbore de modelos"
 
@@ -4286,8 +4474,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 gardada"
 
@@ -4304,16 +4492,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 requiridos asignados"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:507
+msgid "the date must be inside the visualization area"
+msgstr "a data debe estar dentro da á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
@@ -4321,7 +4517,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 "data non especificada."
 
@@ -4333,12 +4529,23 @@ msgstr "Tipo de formulario de calidade"
 msgid "The name of the criterion is empty."
 msgstr "O nome do criterio está baleiro."
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:580
+msgid "The max value must be not empty"
+msgstr "O valor máximo non pode ser baleiro"
+
 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:55
 msgid "New label"
 msgstr "Nova 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 aos elementos de pedido que satisfán os 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 "A data de inicio non pode ser nula"
 
@@ -4348,16 +4555,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 "Non"
 
-#: 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 "O nome non é válido, non 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 "Prezo de subcontratación"
 
@@ -4370,13 +4576,13 @@ msgstr "Debe seleccionar unha 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 virtuais de traballadores"
 
-#: 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"
 
@@ -4387,18 +4593,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 "Axuda sobre a identificación (abre unha ventana nova)"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50
-msgid "Group name"
-msgstr "Nome do 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 "A lonxitude debe ser maior que cero e non nula."
 
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50
+msgid "Group name"
+msgstr "Nome do grupo"
+
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
 msgid "Start date:"
 msgstr "Data de inicio:"
@@ -4412,15 +4618,19 @@ msgstr "Nome do 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 "Non se puido gardar o calendario novo"
 
-#: 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 "O valor non é válido, o valor de precisión non debe estar baleiro"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:188
 msgid "Cannot delete profile: it does not exist anymore"
 msgstr "Non se pode borrar o perfil: xa non existe"
@@ -4437,17 +4647,15 @@ msgstr "Crear e asignar"
 msgid "Add Milestone"
 msgstr "Engadir fito"
 
-#: 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 ""
-"nome, apelidos e nif usados por outro traballador que está sendo 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"
 
@@ -4455,14 +4663,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
@@ -4471,8 +4678,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 traballo"
 
@@ -4493,7 +4700,7 @@ msgstr "Editar usuario"
 msgid "Maximum/minimum of the estimated hours"
 msgstr "Máximo/mínimo das 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"
 
@@ -4506,13 +4713,13 @@ msgstr "Prezo total"
 msgid "Manage advance types"
 msgstr "Xestionar 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 "A data non é 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
@@ -4521,41 +4728,41 @@ msgstr "A data non é 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
@@ -4567,6 +4774,309 @@ msgstr "Borrar"
 msgid "Profiles listing"
 msgstr "Listado de perfís"
 
+#: 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 "TRABALLADOR"
+
+#: 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 "Non se pode modificar esta secuencia de pedido, está a ser 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 "o número de díxitos debe estar entre {0} e{1}"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:129
+msgid "Line"
+msgstr "Liña"
+
+#: 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 "Pendente"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31
+msgid "Failed sent"
+msgstr "Fallo no envío"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32
+msgid "Success sent"
+msgstr "Éxito no envío"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27
+msgid "Finished"
+msgstr "Rematado"
+
+#: 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 "o tipo de recurso debe ser Traballador ou Máquina"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:194
+msgid "Working hours shouldn't be negative"
+msgstr "As horas de traballo non poden ser negativas"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:221
+msgid "Total percentage should be less than 100%"
+msgstr "A porcentaxe 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 ""
+" O criterio {0} non se pode asignar a este grupo de horas porque o seu tipo "
+"de recurso é distinto."
+
+#: 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 ""
+" O criterio {0} non se pode asignar a este grupo de horas porque xa existe "
+"no 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} xa é fillo doutro {1}"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:210
+msgid "it's already somewhat scheduled"
+msgstr "xa está planificado dalgún xeito"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:224
+msgid "it can't be unscheduled"
+msgstr "non se pode quitar a 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 "Non 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 ten a mesma etiqueta asignada, así que este elemento xa está "
+"herdando 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 "Non pode haber dous avances que propagan nun 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 no 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 " O {0} xa existe noutro 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 "REMATADO"
+
+#: 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 PENDENTE 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 "As horas de traballo deben ser maiores o iguais 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 ""
+"O valor de horas de traballo non é válido, tendo en conta a 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 servizos web"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34
+msgid "Web service writer"
+msgstr "Escritura de servizos web"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35
+msgid "All orders read allowed"
+msgstr "Permitida lectura de tódolos pedidos"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36
+msgid "All orders edition allowed"
+msgstr "Permitida edición de tódolos 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 "Non desindentar"
+
+#~ msgid ""
+#~ "Value is not valid, the Precision value must be less than the defalt max "
+#~ "value and not null"
+#~ msgstr ""
+#~ "O valor non é válido, o valor de precisión debe ser menor có valor máximo "
+#~ "por defecto e non debe ser nulo"
+
+#~ msgid "Not editable"
+#~ msgstr "Non editable"
+
+#~ msgid "label type name is used by another label type being imported"
+#~ msgstr ""
+#~ "o nome de tipo de etiqueta está sendo usado por outro tipo de etiqueta "
+#~ "importado"
+
+#~ msgid "Relationship of the resource with the enterprise "
+#~ msgstr "Relación do recurso coa empresa "
+
+#~ msgid "Location where the resource work"
+#~ msgstr "Localización onde traballa o recurso"
+
+#~ msgid "Leave"
+#~ msgstr "Baixa"
+
+#~ msgid "Training courses and labor training"
+#~ msgstr "Cursos e formación laboral"
+
+#~ msgid "Job"
+#~ msgstr "Emprego"
+
+#~ msgid "Professional category"
+#~ msgstr "Categoría profesional"
+
+#~ msgid "medicalLeave"
+#~ msgstr "baixa médica"
+
+#~ msgid "paternityLeave"
+#~ msgstr "baixa por paternidade"
+
+#~ msgid "children"
+#~ msgstr "hijos"
+
+#~ msgid "percentage"
+#~ msgstr "porcentaxe"
+
+#~ msgid "units"
+#~ msgstr "unidades"
+
+#~ msgid "subcontractor"
+#~ msgstr "subcontratista"
+
+#, fuzzy
+#~ msgid "Apply filtering to order elements satisfying required critera"
+#~ msgstr ""
+#~ "Aplicar filtrado aos elementos de pedido que satisfán os criterios "
+#~ "requeridos"
+
+#~ msgid "The order {0} must be scheduled"
+#~ msgstr "O 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 outra máquina que está sendo importada"
+
+#~ msgid "Filter by label:"
+#~ msgstr "Filtrar por etiqueta:"
+
+#~ msgid "{0}: calendar not found"
+#~ msgstr "{0}: calendario non atopado"
+
+#~ msgid "criterion type name is used by another criterion type being imported"
+#~ msgstr ""
+#~ "o nome de tipo de criterio está sendo usado por outro tipo de criterio "
+#~ "importado"
+
+#~ msgid "machine code not specified"
+#~ msgstr "código da máquina non especificado"
+
+#~ msgid "Order element not found"
+#~ msgstr "Elemento de pedido non atopado"
+
+#~ msgid "machine code has to be unique. It is already used"
+#~ msgstr "o código de máquina debe ser único. Xa está sendo usado"
+
+#~ msgid ""
+#~ "first name, surname, and nif are used by another worker being imported"
+#~ msgstr ""
+#~ "nome, apelidos e nif usados por outro traballador que está sendo importado"
+
 #~ msgid "Starting date:"
 #~ msgstr "Data de inicio:"