diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot
index 35eba51e8..ab58bfd5b 100644
--- a/ganttzk/src/main/resources/i18n/keys.pot
+++ b/ganttzk/src/main/resources/i18n/keys.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 11:13+0100\n"
+"POT-Creation-Date: 2010-02-03 13:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,12 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36
-msgid "Show all labels"
-msgstr ""
-
 #: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
-#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:11
+#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:21
 msgid "Zoom level"
 msgstr ""
 
@@ -33,14 +29,6 @@ msgstr ""
 msgid "0% - 100%"
 msgstr ""
 
-#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:17
-msgid "Filter"
-msgstr ""
-
-#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:33
-msgid "Critical path"
-msgstr ""
-
 #: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:30
 msgid "Year"
 msgstr ""
@@ -49,6 +37,10 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:34
+msgid "Show/Hide resources"
+msgstr ""
+
 #: ./ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:206
 msgid "Set End-Start"
 msgstr ""
@@ -65,10 +57,6 @@ msgstr ""
 msgid "Hide critical path"
 msgstr ""
 
-#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:39
-msgid "Show all resources"
-msgstr ""
-
 #: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:116
 msgid "+ 100%"
 msgstr ""
@@ -77,11 +65,19 @@ msgstr ""
 msgid "Day"
 msgstr ""
 
+#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:28
+msgid "Show/Hide Critical path"
+msgstr ""
+
 #: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:111
 msgid "100%"
 msgstr ""
 
-#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:42
+#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:31
+msgid "Show/Hide labels"
+msgstr ""
+
+#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:17
 msgid "Print"
 msgstr ""
 
@@ -109,6 +105,10 @@ msgstr ""
 msgid "Quarter"
 msgstr ""
 
+#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:14
+msgid "Refresh"
+msgstr ""
+
 #: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:404
 msgid "Show critical path"
 msgstr ""
diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot
index 1ab63538f..935649fc6 100644
--- a/navalplanner-webapp/src/main/resources/i18n/keys.pot
+++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 11:13+0100\n"
+"POT-Creation-Date: 2010-02-03 13:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -106,7 +106,7 @@ msgstr ""
 #: ./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:186
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:188
 #: ./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
@@ -154,7 +154,7 @@ msgstr ""
 msgid "from"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:197
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:199
 msgid "Select"
 msgstr ""
 
@@ -166,7 +166,7 @@ msgstr ""
 #: ./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:56
+#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:57
 #: ./navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:32
 #: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:1
 #: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:43
@@ -187,6 +187,10 @@ msgid ""
 "date"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:196
+msgid "Reassign"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:181
 msgid "A type must be selected"
 msgstr ""
@@ -225,7 +229,7 @@ msgstr ""
 msgid "Managing fields and labels"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:57
+#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:58
 #: ./navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:33
 msgid "Quality Forms"
 msgstr ""
@@ -238,7 +242,7 @@ msgstr ""
 msgid "Order sequences"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:252
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:254
 msgid "Exportation options"
 msgstr ""
 
@@ -294,10 +298,10 @@ 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:69
+#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:71
 #: ./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:180
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:182
 #: ./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
@@ -342,11 +346,11 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:484
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:470
 msgid "It not could remove the order element "
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:619
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:588
 msgid "Not the same hours group, impossible to update"
 msgstr ""
 
@@ -367,11 +371,15 @@ msgstr ""
 msgid "Category name"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:62
+msgid "Maximum/minimum of the worked hours"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:57
 msgid "hours type :"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:636
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:605
 msgid "Not the same material, impossible to update"
 msgstr ""
 
@@ -383,7 +391,7 @@ msgstr ""
 msgid "Name/Code"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:556
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:585
 msgid "Create order"
 msgstr ""
 
@@ -401,6 +409,10 @@ msgstr ""
 msgid "cannot include an Advance of the same Advance type twice"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:684
+msgid "Hour start"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:40
 #: ./navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39
 msgid "Create From Template"
@@ -410,13 +422,9 @@ msgstr ""
 msgid "Select print visualization options"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:684
-msgid "Hour start"
-msgstr ""
-
 #: ./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:147
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:149
 msgid "Start"
 msgstr ""
 
@@ -488,7 +496,7 @@ msgstr ""
 msgid "Changes saved"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:736
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:766
 msgid "See scheduling"
 msgstr ""
 
@@ -504,7 +512,7 @@ msgstr ""
 
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52
 #: ./navalplanner-webapp/src/main/webapp/planner/order.zul:56
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:99
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:101
 msgid "Subcontract"
 msgstr ""
 
@@ -515,7 +523,7 @@ msgstr ""
 
 #: ./navalplanner-webapp/src/main/webapp/planner/main.zul:56
 #: ./navalplanner-webapp/src/main/webapp/planner/order.zul:73
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:151
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:153
 msgid "End"
 msgstr ""
 
@@ -533,10 +541,14 @@ msgid "criterion type not specified"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:275
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:520
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:522
 msgid "Indent"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:144
+msgid "must be not empty"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:69
 msgid "Show all resource assignments"
 msgstr ""
@@ -581,7 +593,7 @@ msgstr ""
 
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:67
 #: ./navalplanner-webapp/src/main/webapp/planner/order.zul:54
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:109
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:111
 msgid "Resource allocation"
 msgstr ""
 
@@ -641,7 +653,10 @@ msgid "Dependencies"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:102
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:500
+#: ./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
 msgid "Information"
 msgstr ""
 
@@ -711,15 +726,15 @@ msgstr ""
 msgid "a disabled resource has enabled subresources"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:28
-msgid "Add new advance assignment"
-msgstr ""
-
 #: ./navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27
 #: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51
 msgid "Client"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:28
+msgid "Add new advance assignment"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:130
 msgid "there exist multiple calendars with name {0}"
 msgstr ""
@@ -776,7 +791,7 @@ msgstr ""
 msgid "Delete Milestone"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:499
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:510
 msgid "The order has no scheduled elements"
 msgstr ""
 
@@ -860,7 +875,7 @@ msgstr ""
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1113
 #: ./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:475
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:477
 msgid "Confirm deleting {0}. Are you sure?"
 msgstr ""
 
@@ -890,7 +905,7 @@ msgid ""
 "same criterion"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:196
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:214
 msgid "The order {0} must be scheduled"
 msgstr ""
 
@@ -937,7 +952,7 @@ msgstr ""
 msgid "Work Report types"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:132
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:134
 msgid "Total Estimated hours"
 msgstr ""
 
@@ -970,7 +985,7 @@ msgstr ""
 #: ./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:248
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:250
 msgid "End date"
 msgstr ""
 
@@ -1027,9 +1042,9 @@ msgstr ""
 msgid "Order Details"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:510
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:511
 #: ./navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:118
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:120
 msgid "Criteria"
 msgstr ""
 
@@ -1101,7 +1116,7 @@ msgstr ""
 msgid "Estimated hours"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:595
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:597
 msgid "Modified"
 msgstr ""
 
@@ -1109,7 +1124,7 @@ msgstr ""
 msgid "Edit virtual resource"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:206
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:208
 msgid "Apply tab changes"
 msgstr ""
 
@@ -1143,7 +1158,7 @@ msgstr ""
 msgid "Ending date"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:260
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:262
 msgid "Hours groups"
 msgstr ""
 
@@ -1168,6 +1183,10 @@ msgstr ""
 msgid "General resource allocation"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:60
+msgid "Statistics log"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46
 #: ./navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:39
 #: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:43
@@ -1290,7 +1309,7 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:100
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:102
 msgid "Is subcontracted"
 msgstr ""
 
@@ -1298,7 +1317,11 @@ msgstr ""
 msgid "profile name not specified"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:226
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:842
+msgid "Value is not valid, the current value must be less than max value"
+msgstr ""
+
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:228
 #: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42
 msgid "Subcontratation date"
 msgstr ""
@@ -1307,12 +1330,8 @@ msgstr ""
 msgid "Date Start"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:842
-msgid "Value is not valid, the current value must be less than max value"
-msgstr ""
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3
-msgid "Filter by label:"
+#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:23
+msgid "Edit external company"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:58
@@ -1320,8 +1339,8 @@ msgstr ""
 msgid "Day"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:23
-msgid "Edit external company"
+#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3
+msgid "Filter by label:"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:202
@@ -1329,6 +1348,10 @@ msgstr ""
 msgid "Report advances"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:54
+msgid "From Chosen"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53
 msgid "Hour costs"
 msgstr ""
@@ -1366,7 +1389,7 @@ msgstr ""
 msgid "New Template element"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:244
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:246
 #: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46
 msgid "Subcontracted code"
 msgstr ""
@@ -1401,6 +1424,10 @@ msgstr ""
 msgid "The order element code cannot be null"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/webapp/planner/reassign.zul:33
+msgid "Reassigning type"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:688
 msgid "Hour finish"
 msgstr ""
@@ -1527,11 +1554,11 @@ msgstr ""
 msgid "Total order element hours"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:158
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:160
 msgid "Calculation type"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:127
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:136
 msgid "Updated"
 msgstr ""
 
@@ -1555,7 +1582,7 @@ msgid "Total capability"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:471
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:649
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:635
 msgid "Hours invested"
 msgstr ""
 
@@ -1564,12 +1591,12 @@ msgid "Navalpro: Calendars"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:467
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:648
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:516
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:634
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:517
 msgid "Advance"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:227
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:233
 msgid "Problems connecting with client web service"
 msgstr ""
 
@@ -1600,11 +1627,11 @@ msgstr ""
 
 #: ./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:660
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:500
-#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:55
+#: ./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:256
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:258
 #: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:38
 msgid "Labels"
 msgstr ""
@@ -1613,7 +1640,7 @@ msgstr ""
 msgid "both {0} of category {1} and {2} of category {3} have the same code"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:110
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:112
 msgid "Resources search"
 msgstr ""
 
@@ -1646,11 +1673,15 @@ msgstr ""
 msgid "Order element"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:281
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:355
+#: ./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
 msgid "Select date:"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:155
+msgid "Doing Reassignation"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:197
 msgid "Company view"
 msgstr ""
@@ -1680,8 +1711,12 @@ msgstr ""
 msgid "Unknown attribute '{0}' in class {1}"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:2
+msgid "Filter by"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:279
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:281
 msgid "Calendar allocation"
 msgstr ""
 
@@ -1710,7 +1745,7 @@ msgstr ""
 msgid "Edit cost category"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:115
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:117
 msgid "Order Element Information"
 msgstr ""
 
@@ -1778,7 +1813,7 @@ 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/reports/OrderCostsPerResourceController.java:139
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:801
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:831
 msgid "must be lower than finish date"
 msgstr ""
 
@@ -1821,7 +1856,7 @@ msgid ""
 "strategy"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:54
+#: ./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
@@ -1838,7 +1873,7 @@ msgstr ""
 
 #: ./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:198
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:200
 msgid "Close"
 msgstr ""
 
@@ -1863,6 +1898,10 @@ msgstr ""
 msgid "Criterions Requirement"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:46
+msgid "Average of the estimated hours"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62
 msgid "SPI"
 msgstr ""
@@ -1973,7 +2012,7 @@ msgstr ""
 #: ./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:112
+#: ./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/calendars/calendars.zul:40
@@ -2005,6 +2044,10 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:29
+msgid "Statistics list "
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21
 msgid "Navalpro: QualityForms"
 msgstr ""
@@ -2013,7 +2056,7 @@ msgstr ""
 msgid "Edit advance type data"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:124
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:133
 msgid "Pending update"
 msgstr ""
 
@@ -2051,7 +2094,7 @@ msgstr ""
 msgid "You are going to change the assignment function. Are you sure?"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:164
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:170
 msgid "Problems connecting with subcontractor web service"
 msgstr ""
 
@@ -2077,13 +2120,13 @@ msgstr ""
 
 #: ./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:6
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:12
+#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:7
+#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:13
 #: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29
 msgid "Filter"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:184
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:186
 msgid "Resources Per Day"
 msgstr ""
 
@@ -2096,11 +2139,11 @@ msgstr ""
 msgid "criterion type name is used by another criterion type being imported"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:412
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:413
 msgid "Order saved"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:456
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:458
 msgid "Move down"
 msgstr ""
 
@@ -2122,7 +2165,7 @@ msgstr ""
 msgid "Assigned locations"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:52
+#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:53
 #: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:36
 msgid "General data"
 msgstr ""
@@ -2140,7 +2183,7 @@ msgid "Calculate Number of Hours"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:292
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:294
 #: ./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
@@ -2151,8 +2194,8 @@ msgstr ""
 msgid "Two hour costs with the same type overlap in time"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:429
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:751
+#: ./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
 msgid "Create Template"
 msgstr ""
@@ -2202,7 +2245,7 @@ msgstr ""
 
 #: ./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:784
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:814
 msgid "must be greater than start date"
 msgstr ""
 
@@ -2261,7 +2304,7 @@ msgstr ""
 msgid "Stretches"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:173
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:175
 msgid "Allocations"
 msgstr ""
 
@@ -2317,7 +2360,7 @@ msgstr ""
 msgid "Removed calendar \"{0}\""
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:254
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:256
 msgid "Node without children"
 msgstr ""
 
@@ -2455,7 +2498,7 @@ msgstr ""
 msgid "All workers"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:236
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:238
 #: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48
 msgid "Work description"
 msgstr ""
@@ -2469,6 +2512,10 @@ msgstr ""
 msgid "Split assignment"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:3
+msgid "Select required criteria set and press filter button"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java:77
 msgid ""
 "As you are subcontracting this task, all the resource allocations related "
@@ -2497,7 +2544,7 @@ msgstr ""
 #: ./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:114
+#: ./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
@@ -2539,7 +2586,7 @@ msgstr ""
 msgid "cannot be null or empty"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:377
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:378
 msgid "Value is not valid, taking into account the current list of HoursGroup"
 msgstr ""
 
@@ -2567,7 +2614,7 @@ msgid "Hours group"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:29
-#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:84
+#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:86
 msgid "Days from Beginning to Deadline"
 msgstr ""
 
@@ -2579,18 +2626,8 @@ msgstr ""
 msgid "Estimate At Completion"
 msgstr ""
 
-#: ./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/qualityforms/QualityFormCRUDController.java:353
-msgid "Delete item. Are you sure?"
-msgstr ""
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:175
-msgid "Edit machine"
-msgstr ""
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61
-msgid "Estimate To Complete"
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:27
+msgid "Indirect"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:233
@@ -2599,8 +2636,18 @@ msgid ""
 "with different resource type."
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:27
-msgid "Indirect"
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61
+msgid "Estimate To Complete"
+msgstr ""
+
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:175
+msgid "Edit machine"
+msgstr ""
+
+#: ./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/qualityforms/QualityFormCRUDController.java:353
+msgid "Delete item. Are you sure?"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:29
@@ -2630,8 +2677,8 @@ msgstr ""
 msgid "materialcode has to be unique. It is already used"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41
-msgid "Load due to other assignments"
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:25
+msgid "Direct"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95
@@ -2642,8 +2689,8 @@ msgstr ""
 msgid "Output format:"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:25
-msgid "Direct"
+#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41
+msgid "Load due to other assignments"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55
@@ -2681,7 +2728,7 @@ msgid "Resource cannot be null"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:27
-#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:79
+#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:81
 msgid "Delay from beginning (days)"
 msgstr ""
 
@@ -2709,7 +2756,7 @@ msgstr ""
 msgid "External companies listing"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:182
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:186
 msgid "Order from client"
 msgstr ""
 
@@ -2748,7 +2795,7 @@ msgstr ""
 #: ./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:483
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:485
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:185
 msgid "Error on showing removing element: "
 msgstr ""
@@ -2833,7 +2880,7 @@ msgid "Finish hour"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29
-#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:58
+#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:59
 msgid "Assignment log"
 msgstr ""
 
@@ -2873,12 +2920,12 @@ msgstr ""
 msgid "criterion type name is already being used"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:400
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:386
 msgid "Could not get order code, please try again later"
 msgstr ""
 
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:261
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:500
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:502
 msgid "Unindent"
 msgstr ""
 
@@ -2912,7 +2959,7 @@ msgstr ""
 msgid "Order Scheduling"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:215
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:217
 #: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44
 msgid "External company"
 msgstr ""
@@ -2938,7 +2985,7 @@ msgstr ""
 msgid "Exceptions"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:163
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:173
 msgid "format filters are not valid"
 msgstr ""
 
@@ -2946,6 +2993,11 @@ msgstr ""
 msgid "Indirect labels"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:519
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:540
+msgid "You don't have read access to this order"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:105
 msgid "Scheduling state"
 msgstr ""
@@ -3018,7 +3070,7 @@ msgstr ""
 msgid "Unallocated name"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:477
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:479
 msgid "Move up"
 msgstr ""
 
@@ -3050,7 +3102,7 @@ msgstr ""
 msgid "Order element not found"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:165
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:166
 msgid ""
 "Templates can only be created from already existent order elements.\n"
 "Newly order elements cannot be used."
@@ -3070,7 +3122,7 @@ msgstr ""
 msgid "Scheduling"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:231
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:233
 msgid "Subcontract communication date"
 msgstr ""
 
@@ -3165,12 +3217,12 @@ msgstr ""
 msgid "At least one order sequence is needed"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:523
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:552
 msgid "Edit order"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:147
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:152
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:196
 msgid "Send"
 msgstr ""
 
@@ -3192,6 +3244,7 @@ msgstr ""
 
 #: ./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
 msgid "All"
@@ -3204,8 +3257,9 @@ msgstr ""
 #: ./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/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:270
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:272
 msgid "Accept"
 msgstr ""
 
@@ -3317,11 +3371,6 @@ msgstr ""
 msgid "Create order from Template"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:8
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:10
-msgid "Filters"
-msgstr ""
-
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:74
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51
 #: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:50
@@ -3338,7 +3387,7 @@ msgstr ""
 #: ./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:73
+#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:75
 #: ./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
@@ -3346,6 +3395,11 @@ msgstr ""
 msgid "Code"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:8
+#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:10
+msgid "Filters"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:289
 msgid "Materials saved"
 msgstr ""
@@ -3379,7 +3433,7 @@ msgstr ""
 msgid "Update exception"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:167
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:168
 msgid "Operation cannot be done"
 msgstr ""
 
@@ -3420,7 +3474,11 @@ msgstr ""
 msgid "Write"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:98
+#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:38
+msgid "Number of applications"
+msgstr ""
+
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:101
 msgid "Filter type"
 msgstr ""
 
@@ -3451,8 +3509,8 @@ msgstr ""
 msgid "Advance type"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:229
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:166
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:235
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172
 msgid "Error: {0}"
 msgstr ""
 
@@ -3472,8 +3530,8 @@ msgstr ""
 msgid "New criterion"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:207
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:298
+#: ./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/webapp/planner/_legendLoadChartOrder.zul:48
 msgid "Load"
 msgstr ""
@@ -3482,7 +3540,7 @@ msgstr ""
 msgid "Parent"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:653
+#: ./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/webapp/resources/search/allocation_selector.zul:62
 #: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:53
@@ -3516,11 +3574,11 @@ msgstr ""
 msgid "start in fixed date"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:207
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:209
 msgid "Go to advanced Allocation"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:258
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:260
 msgid "Material assignments"
 msgstr ""
 
@@ -3528,6 +3586,10 @@ msgstr ""
 msgid "already exists an allocation for criteria {0}"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:42
+msgid "Number of finished applications"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:916
 msgid "Text field"
 msgstr ""
@@ -3578,7 +3640,7 @@ msgstr ""
 msgid "Work record"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:284
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:286
 msgid "Select the calendar"
 msgstr ""
 
@@ -3636,12 +3698,13 @@ msgstr ""
 #: ./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:116
+#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:121
 #: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:34
 #: ./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:272
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:294
+#: ./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/calendars/calendars.zul:42
@@ -3664,7 +3727,7 @@ msgstr ""
 msgid "General user data"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:156
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:200
 msgid "Subcontracted task sent successfully"
 msgstr ""
 
@@ -3697,8 +3760,8 @@ msgstr ""
 #: ./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:416
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:705
+#: ./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/calendars/BaseCalendarCRUDController.java:370
 #: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36
 #: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39
@@ -3763,6 +3826,10 @@ msgstr ""
 msgid "At least one stretch is needed"
 msgstr ""
 
+#: ./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 ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:437
 msgid "percentage must be in range (0,100]"
 msgstr ""
@@ -3776,6 +3843,11 @@ msgstr ""
 msgid "New Description"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:159
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:164
+msgid "XML"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:60
 msgid "Task Properties"
 msgstr ""
@@ -3824,6 +3896,10 @@ msgstr ""
 msgid "{0} (max: {1})"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/webapp/planner/reassign.zul:29
+msgid "Reassigning"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:435
 msgid "{0} already assigned to resource allocation list"
 msgstr ""
@@ -3861,7 +3937,7 @@ msgstr ""
 #: ./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:119
+#: ./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
@@ -3959,6 +4035,10 @@ msgstr ""
 msgid "Add profile"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:162
+msgid "filter already exists"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:19
 #: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:21
 #: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:43
@@ -3982,13 +4062,17 @@ msgstr ""
 msgid "cost assignment's resource not specified"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:294
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:295
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_' \n"
 " and should not be empty"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:50
+msgid "Average of the worked hours"
+msgstr ""
+
 #: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42
 msgid "an authorization type must be set"
 msgstr ""
@@ -3997,7 +4081,7 @@ msgstr ""
 msgid "Unassigned"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:139
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:141
 msgid "Task information"
 msgstr ""
 
@@ -4029,8 +4113,8 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:208
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:299
+#: ./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
 msgid "Earned value"
 msgstr ""
 
@@ -4052,6 +4136,15 @@ msgstr ""
 msgid "Deadline"
 msgstr ""
 
+#: ./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 ""
+
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:490
+msgid "You don't have permissions to edit this order"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:213
 msgid "Advance measurements"
 msgstr ""
@@ -4068,6 +4161,10 @@ msgstr ""
 msgid "Machine data"
 msgstr ""
 
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42
+msgid "From Today"
+msgstr ""
+
 #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59
 msgid "VAC"
 msgstr ""
@@ -4087,7 +4184,7 @@ msgstr ""
 msgid "Label type"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:53
+#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:54
 msgid "Template Tree"
 msgstr ""
 
@@ -4120,7 +4217,7 @@ msgstr ""
 msgid "Machine saved"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:168
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:170
 msgid "Recommended Allocation"
 msgstr ""
 
@@ -4140,8 +4237,8 @@ msgstr ""
 #: ./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:120
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:182
+#: ./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/orders/_listOrderElementHours.zul:34
 #: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:113
@@ -4186,7 +4283,7 @@ msgstr ""
 msgid "The name is not valid, the name must not be null "
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:240
+#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:242
 msgid "Subcontract price"
 msgstr ""
 
@@ -4205,7 +4302,7 @@ msgstr ""
 
 #: ./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:490
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:501
 msgid "Removed {0}"
 msgstr ""
 
@@ -4245,8 +4342,8 @@ msgstr ""
 msgid "Could not save new calendar"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:332
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:423
+#: ./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
 msgid "h"
 msgstr ""
 
@@ -4317,7 +4414,11 @@ msgstr ""
 msgid "Edit User"
 msgstr ""
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:98
+#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:54
+msgid "Maximum/minimum of the estimated hours"
+msgstr ""
+
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:101
 msgid "Filter pattern"
 msgstr ""
 
@@ -4345,14 +4446,14 @@ msgstr ""
 #: ./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:528
+#: ./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:721
+#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:750
 #: ./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