diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot index aa13b42d0..fa074ae20 100644 --- a/ganttzk/src/main/resources/i18n/keys.pot +++ b/ganttzk/src/main/resources/i18n/keys.pot @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: libreplan-1.3.1\n" +"Project-Id-Version: libreplan-1.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-02 12:44+0200\n" +"POT-Creation-Date: 2012-11-22 13:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "" msgid "Worker" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:682 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:684 msgid "Show money cost bar" msgstr "" @@ -39,7 +39,7 @@ msgstr "" msgid "Start" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:661 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:663 msgid "Show reported hours" msgstr "" @@ -76,7 +76,7 @@ msgstr "" msgid "Criterion" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:688 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:690 msgid "Hide money cost bar" msgstr "" @@ -145,7 +145,7 @@ msgstr "" msgid "Name" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:641 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:643 msgid "Show progress" msgstr "" @@ -181,7 +181,7 @@ msgstr "" msgid "decreasing zoom" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:622 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:624 msgid "Hide critical path" msgstr "" @@ -189,7 +189,7 @@ msgstr "" msgid "Day" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:668 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:670 msgid "Hide reported hours" msgstr "" @@ -238,10 +238,10 @@ msgstr "" msgid "Refresh" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:617 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:619 msgid "Show critical path" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:646 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:648 msgid "Hide progress" msgstr "" diff --git a/libreplan-webapp/src/main/resources/i18n/keys.pot b/libreplan-webapp/src/main/resources/i18n/keys.pot index e1900fe7a..dfcf9da5c 100644 --- a/libreplan-webapp/src/main/resources/i18n/keys.pot +++ b/libreplan-webapp/src/main/resources/i18n/keys.pot @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: libreplan-1.3.1\n" +"Project-Id-Version: libreplan-1.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-02 12:44+0200\n" +"POT-Creation-Date: 2012-11-22 13:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -69,7 +69,7 @@ msgstr "" msgid "Create Virtual Worker" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:825 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:862 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:105 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 @@ -96,6 +96,8 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:88 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:128 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 @@ -229,7 +231,7 @@ msgid "Summary" msgstr "" #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:170 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:172 msgid "Predefined" msgstr "" @@ -269,8 +271,8 @@ msgstr "" msgid "Criterion requirements" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1570 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1576 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1631 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1637 msgid "please, select a timesheet template type" msgstr "" @@ -282,7 +284,7 @@ msgstr "" msgid "Sum of expenses imputed in children tasks" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:710 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:714 msgid "Progress that are reported by quality forms can not be modified" msgstr "" @@ -302,6 +304,10 @@ msgstr "" msgid "Alpha must be greater than 0" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1171 +msgid "code is already used in another project" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40 msgid "Active period from" msgstr "" @@ -342,7 +348,7 @@ msgstr "" msgid "entity name not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:424 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:445 msgid "You do not have permissions to go to worker edition window" msgstr "" @@ -407,7 +413,7 @@ msgid "" "present." msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:160 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:163 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/ResourceCalendar.java:78 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:216 msgid "resource not specified" @@ -426,14 +432,14 @@ msgstr "" msgid "criterion not specified" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:473 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:474 msgid "" "only one timesheet line per day and task is allowed in personal timesheets" msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 -#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:87 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:169 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88 @@ -465,13 +471,12 @@ msgstr "" msgid "Cannot be higher than Ending Date" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 msgid "" "Roles of LDAP users cannot be managed because LDAP is enabled and LDAP roles " "are being used." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1176 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 msgid "Indent" msgstr "" @@ -484,7 +489,7 @@ msgstr "" msgid "Save passwords in database" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1230 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 msgid "Consolidated progress measurement cannot be removed" msgstr "" @@ -534,7 +539,7 @@ msgstr "" msgid "LibrePlan: Labels" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:348 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:363 msgid "You have exceeded the maximum limit of users" msgstr "" @@ -542,7 +547,7 @@ msgstr "" msgid "LDAP connection was successful" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:349 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:350 msgid "" "This resource allocation type is incompatible. The task has an associated " "order element which has a progress that is of type subcontractor. " @@ -628,13 +633,13 @@ msgid "Client" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:660 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:669 msgid "" "there are no resources for required criteria: {0}. So the generic allocation " "can't be added" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1504 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1565 msgid "must be later than start date" msgstr "" @@ -642,7 +647,7 @@ msgstr "" msgid "Role search strategy" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:398 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:401 msgid "fields should match with timesheet data if are shared by lines" msgstr "" @@ -691,11 +696,11 @@ msgstr "" msgid "Group strategy" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1085 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:894 msgid "Budget: {0}, Consumed: {1} ({2}%)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1552 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1561 msgid "Configure" msgstr "" @@ -716,8 +721,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:211 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:211 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1221 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:215 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1281 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:826 @@ -732,8 +737,8 @@ msgstr "" msgid "External code" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:193 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:644 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:197 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:748 msgid "Personal timesheet saved" msgstr "" @@ -863,6 +868,7 @@ msgstr "" msgid "This project has already been added." msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:173 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:558 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:621 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 @@ -895,7 +901,7 @@ msgstr "" msgid "Add new progress assignment" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1323 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1342 msgid "" "Value must be a multiple of the precision value of the progress type: {0}" msgstr "" @@ -931,6 +937,11 @@ msgstr "" msgid "Subcontracting communication date" msgstr "" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:162 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:28 +msgid "Finished" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31 msgid "Personal data" msgstr "" @@ -951,11 +962,11 @@ msgstr "" msgid "Some sequences to be removed do not exist" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1301 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1286 msgid "Modified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:956 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:995 msgid "cannot be negative" msgstr "" @@ -1022,7 +1033,7 @@ msgstr "" msgid "Average of worked hours in finished applications" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:714 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:723 msgid "Calculated progress can not be modified" msgstr "" @@ -1047,7 +1058,7 @@ msgstr "" msgid "Profile" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:511 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:615 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:32 msgid "Personal timesheet" msgstr "" @@ -1130,7 +1141,7 @@ msgstr "" msgid "add" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:405 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:426 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1128 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:243 msgid "Unsaved changes will be lost. Would you like to continue?" @@ -1219,7 +1230,7 @@ msgstr "" msgid "there are no valid periods for this calendar" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:132 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:133 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:54 msgid "Add role" msgstr "" @@ -1229,8 +1240,8 @@ msgstr "" msgid "Exception end date should be greater or equals than start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:517 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:527 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:516 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:526 msgid "Repeated Project code {0} in Project {1}" msgstr "" @@ -1297,7 +1308,7 @@ msgstr "" msgid "LibrePlan: Send To Customers" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:490 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:493 msgid "there are repeated description values in the timesheet lines" msgstr "" @@ -1346,7 +1357,7 @@ msgstr "" msgid "Categories" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1319 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1338 msgid "Value is not valid. It must be smaller than max value" msgstr "" @@ -1410,7 +1421,7 @@ msgstr "" msgid "Problems connecting with client web service" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:720 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:721 msgid "" "You cannot remove the task \"{0}\" because it has work reported on it or any " "of its children" @@ -1434,7 +1445,8 @@ msgstr "" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1096 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:905 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:160 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:226 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:709 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:608 @@ -1448,19 +1460,19 @@ msgstr "" msgid "Labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:442 msgid "Queue-based resource assignation" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:116 -msgid "End date communicated by the subcontractor." -msgstr "" - #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:106 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:47 msgid "New timesheet" msgstr "" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:116 +msgid "End date communicated by the subcontractor." +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:374 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:195 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 @@ -1479,7 +1491,7 @@ msgstr "" msgid "Filter by task status" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:491 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:496 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:418 msgid "Select date" msgstr "" @@ -1488,7 +1500,7 @@ msgstr "" msgid "state not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1300 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1319 msgid "" "Spread progress cannot be removed. Please select another progress as spread." msgstr "" @@ -1517,7 +1529,7 @@ msgstr "" msgid "passwords can not be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1093 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1061 msgid "Task {0}" msgstr "" @@ -1593,6 +1605,12 @@ msgstr "" msgid "to" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:567 +msgid "" +"there is a timesheet line in another work report marking as finished the " +"same task" +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:122 msgid "worker's first name not specified" msgstr "" @@ -1619,7 +1637,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:82 #: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:146 -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:137 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:140 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:139 msgid "date not specified" msgstr "" @@ -1643,7 +1661,7 @@ msgstr "" msgid "You cannot remove a scenario with derived scenarios" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:798 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:812 msgid "The max value must be greater than 0" msgstr "" @@ -1678,7 +1696,7 @@ msgstr "" msgid "name not specified or empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1301 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1310 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "" @@ -1709,7 +1727,7 @@ msgstr "" msgid "Create New Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1436 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1445 msgid "Stretches list" msgstr "" @@ -1725,7 +1743,7 @@ msgstr "" msgid "Zoom" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:910 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:873 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 @@ -1737,7 +1755,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:183 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:184 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:125 #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:89 #: libreplan-webapp/src/main/webapp/myaccount/settings.zul:127 @@ -1796,7 +1814,7 @@ msgstr "" msgid "Criterion previously selected" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:909 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:923 msgid "" "Spread progress cannot be changed if there is a consolidation in any " "progress assignment from root task" @@ -1827,7 +1845,7 @@ msgstr "" msgid "Entity type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1071 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1081 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:234 msgid "Unsaved changes will be lost. Are you sure?" msgstr "" @@ -1876,16 +1894,11 @@ msgstr "" msgid "Overload due to current project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1068 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:877 msgid "Name: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1112 -msgid "Move down" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:83 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113 msgid "Please, select a project" @@ -1903,13 +1916,13 @@ msgstr "" msgid "Report structure" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:523 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:524 msgid "resource has to be bound to a user in personal timesheets" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:101 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:102 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:372 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:103 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:393 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "Yes" msgstr "" @@ -1980,13 +1993,14 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:76 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:76 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:65 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:114 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:97 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:84 msgid "Filter by labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:642 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:643 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" @@ -2005,7 +2019,7 @@ msgstr "" msgid "Schedule Variance" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:675 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:684 msgid "resources per day cannot be empty or less than zero" msgstr "" @@ -2034,9 +2048,9 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:391 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:574 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:612 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:643 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:575 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:613 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:644 #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:155 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:150 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:472 @@ -2066,17 +2080,18 @@ msgstr "" msgid "All resources must be queue-based" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:119 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120 msgid "Unbound resource" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:210 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:212 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:81 msgid "quality form not specified" msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:187 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:188 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:178 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:228 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:217 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:96 @@ -2130,6 +2145,10 @@ msgstr "" msgid "Edit queue-based resource element" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:558 +msgid "finished not specified" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:236 msgid "Expenses cost" msgstr "" @@ -2163,7 +2182,7 @@ msgstr "" msgid "Sum of direct imputed hours" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:230 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:233 #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:113 msgid "type of work hours not specified" msgstr "" @@ -2181,7 +2200,7 @@ msgstr "" msgid "calendars with zero hours are not allowed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:745 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:777 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:392 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:170 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:118 @@ -2195,6 +2214,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:43 #: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:28 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:50 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:154 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 @@ -2217,8 +2237,8 @@ msgstr "" msgid "Expense Sheets List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:573 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:611 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:574 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:612 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "" @@ -2256,7 +2276,7 @@ msgid "Cannot calculate charts for current data" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:172 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1505 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1506 msgid "project name already being used" msgstr "" @@ -2279,7 +2299,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183 -#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:89 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:171 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:212 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:90 @@ -2314,7 +2334,7 @@ msgstr "" msgid "Task Completation Lead/Lag" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:126 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:127 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:51 msgid "Association with roles" msgstr "" @@ -2324,7 +2344,7 @@ msgstr "" msgid "New expense sheet" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:607 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:639 msgid "Create Timesheet" msgstr "" @@ -2332,8 +2352,8 @@ msgstr "" msgid "Quality forms" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:540 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:550 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:539 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:549 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "" @@ -2363,7 +2383,7 @@ msgstr "" msgid "No tasks available yet" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:76 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:158 msgid "Output format:" msgstr "" @@ -2374,7 +2394,7 @@ msgstr "" msgid "Direct" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:823 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:860 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:104 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86 @@ -2389,7 +2409,7 @@ msgstr "" msgid "Pessimistic" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java:457 +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java:483 msgid "template name is already in use" msgstr "" @@ -2406,7 +2426,7 @@ msgstr "" msgid "Company ID" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1582 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1583 msgid "" "It will only be possible to add an end date if all the exiting ones in the " "table have already been sent to the customer." @@ -2427,7 +2447,7 @@ msgstr "" msgid "must be after start date" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:248 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:251 msgid "" "closckStart:the clockStart must be not null if number of hours is calcultate " "by clock" @@ -2446,6 +2466,10 @@ msgstr "" msgid "LibrePlan Role" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:853 +msgid "Task finished" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:100 msgid "Must start after (days since project start)" msgstr "" @@ -2459,7 +2483,7 @@ msgstr "" msgid "Work And Progress Per Task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1529 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1530 msgid "project code already being used" msgstr "" @@ -2520,7 +2544,7 @@ msgstr "" msgid "Scheduling saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:710 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:711 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:851 msgid "" "You can not remove the project \"{0}\" because this one has imputed expense " @@ -2623,8 +2647,8 @@ msgstr "" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:68 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:34 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:140 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:160 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:141 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:161 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:61 #: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:28 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 @@ -2641,7 +2665,7 @@ msgstr "" msgid "User settings" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:801 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:833 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:110 msgid "Start hour" msgstr "" @@ -2665,6 +2689,10 @@ msgstr "" msgid "LibrePlan: Project Costs" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:212 +msgid "please, select a criterion" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:294 msgid "Set Code as autogenerated to create a new project from templates" msgstr "" @@ -2682,11 +2710,7 @@ msgstr "" msgid "Unallocated name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1133 -msgid "Move up" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:281 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:282 msgid "Password cannot be empty" msgstr "" @@ -2728,12 +2752,12 @@ msgstr "" msgid "Create new project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:767 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:772 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:362 msgid "date in the future" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1077 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:886 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:56 @@ -2751,7 +2775,7 @@ msgstr "" msgid "Fully, Partially or Unscheduled. (Drag and drop to move tasks)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1312 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1321 msgid "Confirm change" msgstr "" @@ -2763,7 +2787,7 @@ msgstr "" msgid "units not specified" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:326 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:328 msgid "Code already included in Hours Group codes" msgstr "" @@ -2775,7 +2799,7 @@ msgstr "" msgid "Planning" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:368 msgid "" "The task has got progress consolidations. To change resource allocation type " "all consolidations must be removed before" @@ -2872,7 +2896,7 @@ msgstr "" msgid "Worker" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1364 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1383 msgid "" "Date is not valid, it must be later than the last progress reported to the " "customer" @@ -2894,21 +2918,21 @@ msgstr "" msgid "calendar not specified" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:274 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:277 msgid "Start hour cannot be greater than finish hour" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:784 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:793 +msgid "" +"There are unsaved changes in the current personal timesheet, please save " +"before moving" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:511 msgid "Preferences" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:680 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:689 -msgid "" -"There are unsaved changes in the current personal timesheet, please save " -"before moving" -msgstr "" - #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25 msgid "Manual allocation" msgstr "" @@ -2935,8 +2959,8 @@ msgid "Authorize" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:330 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1097 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1160 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1111 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1174 msgid "" "Progress Measurement cannot be deleted. Progress Measurement already " "consolidated" @@ -2950,7 +2974,7 @@ msgstr "" msgid "Activation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:745 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:759 msgid "Calculated progress cannot be removed" msgstr "" @@ -2971,7 +2995,7 @@ msgstr "" msgid "Other projects" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:261 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:264 msgid "clock finish cannot be empty if number of hours is calcultate by clock" msgstr "" @@ -2991,7 +3015,7 @@ msgstr "" msgid "At least one {0} sequence must be active" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:159 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:160 #: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 @@ -3079,7 +3103,7 @@ msgstr "" msgid "Projects" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1072 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1082 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:235 msgid "Confirm exit dialog" msgstr "" @@ -3107,7 +3131,7 @@ msgid "last value not specified" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:110 -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:176 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:179 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:72 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:121 msgid "task not specified" @@ -3123,7 +3147,7 @@ msgid "" "enabled." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1306 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1325 msgid "" "Progress measurement cannot be canged to {0}, because it is consolidated" msgstr "" @@ -3189,7 +3213,7 @@ msgstr "" msgid "Please, select a destination scenario" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1063 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1073 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:126 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 @@ -3207,7 +3231,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 #: libreplan-webapp/src/main/webapp/planner/order.zul:131 #: libreplan-webapp/src/main/webapp/planner/order.zul:166 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:187 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:188 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:129 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:139 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:74 @@ -3262,7 +3286,7 @@ msgid "" "Disable hierarchy will cause criteria tree to be flattened. Are you sure?" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:229 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:231 msgid "default maximum value of percentage progress type must be 100" msgstr "" @@ -3291,7 +3315,7 @@ msgstr "" msgid "The expense sheet line codes must be unique." msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:284 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:285 msgid "description value: the timesheet has some description field missing" msgstr "" @@ -3382,7 +3406,7 @@ msgid "references" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:140 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1575 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1576 msgid "You must select a valid date. " msgstr "" @@ -3426,13 +3450,14 @@ msgstr "" msgid "Criterion Name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:769 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:563 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:801 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:667 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:127 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:167 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:193 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:150 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 @@ -3445,6 +3470,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:308 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:188 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125 @@ -3456,7 +3482,7 @@ msgstr "" msgid "Expected" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:154 msgid "Add profile" msgstr "" @@ -3478,7 +3504,7 @@ msgstr "" msgid "Criterion name" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:223 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:224 msgid "date cannot be empty if it is shared by lines" msgstr "" @@ -3506,12 +3532,12 @@ msgstr "" msgid "cost assignment's resource not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1091 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:559 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1059 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:663 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:66 -#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:40 -#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:51 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:42 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:53 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:47 #: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:31 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 @@ -3529,13 +3555,13 @@ msgstr "" msgid "last material sequence code not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:758 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:772 msgid "" "Advance assignment cannot be removed as it has advance measures that have " "already been reported to the customer" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:480 msgid "Extra" msgstr "" @@ -3543,7 +3569,7 @@ msgstr "" msgid "Unassigned" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1587 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1588 msgid "It already exists a end date with the same date. " msgstr "" @@ -3551,7 +3577,7 @@ msgstr "" msgid "Add new criterion requirement" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:236 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:237 msgid "resource cannot be empty if it is shared by lines" msgstr "" @@ -3573,7 +3599,7 @@ msgstr "" msgid "Disabled" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:708 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:713 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:324 msgid "Earned value" msgstr "" @@ -3613,7 +3639,7 @@ msgstr "" msgid "Total work" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1445 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1497 msgid "a quality form cannot be assigned twice to the same task" msgstr "" @@ -3621,7 +3647,7 @@ msgstr "" msgid "number of digits out of range" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:435 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:436 msgid "The timesheet line codes must be unique." msgstr "" @@ -3641,8 +3667,8 @@ msgid "" "review it or click in the following link in order to go to initial page: " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1281 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1296 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129 msgid "{0} not supported yet" msgstr "" @@ -3705,6 +3731,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:117 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:105 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:155 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:147 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:125 @@ -3716,9 +3743,9 @@ msgstr "" msgid "Max value" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:101 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:102 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:374 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:103 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:395 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "No" msgstr "" @@ -3752,11 +3779,11 @@ msgstr "" msgid "Spread" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:978 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1017 msgid "Disabled because of it contains more than one hours group" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:333 msgid "Confirm remove user" msgstr "" @@ -3782,11 +3809,11 @@ msgstr "" msgid "Group name" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:467 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:470 msgid "description value: the timesheet has not assigned the description field" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:140 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:60 msgid "Role name" msgstr "" @@ -3807,7 +3834,7 @@ msgstr "" msgid "Value is not valid, the precision value must not be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:831 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:836 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:472 msgid "h" msgstr "" @@ -3844,7 +3871,7 @@ msgstr "" msgid "init" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1277 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1296 msgid "Add new progress measurement" msgstr "" @@ -3860,15 +3887,15 @@ msgstr "" msgid "Create & Assign" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1225 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1244 msgid "Calculated progress measurements cannot be removed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1555 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1564 msgid "Not configurable" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:201 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:204 msgid "timesheet not specified" msgstr "" @@ -3881,8 +3908,8 @@ msgid "Task Status" msgstr "" #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:33 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:97 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:110 msgid "Bound resource" msgstr "" @@ -3930,7 +3957,7 @@ msgstr "" msgid "Customer" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:815 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:847 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:116 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 msgid "Hours type" @@ -3954,7 +3981,7 @@ msgstr "" msgid "Cannot connect to LDAP server" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1521 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1582 msgid "must be before end date" msgstr "" @@ -3972,18 +3999,18 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:197 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:360 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:478 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:314 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:321 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:328 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:357 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:370 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:383 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:394 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:404 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:413 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:438 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:223 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:952 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:327 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:334 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:364 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:377 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:390 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:401 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:411 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:420 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:445 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:234 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:991 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:144 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:148 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:205 @@ -3992,6 +4019,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:223 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:247 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignController.java:143 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:483 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:110 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:998 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1188 @@ -4005,16 +4033,16 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:304 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:310 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:953 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:967 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1421 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1448 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:981 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1440 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1467 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:167 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:126 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:394 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1498 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1522 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1499 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1523 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159 #: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:750 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45 @@ -4055,7 +4083,7 @@ msgstr "" msgid "cannot be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:418 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:425 msgid "Effort must be greater than zero" msgstr "" @@ -4079,7 +4107,7 @@ msgstr "" msgid "Assigned Label Type cannot be repeated in a Timesheet Template." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:437 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:444 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:143 msgid "" "Hours types are empty. Please, create some hours types before proceeding" @@ -4154,7 +4182,7 @@ msgstr "" msgid "Exportation options" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:91 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:94 msgid "effort not specified" msgstr "" @@ -4198,6 +4226,8 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:139 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:139 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:87 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:127 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:92 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:136 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:177 @@ -4256,7 +4286,7 @@ msgstr "" msgid "please, select an item" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1159 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1181 msgid "a label can not be assigned twice in the same branch" msgstr "" @@ -4268,7 +4298,7 @@ msgstr "" msgid "Companies List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:440 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:441 msgid "Normal resource assignment" msgstr "" @@ -4276,11 +4306,11 @@ msgstr "" msgid "default calendar not specified" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:1140 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:1146 msgid "indirect progress assignments should have different types" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1459 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1468 msgid "Stretches with Interpolation" msgstr "" @@ -4298,7 +4328,7 @@ msgstr "" msgid "Category name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:755 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:760 msgid "Date must be inside visualization area" msgstr "" @@ -4352,6 +4382,10 @@ msgstr "" msgid "Connect" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1240 +msgid "This progress type cannot cannot be removed" +msgstr "" + #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:145 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:169 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:85 @@ -4381,7 +4415,7 @@ msgstr "" msgid "Progress measurements" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1276 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1295 msgid "Add measure" msgstr "" @@ -4395,7 +4429,7 @@ msgid "Relationship" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:442 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:443 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:69 msgid "Subcontract" msgstr "" @@ -4417,8 +4451,8 @@ msgstr "" msgid "Cost Categories" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:316 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:586 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:420 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:690 msgid "Other" msgstr "" @@ -4430,11 +4464,11 @@ msgstr "" msgid "default price not specified" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:133 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:134 msgid "timesheet template not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:216 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:220 msgid "Timesheet removed successfully" msgstr "" @@ -4456,16 +4490,16 @@ msgstr "" msgid "Username" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:105 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106 msgid "Has bound resource" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1221 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235 msgid "" "Progress measurements that are reported by quality forms cannot be removed" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:423 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:426 msgid "" "Number of hours is not properly calculated according to start date and end " "date" @@ -4552,8 +4586,8 @@ msgstr "" msgid "Customer reference" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:369 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:362 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:370 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:709 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:160 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:316 @@ -4715,7 +4749,7 @@ msgstr "" msgid "Work" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:341 msgid "" "Error saving the project\n" "{0}" @@ -4725,15 +4759,15 @@ msgstr "" msgid "LibrePlan: Machines" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:87 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:75 #: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:117 msgid "{0} h" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:343 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:350 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:351 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1302 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1311 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:628 msgid "Error" @@ -4751,6 +4785,10 @@ msgstr "" msgid "Log out" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:107 +msgid "You should filter the report by project, labels or criteria" +msgstr "" + #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:42 msgid "Filter timesheet by" msgstr "" @@ -4801,6 +4839,10 @@ msgstr "" msgid "Changes applied" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java:70 +msgid "Adapting planning according to timesheets" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:247 msgid "Budgeted Cost Work Scheduled" msgstr "" @@ -4868,8 +4910,8 @@ msgid "Cost Variance" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:256 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:594 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:698 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:50 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 @@ -4884,12 +4926,16 @@ msgstr "" msgid "User Accounts" msgstr "" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:158 +msgid "Effort" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:222 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:99 msgid "Invalidate" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:331 msgid "" "User is bound to resource \"{0}\" and it will be unbound. Do you want to " "continue with user removal?" @@ -4939,7 +4985,7 @@ msgstr "" msgid "Update task end" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:578 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:591 msgid "Show all" msgstr "" @@ -4961,7 +5007,7 @@ msgid "Apply tab changes" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:99 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:260 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:261 msgid "passwords don't match" msgstr "" @@ -5011,11 +5057,11 @@ msgstr "" msgid "Work Hours Types List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:750 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:764 msgid "Consolidated progress cannot be removed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:931 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:945 msgid "" "Spread progress cannot be changed if there is a consolidation in any " "progress assignment" @@ -5086,8 +5132,8 @@ msgid "From chosen date" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:259 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:718 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:727 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1257 msgid "" "Subcontractor values are read only because they were reported by the " "subcontractor company." @@ -5102,7 +5148,7 @@ msgstr "" msgid "CV" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:509 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:613 #: libreplan-webapp/src/main/webapp/myaccount/userDashboard.zul:35 msgid "My dashboard" msgstr "" @@ -5126,13 +5172,13 @@ msgstr "" msgid "Not indentable" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:340 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:341 msgid "" "The original workable days value {0} cannot be modified as it has " "consolidations" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:255 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:259 msgid "Timesheet saved" msgstr "" @@ -5158,7 +5204,7 @@ msgstr "" msgid "In the available periods {0} only {1} hours are available." msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:147 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:148 msgid "Association with profiles" msgstr "" @@ -5167,7 +5213,7 @@ msgstr "" msgid "Message - {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1379 msgid "" "Date is not valid, it must be later than the last progress consolidation" msgstr "" @@ -5205,6 +5251,10 @@ msgstr "" msgid "Select source" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:542 +msgid "the same task is marked as finished by more than one timesheet line" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:977 msgid "Worker deleted" msgstr "" @@ -5217,7 +5267,7 @@ msgstr "" msgid "LibrePlan: Profiles" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:805 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:837 msgid "Finish Hour" msgstr "" @@ -5251,13 +5301,13 @@ msgstr "" msgid "Only one sequence per entity can be active at the same time." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:916 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1176 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:953 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1213 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:274 msgid "Please, select an item" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1091 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1128 msgid "Cannot be higher than finish hour" msgstr "" @@ -5306,7 +5356,7 @@ msgstr "" msgid "Reassigning type" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:307 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:308 msgid "There are repeated description values in the timesheet " msgstr "" @@ -5353,6 +5403,10 @@ msgstr "" msgid "Timesheet Lines List" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:678 +msgid "task code is repeated inside the project" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:163 msgid "Number of iterations should be between 1 and {0}" msgstr "" @@ -5375,7 +5429,7 @@ msgid "Zoom level" msgstr "" #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:29 -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:170 msgid "Quality form" msgstr "" @@ -5453,7 +5507,7 @@ msgstr "" msgid "Timesheet templates" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1072 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:881 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:698 #: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:42 msgid "Hours invested" @@ -5469,7 +5523,7 @@ msgstr "" msgid "Authorization" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:362 msgid "Project saved" msgstr "" @@ -5490,7 +5544,7 @@ msgstr "" msgid "Sorry for the inconvenience." msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:149 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:150 msgid "" "Profiles of LDAP users cannot be managed because LDAP is enabled and LDAP " "roles are being used." @@ -5505,7 +5559,7 @@ msgstr "" msgid "Machines" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:507 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:611 msgid "My account" msgstr "" @@ -5621,7 +5675,7 @@ msgstr "" msgid "Communications From Customers" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:761 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:793 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnumByResourceAndCriterion.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 @@ -5692,11 +5746,11 @@ msgstr "" msgid "Specific Allocations" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:444 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:447 msgid "label type: the timesheet has not assigned this label type" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:219 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:221 msgid "progress type marked as quality form but is updatable" msgstr "" @@ -5716,7 +5770,7 @@ msgstr "" msgid "Company data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:273 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:274 msgid "Users" msgstr "" @@ -5734,7 +5788,7 @@ msgid "Hours Management" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:170 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:321 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:323 msgid "last hours group sequence code not specified" msgstr "" @@ -5767,15 +5821,15 @@ msgid "" "completed." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1623 -msgid "Please set a date" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:224 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:242 msgid "Template saved" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1684 +msgid "Please set a date" +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:93 msgid "prefix not specified" msgstr "" @@ -5799,18 +5853,18 @@ msgstr "" msgid "Imputed hours calculation" msgstr "" -#: libreplan-webapp/src/main/webapp/common/error.zul:55 -#: libreplan-webapp/src/main/webapp/common/event_error.zul:51 -msgid "Exit session" -msgstr "" - #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:53 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:67 -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java:259 +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java:268 msgid "Group" msgstr "" +#: libreplan-webapp/src/main/webapp/common/error.zul:55 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:51 +msgid "Exit session" +msgstr "" + #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30 msgid "Statistics list " msgstr "" @@ -5829,7 +5883,7 @@ msgstr "" msgid "Enabled" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1111 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1148 msgid "Please, enter a valid effort" msgstr "" @@ -5869,7 +5923,7 @@ msgstr "" msgid "length not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:166 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:146 msgid "Track time" msgstr "" @@ -5881,7 +5935,7 @@ msgstr "" msgid "Remove queue-based resource element" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:266 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:268 msgid "default maximum value must be greater than precision value" msgstr "" @@ -5898,7 +5952,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:185 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:186 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:127 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:136 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:72 @@ -5944,7 +5998,7 @@ msgid "" "Invalid value. Precission value must be lower than the Default Max value." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1311 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1320 msgid "Assignment function will be changed. Are you sure?" msgstr "" @@ -5975,6 +6029,10 @@ msgstr "" msgid "Progress percentage per progress type" msgstr "" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:168 +msgid "Ok" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:248 msgid "ACWP" msgstr "" @@ -5984,7 +6042,7 @@ msgstr "" msgid "Authentication type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:450 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:457 msgid "cannot be empty." msgstr "" @@ -6076,7 +6134,7 @@ msgstr "" msgid "Task code" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:345 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:449 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:66 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 msgid "Capacity" @@ -6091,7 +6149,7 @@ msgstr "" msgid "Label Types" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:636 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:645 msgid "it must be greater than zero" msgstr "" @@ -6226,7 +6284,7 @@ msgstr "" msgid "Cost category assignment" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:244 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:246 msgid "progress type name is already in use" msgstr "" @@ -6234,11 +6292,11 @@ msgstr "" msgid "number of digits not specified" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:249 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:250 msgid "task cannot be empty if it is shared by lines" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1024 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:833 msgid "All workers" msgstr "" @@ -6315,7 +6373,7 @@ msgstr "" msgid "Labels list" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:460 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:461 msgid "last timesheet line sequence code not specified" msgstr "" @@ -6386,7 +6444,7 @@ msgstr "" msgid "Add task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1069 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:878 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:697 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:628 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:45 @@ -6398,7 +6456,7 @@ msgstr "" msgid "Progress" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1286 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1305 msgid "All progress types have already been assigned." msgstr "" @@ -6439,7 +6497,7 @@ msgstr "" msgid "options" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1198 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1202 msgid "Queue-based assignment" msgstr "" @@ -6463,7 +6521,7 @@ msgstr "" msgid "Full name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:124 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:125 msgid "Default user \"admin\" cannot be removed as it is mandatory" msgstr "" @@ -6519,7 +6577,6 @@ msgstr "" msgid "Delivery date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1155 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 msgid "Unindent" msgstr "" @@ -6570,7 +6627,7 @@ msgid "Projects List" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:235 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:388 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:390 msgid "budget not specified" msgstr "" @@ -6626,14 +6683,14 @@ msgstr "" msgid "Profiles authorization" msgstr "" -#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:98 -msgid "Planning charts expanded" -msgstr "" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 msgid "Assignation" msgstr "" +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:98 +msgid "Planning charts expanded" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:702 msgid "Inh" msgstr "" @@ -6651,6 +6708,10 @@ msgstr "" msgid "name cannot be empty" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:466 +msgid "task is already marked as finished in another timesheet" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:190 msgid "Doing {0} reassignations" msgstr "" @@ -6663,7 +6724,7 @@ msgstr "" msgid "The end date cannot be before the start date" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:114 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 msgid "Go to worker edition window" msgstr "" @@ -6680,7 +6741,7 @@ msgstr "" msgid "Invalid Spread values. At least one value should be true" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:600 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:604 #: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:48 msgid "code not specified" msgstr "" @@ -6695,7 +6756,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:183 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:184 -#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:91 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:173 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:223 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:213 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:91 @@ -6741,7 +6802,7 @@ msgstr "" msgid "Edit project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1090 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:899 msgid "Hours cost: {0}, Expenses cost: {1}" msgstr "" @@ -6759,7 +6820,7 @@ msgstr "" msgid "Month" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:909 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:919 msgid "{0} could not be allocated. Cannot allocate more than one resource" msgstr "" @@ -6878,7 +6939,7 @@ msgstr "" msgid "Money spent" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:819 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:856 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 @@ -6932,7 +6993,7 @@ msgid "Add stretch" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:302 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:509 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:513 msgid "" "Progress Assignment cannot be deleted or changed. Progress Assignment " "contains Progress Consolidations values" @@ -6950,7 +7011,7 @@ msgstr "" msgid "Calculate Workable Days" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:114 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:116 msgid "unit name not specified" msgstr "" @@ -6989,7 +7050,7 @@ msgstr "" msgid "Unit name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:741 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:750 msgid "Progress that are reported by quality forms cannot be modified" msgstr "" @@ -7022,7 +7083,7 @@ msgstr "" msgid "Assign element to queue automatically" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427 msgid "Confirm worker edition" msgstr "" @@ -7056,7 +7117,7 @@ msgstr "" msgid "Probability %" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:707 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:712 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:323 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:854 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 @@ -7108,7 +7169,7 @@ msgstr "" msgid "Selected node" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:678 msgid "already exists an allocation for criteria {0}" msgstr "" @@ -7124,7 +7185,7 @@ msgstr "" msgid "Forward" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1340 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1359 msgid "Invalid date. Date must be unique for this Progress Assignment" msgstr "" @@ -7152,11 +7213,11 @@ msgstr "" msgid "At least one HoursGroup is needed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:268 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:269 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:116 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:75 -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:167 msgid "User" msgstr "" @@ -7241,7 +7302,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:158 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:159 -#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:66 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:148 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:196 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:190 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66 @@ -7251,7 +7312,7 @@ msgstr "" msgid "Format" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:932 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:895 msgid "New project version" msgstr "" @@ -7296,14 +7357,14 @@ msgstr "" msgid "Click the following link to return to home page: " msgstr "" -#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:71 -msgid "New password" -msgstr "" - #: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:20 msgid "LibrePlan: Project Status Report" msgstr "" +#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:71 +msgid "New password" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:159 msgid "" "The planning of this task is not in the current scenenario.\n" @@ -7327,6 +7388,10 @@ msgstr "" msgid "New Description" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:851 +msgid "Done" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:114 msgid "Tree {0} sucessfully flattened" msgstr "" @@ -7343,8 +7408,8 @@ msgstr "" msgid "Not enough permissions to create templates" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1328 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1350 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1347 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1369 msgid "" "Invalid value. Value must be greater than the value of previous progress." msgstr "" @@ -7368,7 +7433,7 @@ msgstr "" msgid "Reassigning" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:642 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:651 msgid "{0} already assigned to resource allocation list" msgstr "" @@ -7400,6 +7465,8 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:126 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 @@ -7456,6 +7523,11 @@ msgstr "" msgid "criterion satisfaction codes must be unique inside a resource" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:719 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:755 +msgid "This progress type cannot be modified" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:253 msgid "percentage should be between 1 and 100" msgstr "" @@ -7494,7 +7566,7 @@ msgstr "" msgid "Criterion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:624 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:656 msgid "Edit Timesheet" msgstr "" @@ -7502,7 +7574,7 @@ msgstr "" msgid "unl" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1629 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1690 msgid "Please select a worker" msgstr "" @@ -7519,10 +7591,10 @@ msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/Scenario.java:114 #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:193 #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:94 -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java:365 +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java:373 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java:160 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:99 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:529 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:533 msgid "name not specified" msgstr "" @@ -7531,7 +7603,7 @@ msgid "Queue-based resource allocation" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:225 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:120 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:121 msgid "error doing reassignment: {0}" msgstr "" @@ -7559,7 +7631,7 @@ msgid "" " and should not be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1234 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1253 msgid "Values already sent to the customer. Values cannot be changed " msgstr "" @@ -7577,7 +7649,7 @@ msgstr "" msgid "Percentage of estimated budget in money / money spent" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:931 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:894 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -7593,6 +7665,8 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:127 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:127 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:75 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:115 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:82 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:124 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:165 @@ -7631,7 +7705,7 @@ msgstr "" msgid "Queue-based Resources" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1103 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1071 msgid "Hours Group at {0}" msgstr "" @@ -7686,7 +7760,7 @@ msgstr "" msgid "Number of iterations" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:262 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:263 msgid "label type:the timesheet have not assigned this label type" msgstr "" @@ -7707,7 +7781,7 @@ msgstr "" msgid "Last communication" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:427 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:434 msgid "effort is not properly calculated based on clock" msgstr "" @@ -7724,7 +7798,7 @@ msgstr "" msgid "Resource load view" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:811 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:843 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:81 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62 @@ -7786,6 +7860,12 @@ msgstr "" msgid "Allocation configuration" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:732 +msgid "" +"You cannot remove the task \"{0}\" because it is the only child of its " +"parent and its parent has tracked time or imputed expenses" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:61 msgid "Subcontract price" msgstr "" @@ -7799,7 +7879,7 @@ msgstr "" msgid "The page that you are requesting does not exist." msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:495 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:496 msgid "" "In personal timesheets, all timesheet lines should be in the same period" msgstr "" @@ -7808,7 +7888,7 @@ msgstr "" msgid "Resources per day are zero" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1083 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1130 msgid "Value is not valid in current list of Hours Group" msgstr "" @@ -7860,7 +7940,7 @@ msgstr "" msgid "Task Scheduling Status In Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:754 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:768 msgid "" "Subcontractor values are read only because they were reported by the " "subcontractor company" @@ -7910,6 +7990,10 @@ msgstr "" msgid "List of materials for category: {0}" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java:60 +msgid "Adapt planning according to timesheets" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 msgid "Cancel edition" msgstr "" @@ -7927,7 +8011,8 @@ msgstr "" msgid "Warning: Not editing from home page of bound users" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:195 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:212 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:288 #: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 msgid "Invalid Effort Duration" msgstr "" @@ -7945,11 +8030,11 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:212 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:412 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1209 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1221 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1269 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1281 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:341 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1193 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1199 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1154 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1160 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:287 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:456 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 @@ -7964,13 +8049,13 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:452 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:959 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1269 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1288 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:389 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:404 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1245 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1642 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1643 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:48 @@ -7984,6 +8069,8 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:148 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:148 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:136 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:104 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:145 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:186 @@ -7993,7 +8080,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:115 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:156 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:108 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:168 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:169 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:51 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57 #: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:41 @@ -8154,10 +8241,6 @@ msgstr "" msgid "Resource is not available according to task's calendar" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:28 -msgid "Finished" -msgstr "" - #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:29 msgid "In progress" msgstr "" @@ -8270,7 +8353,7 @@ msgstr "" msgid "Materials Needs At Date Report" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:344 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:345 msgid "Database" msgstr "" @@ -8335,30 +8418,38 @@ msgid "MACHINE" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:33 +msgid "PRE-SALES" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:34 msgid "OFFERED" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:33 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:35 +msgid "OUTSOURCED" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:36 msgid "ACCEPTED" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:33 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:37 msgid "STARTED" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:34 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:38 +msgid "ON HOLD" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:39 msgid "FINISHED" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:34 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:40 msgid "CANCELLED" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:35 -msgid "SUBCONTRACTED PENDING PROJECT" -msgstr "" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:35 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:41 msgid "STORED" msgstr "" @@ -8386,17 +8477,17 @@ msgstr "" msgid "U" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:774 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:995 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:778 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:1001 msgid "Cannot spread two progress in the same task" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:798 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:824 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:802 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:828 msgid "Duplicate Progress Assignment For Task" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1146 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1158 msgid "Quality form already exists" msgstr ""