diff --git a/AUTHORS b/AUTHORS index d30106462..ccecbc2ce 100644 --- a/AUTHORS +++ b/AUTHORS @@ -6,7 +6,7 @@ Authors LibrePlan Team -------------- -* Cristina Alavariño Pérez +* Cristina Alvariño Pérez * Jacobo Aragunde Pérez * Nacho Barrientos Arias * Xavier Castaño García diff --git a/HACKING b/HACKING index 42b0e7a94..d61b2fad8 100644 --- a/HACKING +++ b/HACKING @@ -64,15 +64,15 @@ Debian/Ubuntu * Use SQL sentences:: - CREATE DATABASE navaldev; - CREATE DATABASE navaldevtest; - CREATE USER naval WITH PASSWORD 'naval'; - GRANT ALL PRIVILEGES ON DATABASE navaldev TO naval; - GRANT ALL PRIVILEGES ON DATABASE navaldevtest TO naval; + CREATE DATABASE libreplandev; + CREATE DATABASE libreplandevtest; + CREATE USER libreplan WITH PASSWORD 'libreplan'; + GRANT ALL PRIVILEGES ON DATABASE libreplandev TO libreplan; + GRANT ALL PRIVILEGES ON DATABASE libreplandevtest TO libreplan; * Download source code:: - $ git clone git://libreplan.git.sourceforge.net/gitroot/libreplan/libreplan + $ git clone git://navalplan.git.sourceforge.net/gitroot/navalplan/navalplan * Compile project:: @@ -103,11 +103,11 @@ Fedora * Use SQL sentences:: - CREATE DATABASE navaldev; - CREATE DATABASE navaldevtest; - CREATE USER naval WITH PASSWORD 'naval'; - GRANT ALL PRIVILEGES ON DATABASE navaldev TO naval; - GRANT ALL PRIVILEGES ON DATABASE navaldevtest TO naval; + CREATE DATABASE libreplandev; + CREATE DATABASE libreplandevtest; + CREATE USER libreplan WITH PASSWORD 'libreplan'; + GRANT ALL PRIVILEGES ON DATABASE libreplandev TO libreplan; + GRANT ALL PRIVILEGES ON DATABASE libreplandevtest TO libreplan; * Set ``postgres`` user password:: @@ -121,7 +121,7 @@ Fedora * Download source code:: - $ git clone git://libreplan.git.sourceforge.net/gitroot/libreplan/libreplan + $ git clone git://navalplan.git.sourceforge.net/gitroot/navalplan/navalplan * Compile project:: @@ -163,11 +163,11 @@ openSUSE * Use SQL sentences:: - CREATE DATABASE navaldev; - CREATE DATABASE navaldevtest; - CREATE USER naval WITH PASSWORD 'naval'; - GRANT ALL PRIVILEGES ON DATABASE navaldev TO naval; - GRANT ALL PRIVILEGES ON DATABASE navaldevtest TO naval; + CREATE DATABASE libreplandev; + CREATE DATABASE libreplandevtest; + CREATE USER libreplan WITH PASSWORD 'libreplan'; + GRANT ALL PRIVILEGES ON DATABASE libreplandev TO libreplan; + GRANT ALL PRIVILEGES ON DATABASE libreplandevtest TO libreplan; * Set ``postgres`` user password:: @@ -181,7 +181,7 @@ openSUSE * Download source code:: - $ git clone git://libreplan.git.sourceforge.net/gitroot/libreplan/libreplan + $ git clone git://navalplan.git.sourceforge.net/gitroot/navalplan/navalplan * Compile project:: @@ -275,11 +275,11 @@ profiles defined in ``pom.xml`` of business and webapp modules). * *dev* - Development environment (default) - It uses databases ``navaldev`` and ``navaldevtest``. + It uses databases ``libreplandev`` and ``libreplandevtest``. * *prod* - Production environment - Unlike *dev* it uses database ``navalprod`` and `navalprodtest``. + Unlike *dev* it uses database ``libreplanprod`` and `libreplanprodtest``. It is needed to use it in combination with *postgresql* or *mysql* profiles. @@ -361,10 +361,10 @@ For MySQL users here are specific instructions. * SQL sentences to create database:: - CREATE DATABASE navaldev; - CREATE DATABASE navaldevtest; - GRANT ALL ON navaldev.* to 'naval'@'localhost' identified by 'naval'; - GRANT ALL ON navaldevtest.* to 'naval'@'localhost' identified by 'naval'; + CREATE DATABASE libreplandev; + CREATE DATABASE libreplandevtest; + GRANT ALL ON libreplandev.* to 'libreplan'@'localhost' identified by 'libreplan'; + GRANT ALL ON libreplandevtest.* to 'libreplan'@'localhost' identified by 'libreplan'; * Compile project:: diff --git a/INSTALL b/INSTALL index 4615a15ac..be7b0574a 100644 --- a/INSTALL +++ b/INSTALL @@ -29,17 +29,17 @@ Debian packages ~~~~~~~~~~~~~~~ There are Debian packages for Squeeze (i386 and amd64), you can download them -from: http://sourceforge.net/projects/libreplan/files/LibrePlan/ +from: http://sourceforge.net/projects/navalplan/files/LibrePlan/ Instructions: * Download the package:: - $ wget http://downloads.sourceforge.net/project/libreplan/LibrePlan/libreplan_1.1.1-1_amd64.deb + $ wget http://downloads.sourceforge.net/project/navalplan/files/LibrePlan/libreplan_1.2.0-1_amd64.deb * Install package:: - # dpkg -i libreplan_1.1.1-1_amd64.deb + # dpkg -i libreplan_1.2.0-1_amd64.deb * Install dependencies:: @@ -68,7 +68,7 @@ Debian/Ubuntu * Download database installation script:: - $ wget -O install.sql http://downloads.sourceforge.net/project/libreplan/LibrePlan/install_1.1.1.sql + $ wget -O install.sql http://downloads.sourceforge.net/project/navalplan/LibrePlan/install_1.2.0.sql * Create database structure:: @@ -76,7 +76,7 @@ Debian/Ubuntu * Download ``.war`` file from SourceForge.net:: - $ wget -O libreplan.war http://downloads.sourceforge.net/project/libreplan/LibrePlan/libreplan_1.1.1.war + $ wget -O libreplan.war http://downloads.sourceforge.net/project/navalplan/LibrePlan/libreplan_1.2.0.war * Create a new file ``/etc/tomcat6/Catalina/localhost/libreplan.xml`` (file name has to match with ``.war`` name) with database configuration for @@ -170,7 +170,7 @@ openSUSE * Download database installation script:: - $ wget -O install.sql http://downloads.sourceforge.net/project/libreplan/LibrePlan/install_1.1.1.sql + $ wget -O install.sql http://downloads.sourceforge.net/project/navalplan/LibrePlan/install_1.2.0.sql * Create database structure:: @@ -178,7 +178,7 @@ openSUSE * Download ``.war`` file from SourceForge.net:: - $ wget -O libreplan.war http://downloads.sourceforge.net/project/libreplan/LibrePlan/libreplan_1.1.1.war + $ wget -O libreplan.war http://downloads.sourceforge.net/project/navalplan/LibrePlan/libreplan_1.2.0.war * Create a new file ``/etc/tomcat6/Catalina/localhost/libreplan.xml`` (file name has to match with ``.war`` name) with database configuration for @@ -215,7 +215,7 @@ Logs Since *LibrePlan 1.1.1* log system is configured automatically creating a new folder under ``/var/log/tomcat6/`` with ``.war`` name. For example: -``/var/log/tomcat6/libreplan.war``. +``/var/log/tomcat6/libreplan/``. Inside this new directory there will be two files (``libreplan.log`` and ``libreplan-error.log``) that will be rotated every day. diff --git a/NEWS b/NEWS index 633026c36..eb1b3c2d5 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,1365 @@ NEWS ==== +Version 1.2.0 (01 Dec 2011) +--------------------------- + +Summary +~~~~~~~ + +In the current 1.2.0 version the project has been renamed to LibrePlan and this +will be the official name for the project from now on. With the new name, +decided by the community, we are remarking that LibrePlan is a generic purpose +planning tool, suitable to many sectors. + +Besides, with this new version, the project has a new image and a revamped +website that you can visit at http://www.libreplan.com/ + +This new major version comes with important new features apart from all the +bugfixing done since the 1.1 major release. Among the new features, these are +the most relevant ones: + +* Migration to ZK 5 Community Edition. + + LibrePlan uses ZK framework as UI toolkit and in this release has been + migrated the interface from ZK 3.6 to ZK 5.0. + + ZK 5 was incompatible with version version 3.6 and this movement have implied: + + * Reimplementing LibrePlan custom UI widgets in ZK 5.0 architecture + + * Providing an implementation in ZK 5.0 for widgets in 3.6 version which + changed their license and which are not open source anymore. + + * Reviewing all the application windows and to do small configuration and + formatting changes. + + This allows us to get advantage of the latest innovations in rich web + interfaces and enjoy both the performance and architectural enhancements of + this new ZK version. + +* Resource allocation engine enhancements. + + The planner engine has been improved with three new functionalities regarding + to allocation engine: + + * Task movements in Gantt view keeps the configured allocation function. + Before this, if you configured a stretches function or sigmoid function in + a resource allocation and the task was moved because a dependency or + constraint set by the user, the allocation function applied in the new + point was the flat function. Now, the configured stretches or sigmoid + function is used. + + * Manual allocation automatic detection in advanced allocation. Now if the + user changes the allocation of a task in advanced allocation window, the + type of allocation is automatically tracked as manual. + + * Manual allocation locking support in Gantt view. So far if a task had a + manual allocation and was moved in the Gantt, the custom allocation was + lost and a flat function was applied. In this version, a keep manual + allocation strategy has been implemented. It consists of disabling the + automatic movement of those allocated tasks in the Gantt by being + configured with a START IN FIXED DATE constraint after the manual + allocation. If the user wants to move these tasks, he has to change in + first place the allocation function used and, in second place, has to + remove the constraint. In this way, the manual allocation configured is not + lost by accident. + +* Sharing state between perspectives. + + The project planning in LibrePlan is achieved by using several perspectives: + + * Project scheduling (Gantt). + * Project details (WBS). + * Resource load + * Advanced allocation. + + Until this version, the user had to save before abandoning a perspective to + avoid losing the changes on going to another. To improve this, in this + release, the planning data has been shared among all the project perspectives + and on saving in one of them, all the planning data is stored. + + This a more natural way of creating the project plan. Now the user can move + freely among the project views configuring different things and, on reaching + a desired state, he can ask to persist changes. + + Besides, with this new feature, the loss of changes by accident is prevented + on a perspective change without saving first. + +* LDAP authentication and authorization module. + + In this version the possibility of using LDAP as backend for users has been + implemented. + + An LDAP authentication and authorization module has been developed. With + this, it is possible to use the users configured in the company directory + without the need to create them in LibrePlan manually. + + The main features of this module are: + + * User passwords saving in LibrePlan database after right authentication + option. This allows the LDAP users enter the application if the LDAP is + off-line. + + * Role matching support. It is possible to map LDAP roles to LibrePlan + permissions. Two strategies are provided: Group strategy (all the users + under a node) and property strategy (property of the node user with all the + role values). + +* My account area. + + It has been developed a new top level menu entry called *My account* with + several options with a per user scope. This means that they are operations + that concern only to the connected user which is configuring them. + + The operations included in this zone are: + + * Personal data. User can manage his contact information + + * Application preferences. User can select the language of the application + and if if the load charts of the planning windows appear folded or + unfolded by default. + + * Password administration. User can change his own password. + +* Functional tests. + + One of the maxims of LibrePlan is to create a project with good quality. For + this reason in this version functional tests to the project have been + incorporated into the project. + + Functional tests are black-box tests in which the interface of the program is + tested. The tool which has been chosen is Sahi and it allows verifying that + all functionalities keep working successfully. + + An initial set of Sahi tests have been developed and they will be increased + as time passes. + +* Other minor tasks implemented: + + * Internationalization. Some strings were not being translated accordingly to + the language used under certain conditions. + + * Default login auto-completion is now configurable, you can disable it from + the configuration window. + + * Now when editing contents, information identifiying the element being + edited is always displayed on the page heading. + + * Work reports minute detail level support has been added. This allows users + to specify how many hours and minutes they have devoted to each task. + Reports have been updated accordingly to include the work time in minutes + too. + + * LibrePlan web services have now a new method to export only one entity by + specifying its code. + + * Russian and Portuguese translations. Apart from English, Spanish and + Galician now LibrePlan is also available in Russian and Portuguese. + +Notes +~~~~~ + +If you are upgrading from any 1.1.x version without using the Debian package, +you will need to manually execute on your database the SQL sentences from file: +``scripts/database/upgrade_1.2.0.sql`` + +Contributors +~~~~~~~~~~~~ + +Thanks to all the contributors to this new version: + +* Cristina Alvariño +* Jacobo Aragunde Pérez +* Nacho Barrientos +* Ignacio Díaz Teijido +* Pablo Fernández de la Cigoña Nóvoa +* Óscar González Fernández +* Dmytro Melanchenko +* Susana Montes Pedreira +* Javier Morán Rúa +* Diego Pino García +* Manuel Rego Casasnovas +* Farruco Sanjurjo +* Lorenzo Tilve Álvaro + +Translators +~~~~~~~~~~~ + +Thanks to all the translators for their hard work: + +* [es] Manuel Rego Casasnovas +* [gl] Manuel Rego Casasnovas +* [pt] Helena Grosso +* [ru] Pavel Rudensky + +Changes +~~~~~~~ + +* Release new version LibrePlan 1.2.0 +* [doc] Update some links in INSTALL file +* Fixed width issue in Workreport models edition +* Fixed width issue in ffox with materials category selection +* [Bug #1279] Fix problem with Decimalbox in Spanish +* [Bug #1278] Fix NPE going to project details after Gantt without read permissions +* [Bug #1277] Generating exception days code before checking if they are null +* Add postinst script +* [doc] Fix wrong styles in LDAP documentation +* doc/en: Make direct links to reports only shown in HTML +* doc/en: Re-flow text to avoid excessive nesting in TeX output +* doc/en: Convert Avanza logo to PNG +* doctool: Support translation of underlines for sub-pages +* doctool: Sort input filenames when generating indexes +* doctool: Use spaces only for indentation +* [doc] Added LDAP configuration help in Galician. +* [doc] Added LDAP configuration help in Spanish +* [doc] Links the help of 'LibrePlan Configuration' to the help icon. +* [doc] Added LDAP configuration help in English +* Mark libreplan as Pre-Depends +* Updated Debian control files for different distributions +* Dump database +* Add a transitional package +* Remove unneeded dependencies in Debian control files +* [doc] Fix several wrong URLs in documents +* [doc] Fix several wrong URLs in documents +* Update README and Debian package info +* [Bug #1249] Calendar names sorted in several screens +* [Bug #1246] Added sorting for Customer field +* Corrected typo in authors list. +* [Bug #1276] Fix problem with START_START and END_END dependencies in critical path +* [Bug #1273] Reimplement coerceToString as a workaround for the bug in Decimalbox. +* [Bug #1274] Do decimal separator replacement in the correct way in ZK5. +* Revert "[Bug #1274] Remove LenientDecimalBox." +* [Bug #1274] Remove LenientDecimalBox. +* Update Debian package configuration files +* Generate SQL script to upgrade from version 1.1.0 to 1.2.0 +* Revert "Revert "[Bug #1253] Constraint for EffortDuration in advanced allocation"" +* Revert "[Bug #1253] Constraint for EffortDuration in advanced allocation" +* [i18n] Update keys.pot and Spanish and Galician translations +* Rename database to use LibrePlan in its name +* Fix typo in comments in Sahi tests +* Added vertical alignment in WBS tree buttons +* Renamed operations column in external companies grid +* [Bug #1247] Fixed issue with checkbox validation in Quality Form edition +* Added not empty constraints for WBS task names +* Added hflex property to WBS tree +* Fix possible issue if configured progress type is null +* Prevent NullPointerException filling progress type combo +* Fix OrderElementServiceTest to pass tests in MySQL +* Removed fixed height in WBS task edition popup +* Removed extra border in resources load +* [Bug #1235] Added scrollbar to perspective icons area when needed +* [Bug #1235] Changed height calculations affecting project edition scollbar +* Mark first menu entry as active when user goes to / +* Add link to first subpage in "My account" menu entry +* [Bug #1253] Constraint for EffortDuration in advanced allocation +* Fixed Sahi test data-types/exception_days_test.sah in chromium +* Removed jsession parameter in EntryPoints matching conditions +* Fix pending issues in previous commit +* Inserted empty conditions for default data +* Fix several functional tests due to problems with accept button in resource allocation pop-up +* Fix materials functional test +* Fix work reports functional test +* Fix work hours types functional test +* [Bug #1267] Add reloadBindings of material tree after saving +* [Bug #1270] Fix issue invalidating TaskComponent +* [Bug #1270] Fix problem the first time you choose a progress type +* [Bug #1269] Mark as selected the configured progress +* Added a message in print modal window to remind saving +* [Bug #1260] Fixed resizing of task information table in allocation popup +* [Bug #1268] Removed display property causing progress-types combobox issues +* Fixed Sahi test : data-types/unit_measures_test.sah +* Fixed Sahi test : scheduling/templates_test.sah +* [Bug #1272] Set progress in TaskElement when its created +* [Bug #1269] Fix tooltip text using now configured progress type +* [Bug #1269] Fix previous commit as it was not working properly +* [Bug #1269] Now configured progress is used by default in company view +* [Bug #1266] Fix issue reloading bindings of allocation grid +* Mark some strings to translate in configuration.zul +* Fix some issues pending in previous commit +* Changes on LDAP configuration screen +* [Bug #1260] Improved horizontal scaling of assigned materials +* Replaced legacy NavalPlan logo versions +* Fixed styles for selected listitem and comboitem elements in ZK5 +* [Bug #1264] Checked that we are accessing a planning tab with creation button enabled +* Fixed textbox and datebox style issues in leftTasksTreeRow component +* Changed Textbox automatic width calculation in LeftTasksTree +* Removed problematic left and right listeners on TaskDetails treeRows +* [Bug #1260] Fixed width issues in Task hours group +* [Bug #1244] Only create dateboxes for treerow textboxes when needed +* Removed unnnecesary elements from DynamicDatebox component +* [Bug #1248] Added extra validators when saving order +* [Bug #1248] Project general data tab now validates if project or code exists +* Removed ambiguous arrow in mouse-selected tree row +* Fixed horizontal scaling issues in criterion requirements +* [Bug #1244] Fixed DynamicDatebox component behaviour in zk5 +* [Bug #1262] Remove option to cancel progress assignments in Gantt view +* [Bug #1262] Fix wrong method names in ManageOrderElementAdvancesModel +* Disable login name and disabled checkbox in user edition for LDAP users +* Rename User::getAuthenticationMethod() to User::getAuthenticationType +* Authentication type not editable +* Changed the way in which authentication type is shown +* [Bug #719] Fix problem in WBS when you modify tasks hours with parents in previous pages +* Fix warning in the JavaScript code when trying to access a method of a null object. +* [Bug #1257] Prevent saving null TaskSource +* [Bug #1239] Updates text of tooltips when changing name or progress +* [Bug #1254] Keep zoom level in advanced allocatin perspective +* [doc] Update authors info in user guide +* Updated AUTHORS file adding Helena Grosso as Portuguese translator +* [Bug #1252] Fix issue avoiding reset TaskElement endDate +* [i18n] Added Portuguese language to enum and modified pom.xml to use English userguide +* [i18n] Add Portuguese translation +* Fix some extra ":" in Sahi tests +* Update AUTHORS file +* [i18n] Fix small typo in Spanish translation +* [i18n] Mark string to be translated +* [i18n] Mark string to be translated +* [i18n] Update Spanish and Galician translations due to last changes +* [i18] Update keys.pot due to last issues fixed in past commit +* [i18n] Fixing several issues in project strings +* [i18n] Updated Spanish and Galician translations +* [i18n] Update keys.pot files +* [Bug #1141] Remove Task.reloadResourcesTextIfChange(). +* [Bug #1141] Added setter for left attribute of TaskComponent which updates the dependencies. +* [Bug #1250] Fix issue removing TaskSource of unscheduled element +* Add toString to OrderElement to make easier debug process +* [Bug #1245] Fix issue when moving task to an un-direct descendant +* [Bug #1238] Fix concurrent modification exception +* [Bug #1243] Labels of root task were not properly loaded +* Fix tests due to changes in 3bd402d5baaaee3f90c6885be1d8b041d3ae989c +* Reduced unnecesary vertical minimum height in orderElement advances +* Fixed horizontal scaling and other layout issues in WBS +* Moved draggable property from WBS rows to inner schedulling cell +* Removed unused attribute +* Applying days from start to deadline when selecting template +* Added validation when creating new project that the same name is not being used +* Increased minimum number of columns to display in timetracker +* Replaced obsolete separator between project name and project id +* Removed specific button for creating projects from templates +* Moving code that enables global buttons out from the perspectives +* Merged creation of new projects from templates into main creation window +* Fixed hibernate issues when creating new projects from templates +* [Bug #1224] Added constraints in effort textbox +* [Bug #1237] Fix problem with progress bar size +* Default work report model has all attributes at line level +* Fix wrong string in templates functional test +* Fix planning criteria functional test +* Fix functional tests related with my account menu +* Fix subcontract functional test +* Fix functional tests related to work reports +* Fix functional tests related to workers, virtual workers and machines +* Remove links to non-existent resource.css file +* Fix configuration functional test when running all tests together +* Added default data for WorkReportType +* Added default data for TypeOfWorkHours +* Added default data for Labels +* Added predefined calendar exceptions +* Configured default data for Criteria +* Change wrong string "Extra Effort" for "Overtime Effort" +* [Bug #1236] Sorting orders in some combos of reports +* Fix configuration functional test +* Fix users and profiles functional tests +* Fix work hours functional test +* Fix work report model functional test +* [Bug #1215] Store the resources tooltip hidden/shown state in the TaskRow widget and use that state when redrawing the TaskComponents. +* [Bug #1221] Shows orders sorted in project finder +* [Bug #1215] Store the labels hidden/shown state in the TaskRow widget and use that state when redrawing the TaskComponents. +* [Bug #1162] Fix issues in stretches function dedication chart +* Make simple code to remove perspective buttons +* [Bug #1228] Fix issue creating default write authorization +* Set mold paging in criteria tree to show the pager +* [Bug #1231] Fix issue avoiding call EffortDuration.sum with null values +* Skipping some tests in ScenariosBootstrapTest failing in MySQL +* Fix name of OnDay class inside ContiguousDaysLine +* [Bug #1232] Fix problem in load chart filtering all assignments taking into account order resources +* Corrected .gitignore to match the new directory names. +* Unskip tests in ScenariosBootstrapTest +* Fix BaseCalendarModelTest needed to load configuration +* Rename pending file to libreplan +* Rename column navalplan_user to libreplan_user in user_table +* Skipping some test due to rename to libreplan +* Rename NavalPlan to LibrePlan +* Removed unnecesary code for showing/hiding labels +* [Bug #1097] Fixed issue with container corners when showing labels +* [Bug #1120] Fixed appearance of labels on tasks when its parent is expanded +* Fixed issue when the splitter is resized the legend area was not aligned +* Removed access to ResourcesLoad and AdvancedAllocation from company view context menu +* [Bug #1207] Fix templates historical statistics messages +* Removed unused lines in ConfigurationController +* [Bug #1199] Fix issue setting Listitem value in renderer +* Fix small issue in INSTALL file +* [Bug #1230] Fix issue updating OrderElement name when it's changed in TaskElement +* Remove ZK repository as it's not needed anymore +* Change dependency to ZK CE +* [Bug #906] Remove some pending comments +* Upgrade ZK version to 5.0.9 +* Revert "Look for new resources when moving a task" +* [Bug #1225] Fix issue in OrderDAO.loadOrdersAvoidingProxyFor with new OrderElements +* [Bug #1227] Order authorizations are saved now in SaveCommand +* Replace the component Detail from ZK EE with our free replacement in the Java code too. +* [Bug #1227] Fix problem with percentage advances not being created +* [Bug #1223] Catch ValidationException in SaveCommandBuilder +* Renamed 'Accept' for 'Apply' commands in advanced allocation +* Removed 'Up' command in resources load view of a project +* Added a 'Cancel' button to common area with modal window to ask for confirmation +* Moved 'Reassing' icon out of common area over perspectives +* Fix lazy mapping to be lazy="false". +* Fix lazy exception chaging to resources load view after moving a task in Gantt +* Remove some unneeded reattachments in ResourceAllocationModel +* [Bug #1214] Fix problem reattaching HoursGroup in allocation pop-up +* [Bug #1214] Fix issue changing Hibernate mapping for map inside CalendarData +* Replaced component master-detail with a GPL alternative based on the code of the ZK3 version. +* Use LocalDate instead of Date in LoadTimeLine.getIntervalFrom. +* Changed planner save command message +* Injected planner global commands in common area over perspectives +* Created an empty area for positioning all planner global commands +* Merge branch 'bugs' +* [Bug #1217] Fix issue avoiding reattach of criteria +* [Bug #1219] Shows labels and/or resources when the buttons are pressed after changing perspective +* Added a fixed height for resourcesload watermark +* Added listener to recalculate height on window resizing +* [Bug #820] Added minimum vertical heigth for timetracker watermark +* Avoided dual scrollbar inside resourcesload worker details table +* [Bug #820] Several changes in watermark height calculations +* Removed unnecesary scroll in login window +* Fixed issue in resourceload_row width calculations in Resources Load view +* Remove unused param in LimitingResourcesTabCreator::create +* [Bug #1216] Fix issue chaning code to check allocation resource radio +* [Bug #1216] Removed unused code as Radiogroup at that point never has elements +* [Bug #1216] Remove unused argument in method related with radio buttons in resource allocation +* [Bug #1218] Fixing issue avoiding load order from database +* [Bug #1183] Implement the replacement of decimal comma with dot in the client side. +* [Bug #1213] Use String.CASE_INSENSITIVE_ORDER comparator instead of String.compareTo() function to compare resource names. +* [Bug #1186] Show all the resources in the list on resources usage page, even the empty ones. +* [Bug #1205] Fix issue going to edition of a task in WBS directly +* [Bug #1196] Assign task to the first valid queue in case that all of them are empty. +* Fix wrong string, now using project instead of order +* Applied interface conventions in settings UI +* [Bug #1173] Application language must be user language +* [Bug #1187] Add filter by resources in TaskGroup filter in company Gantt view +* [Bug #1187] Fix issue filtering TaskGroup by criteria in company Gantt view +* [Bug #1187] Move TaskElementPredicate to a proper package +* [Bug #1187] Add filter by resources in TaskElement filter in project Gantt view +* [Bug #1187] Fix issue filtering TaskElements by criteria in project Gantt view +* Fix 2 wrong comments in SigmoidFunction +* Fixed zk5 migration issue in advanced assignment search +* Fixed regression introduced with icons positioning in WBS +* Applied interface conventions in user edition and advance consolidation +* [Bug #1200] Add dependency from ganttz in the definition of limitingresources package. +* [Bug #1206] Add event listeners for checkboxes in the legend of the earned value chart. +* Remove unused method in SigmoidFunction +* [Bug #1204] Do not round hours in Sigmoide allocation +* Fixed issue with positioning of buttons and icons to manipulate WBS +* Removed logos from application footer +* Applied interface conventions to workreport window +* Increased standard height for listbox in bandbox search component +* Applied interface conventions to WorkReport Type edition +* Improved comboboxes spacing on workreports edition +* Labels are displayed ordered in label type edition +* Applied interface conventions to workreport query +* Added textbox to set description value in template edition +* Fixed project name width issue in projects list using reduced resolutions +* Grouped visually the same entity sequences in cofiguration window +* Removed Group component dependency +* Revert "[Bug #1173] Application language must be user language" +* [doc] Add note in web services README about HTTP Basic Authentication +* Prevent moving task with manual allocation +* Disable start constraint combo and date in task properties if it has manual allocations +* Set tasks as START_IN_FIXED_DATE when manual allocation is applied +* Remove unneeded cast and rename variable +* [Bug #1209] Fix NullPointerException in WorkReportCRUDController::updateEffort +* [Bug #1208] Remove some generic catchs that was preventing to detect previous issue +* [Bug #1208] Fix issue with imputed hours view in company view +* [Bug #1208] Rename calculateLimitDate functions to prevent future confusions +* [Bug #1208] Fix problem with imputed hours in project view +* [Bug #1173] Application language must be user language +* [Bug #1202] Managed division by zero calculating template averages +* Revert "[Bug #1202] Managed division by zero calculating template averages" +* [Bug #1203] Added event on client side to send the data of the zoom change and listener on the server to store them. +* [Bug #1198] Implemented missing JS operation QueueListComponent.adjustScrollHorizontalPosition. +* [Bug #1202] Managed division by zero calculating template averages +* Look for new resources when moving a task +* Internationalize UI string. +* [Bug #1190] Limiting resources not translated properly +* [Bug #1160] Show footer in "Work and progress per project" report +* Fix problem in interpolation function it was doubling the assignments +* Fix issue in interpolation function because of new default stretches 0 and 100 +* Fix size problem with new Listbox of assignment function in resource allocation pop-up +* Add ON_SELECT event to Listbox, reseting assignment function to flat +* Added flat function always as first option in resource allocation pop-up +* Change assignment function information from Label for Listbox in resource allocation pop-up +* Disable inputs in AllocationRow if there is any manual allocation +* [Bug #953] Simulated click on progress button when changing type +* [Bug #1185] Fixed combobox problems with selector for progress types +* Added more space for perspective button labels +* [Bug #1127] Fixed dependencies in limiting resources +* [Bug #1188] Fixed graphical issues in Montecarlo modal window +* Remove last deprecated methods related to EffortDuration +* Fix issues in Ubuntu with REST scripts +* Move advanced allocation command controller out of EditTaskController +* [Bug #1193] Fix bug +* [Bug #1191] Avoid NullPointerException in "Hours Worked Per Resource" report +* Revert "[Bug #1191] avoid null pointer exception" +* [Bug #1161] Fix comparison in BigDecimal in previous patch +* [Bug #1161] The value of progress is at maximum 1 +* [Bug #1197] Fix bug +* Ensure retrieved OrderVersions are not proxies +* [Bug #1195] Fix bug +* Fix another functional test due to removal of "Go to advanced allocation" button +* [Bug #1194] Fix bug +* [Bug #1191] avoid null pointer exception +* Include search_resources_test.sah in all_test.suite and in all_resources_test.suite +* Fix another functional test due to removal of "Go to advanced allocation" button +* Make new dependencies to be rendered in the correct position of the DOM. +* Added synchronization for property dependencyType in LimitingDependencyComponent widget. +* Reimplemented the onclick event in QueueTask elements that existed in the ZK 3.x version. +* Reimplemented the onmouseover and onmouseout events in QueueTask elements that existed in the ZK 3.x version. +* [Bug #1193] Fix bug +* [Bug #1192] Fix bug +* [Bug #1157] Sorted input fields +* Fix functional test due to removal of "Go to advanced allocation" button +* Add "Advanced allocation" option in secondary menu of a task +* Remove "Go to advanced allocation" button in resource allocation pop-up +* Disabling fields in ResourceAllocation pop-up if any allocation is manual +* Now Monte Carlo simulation tab shares the state with the rest of the tabs +* [Bug #1178] Fixed calculation of sum hours with EffortDuration in report HoursWorkedPerResource +* [Bug #1178] Fixed calculation of sum hours on a report +* [Bug #1178] Showing EffortDuration in reports instead of BigDecimal +* [Bug #1159] Fixed end date position +* Now project's details view shares the state with gantt and resource load +* Improve toString method +* Add verstion to PlanningData +* The cause must be thrown +* ConcurrenetModificationException shouldn't happen +* Now the save command should be able to save orders +* Do the don't pose as transients outside of the transaction +* Synchronize in memory on retrieval of the PlanningState +* Allow to provide several strategies for saving TaskSources +* The tasks to save and so on are recreated each time a screen is entered. +* PlanningState is now responsible of creating the SaveCommand and the PlannerConfiguration +* Use a singleton for creating a SaveCommand +* Make TaskElementAdapter a singleton +* Written the client-side code to draw dependencies in limiting resources screen. +* Added properties idTaskOrig and idTaskEnd to LimitingDependencyComponent. +* Create widget QueueTask with an empty structure, removing wrong event listeners from it. +* [Bug #1172] Fixed search +* [Bug #1151] Fixed layout problems in report "Hours worked by resource in a month" +* Include some changes to solve a error on criteria_test.sah and include scheduling tests on all_test.suite +* Fix problems in the tests, created for some changes in work report form +* Use some functions from common_functions.sah, in planning_labels_test.sah +* [Bug #1149] Fixed ClassCastException on ResourceDAO +* Added options on label filtering +* Changed query to filter by labels +* [Bug #1177] Allows to insert EffortDuration instead of hours in webservices +* Fix issue in work reports services +* Upgrade ZK version to 5.0.8 +* [Bug #1179 & #1182] Fixes UI for WorkReport edition +* Remove unused method in ResourceAllocationController +* Added new file which includes tests for all the search fields of resources +* Include some functions from virtual_worker_test.sah in common_functions.sah +* Improve commonCriteriaCreate to allow create a criterion type with different criteria names +* [Bug #1189] Added auto horizontal scroll in templates WBS to fix bug +* Fix issue with size of font in combos in advanced allocation window +* [Bug #1184] Fix issue avoiding reset verticalPage to zero +* Load required data in MaterialAssignmentDAOTest +* [Bug #1180] Change method names in order to make explicit that work with root templates +* [Bug #1180] Fix bug. checkConstraintUniqueTemplateName is only checked in root elements +* Include new test in planning_criteria_test.sah to check the filter of project planning and move some elements to common_functions.sah +* Added new test file with include some tests for project planning and assign a labels in a task +* Added new test file with include some tests for project planning and assign a criterion in a task +* [Bug #1148] Intializes pulldown for year and month properly +* [Bug #1155] Changed selected items to items for showing name of projects in report +* Change dialect to MySQL5InnoDBDialect in order to fix issues with MySQL 5.5 +* Drop and restore foreign key in database due to change in to sum_charged_effort_id +* [Bug #1154] Sorts the report by order name. +* [Bug #1156] Fix bug force loading of HoursGroup entities +* [Bug #1178] Showing EffortDuration in reports instead of BigDecimal +* Include some functions of workers in common_functions.sah and use them +* Include some functions about labels in common_functions.sah and use them +* Include new test for templates in a new folder scheduling +* [Bug #1147] Fix issues in Hours Worked Per Resource report +* Small fix in HoursWorkedPerWorkerController to avoid NullPointerException +* [Bug #1146] Fixed model setting hasChangeLabels to true after a label remove +* [Bug #1175] Fix bug +* [Bug #1175] Fix bug +* Avoid unnecessary calculations +* Add method to extract the interval of a ContiguousDaysLine +* Fixed problems width problems in chrome +* Fixed issue with hidden elements in print view +* Fix intermittent test failures +* [Bug #1176] changed controller to allow a search in only one day (from 00:00:00 to 23:59:59) +* Use some commonProgress functions included in common_functions.sah in progress_test.sah +* Include a new test in calendar_test.sah and modify a function in configuration_test.sah +* Include some new tests in machines_test.sah +* Added new file all_account_test.suite which allow run all the account tests and include account tests in all_test.suite +* Added new file password_test.sah +* Added new test file settings_test.sah in a new folder account +* Fix issues in with StretchesFunction after removing date field +* Remove date attribute from Stretch +* Fix Liquibase changes in MySQL +* Merge branch 'work-reports-effort-duration' +* Include some new tests in virtual_worker_test.sah +* Include some new tests in worker_test.sah +* Include a new function on common_functions.sah +* Fix some mistakes in the resource descriptions +* Merge branch 'master' into work-reports-effort-duration +* Fix issue with logo in reports +* Fixed Reports to work with sumEffort instead of sumHours +* Merge branch 'master' into work-reports-effort-duration +* Change EffortDuration toString and toFormattedString to show always 2 digits in minutes and seconds +* Change repository URI to make it point to the new Nexus location +* Removed method getTotalChargedHours in SumChargedEffort class +* Avoid change login from settings screen +* Include some new tests in material_test.sah +* Change test to remove more old hours methods in SumChargedEffort +* Remove unused methods in SumChargedEffort +* Saves work reports with efforts instead of hours +* [Bug #1171] Prevent delete companies already in use +* Do some changes in files which include materials tests because they didn't work correctly after a bug fixing +* Add a suite for all the resources and include resources in all_test.suite +* Added tests for subcontracting +* Added tests for companies +* Added tests for work report +* Added tests for virtual workers groups +* Add tests for machines +* Add tests for workers +* Include some functions in common_functions.sah +* Updated 'Projects List' entry in functional tests +* Renamed 'Projects' with 'Projects List' in breadcrumbs menu +* [Bug #1169] Fixed regression in z-indexing which made impossible to expand containers +* [Bug #1153] Set empty code if code is not autogenerated for new calendars +* [Bug #1152] Use ConstraintChecker to show error messages before saving +* [Bug #1152] Fix error message in wrong language in calendars +* [Bug #1144] Fix now Material needs a description +* Added support for custom logos in reports +* Avoided hidden horizontal scroll effect in taskdetails +* Renamed entry 'Projects' for 'Projects List' in main menu +* [Bug #1099] Fixed several issues in print styles +* Replacing application logos with new LibrePlan image +* Fixed styles problem in apply and cancel buttons in advanced allocation +* Merged redundant logo images and removed its i18n file paths +* Removing toolbar button styles in advanced allocation +* Changed paginator size in projects and workers lists +* Change custom logo position +* [Bug #1150] Material categories tree is reloaded after adding new elements +* Fixed chromium width problem in materials window +* [Bug #1142] Fix returning false when needed in beforeDeleting method +* [Bug #1170] Fix bug +* [Bug #1137] Fix bug. Project name is now unique +* [Bug #1131] Fix adding message for user when work report is removed +* Add some functions to common_functions and improve work_hours_test.sah using common functions +* Allow to look for the set of OrderElement associated with a WorkReportElement +* [Bug #1125] Disable remove button if unit type is assigned to any material +* Fix imputed hours tab UI now using EffortDuration +* Rename attribute sumChargedHours to sumChargedEffort in OrderElement +* Change to effort SumChargedHours now called SumChargedEffort +* Remove FlatFunction class as it is not used anymore +* Uncomment configuration_test.sah in suite files +* Adds navalplan configuration tests and include some new functions in common_functions.sah +* Fix issue when changing to Flat assignment function +* Enable again resource allocation inputs for any assignment function +* Added a new suite to run all the administration tests and include the new tests on all_test.suite +* Added calendar test file +* Add material tests file +* Added Quality forms tests +* Add new folder for administration-management elements and include a new test file cost_categories.sah +* Change some functions from work_hour_test.sah for functions included in common_function.sah +* Include some functions from criteria, worker, calendar and cost category in common_functions.sah +* Using EffortDurationPicker for work reports interface +* Remove unused methods in WorkReportLine +* Change numHours to effort in WorkReportLine +* [Bug #1166] Check if advanceType is null +* Show languages sorted in settings page +* [i18n] Add Russian value to Language enum +* Increased width of selected day details grid +* Changed styles for selected day and out of current month +* Hide seconds granularity in calendar exception types +* [Bug #1132] Adding more selectable colours for calendar exception types +* Displaying color samples in Calendar Exception Type edition +* Solved z-index problems in gantt listdetails +* [i18n] Fix some pending strings in Russian translation +* [i18n] Add command in pom.xml to copy English help to Russian folder too +* [i18n] Add images folder needed for Russian translation +* [i18n] Add Russian translation +* [Bug #1123] Added condition to avoid max value equals zero +* [Bug #1123] Add test to check that maxValue is greater than zero +* Update information about assignment function in allocation row +* Rename setWithoutApply to setAssignmentFunctionWithoutApply in ResourceAllocation +* Apply assignment function if any from resource allocation pop-up +* Use already existent method with more descriptive name +* Avoid FormBinder.getCurrentRows +* Disable resource allocation inputs when assignment function is not flat +* Remove unneeded URL in data types tests suite +* Added two new suites +* [Bug #1143] A quality form cannot be deleted if it is associated to any task +* Only show assignment function if any is not flat +* Show information about assignment function in resource allocation popup +* Fix bug now it is possible to come back to flat allocation from any assignment function +* Apply assignment function if any when user modify total hours of an allocation +* Remove warning messages when user modifies assignments in advanced allocation +* Disable configuration button for assignment functions not configurable. +* Added profile_test.sah into user folder +* Include file all_data_type_test.suite which allow run all data type test +* Added work report model data type tests +* If a task has manual allocation and is moved then reset to flat +* Add function isSigmoid in IAssignmentFunctionConfiguration +* Rename assignment function name enum +* AssignmentFunction is now an abstract class. +* Add ManualFunction for advanced allocation +* [Bug #1163] Included .js file in component for scroll synchronization with timetracker +* [Bug #1163] Fixed visibility of allocation panel scroll bars +* Fixed transparency problems in stretches function configuration window +* Fixed width issues in reassignment popup +* [Bug #1165] Fix bug +* [Bug #1165] Fix bug +* Fix exception when going to the resource load directly +* Use Listbox instead of Combobox in functions column of advanced allocation window +* Reduce width for efforts column in advanced allocation +* Fix wrong message in configuration button of functions +* Create a new folder which includes user tests and include user_test.sah +* Rename None function to Flat in resource allocation +* Reattach the planning state if exists +* Fix percentage calculation +* [Bug #1164] Fix bug +* Added check Code label functions in all data type tests +* [doc] Links the help of report 'Work and progress per project' to the help icon. +* [doc] Added help for report 'Work and progress per project' in Galician +* [doc] Added help for report 'Work and progress per project' in Spanish. +* [doc] Added help for report 'Work and progress per project' in English. +* Removed unused variable in loops. +* Fix issue when moving a task with an assignment function. +* Fix typo +* Include logs in all the data type tests. +* Added new test to criteria_test.sah file and include respective functions on the common_function.sah file +* Adds work hours data type test +* [Bug #1139] Fix several tests due to new constraint in defaultPrice +* [Bug #1139] Add constraint on UI to show warning in work hours without default price +* [Bug #1139] Do not save work hour without default price +* Unify state of resource load's chart +* [doc] Links the help of report 'Total worked hours per resource in a month' to the help icon. +* [doc] Added help for report 'Total worked hours per resource in a month' in Galician +* [doc] Added help for report 'Total worked hours per resource in a month' in Spanish +* [doc] Added help for report 'Total worked hours by resource in month' in English +* [doc] Links the help of report 'Hours Worked per resource' to the help icon. +* [doc] Added help for report 'Hours worked by resource' in Galician. +* [doc] Added help for report 'Hours worked by resource' in Spanish. +* [doc] Added help for report 'Hours worked by resource' in English. +* Ignore log files +* [doc] Updated development documentation to new BaseCRUDController class +* Fixed alignment problems in gantt taskdetails cells +* Fixed dependency arrows +* Improved alignment in assignment columns +* Release new version NavalPlan 1.1.3 +* [Bug #1138] Fix bug +* [Bug #1136] Fix bug +* Add class to distribute an EffortDuration considering the capacities +* Improved appearance of tasks filter +* Removed unused methods +* Modified positioning of filtering options popup +* Adds Unit measures data type test +* Delete trailing whitespaces from scripts/functional-tests/README +* Applied previous color to selected grid row +* Removed draggable properties from progress type list +* Fixed header filter widths +* Fixed styles issues in progress advance management +* Fixed chrome width problems in work hour types edition +* Fixed limiting resources planning header issue in chrome +* Fixed horizontal width fill in WorkReports list +* [Bug #1128] Fixed bug +* Adds label data type test +* Adds several changes in the README to increase in quality of the text +* Add logging category for authentication attempts +* Fix NullPointerException in highlightDaysOnCalendar method +* [Bug #1126] Fix issue in Chromium/Google Chrome +* Refactor ResourceLoadController +* Refactorize setupNameFilter +* Create fields instead of implicitly passing the data +* Group data in class +* Extract another super class for load charts +* Adds a warning about the need to configure the browser in english +* Add Exception days data type test +* Fix some probles with the method BaseCRUDController:updateWindowTitle and also add new test to comprobate the correct working of precission and Max Value. +* [i18n] Update Spanish and Galician translations +* [i18n] Update keys.pot files +* Add criteria data type test +* Change one line in progress_test.sah because it produced an error in some machines +* Add some exclusions to avoid conflicts in runtime +* Add script to start Sahi from command line +* Create a new folder to introduce all data type tests called data-types and include the first of them progress_test.sah +* Add some files needed to run sahi in /scripts/functional-tests and include some explanations in REAME file +* ConstraintChecker does not return boolean now +* Fix highlighted days on datebox widget in limiting resources +* Added popup in filters to use or not labels inheritance +* [Bug #1134] Add checks for empty username or password +* [doc] Fix some style format in functional tests documentation +* Create new directory scripts/functional-tests +* Fix typo in database username +* Fix typo: s/Ban/Bank +* [Bug #1132] Fix web service example for CalendarExceptionTypeSample +* [Bug #1132] Remove DayType enum in BaseCalendar +* [Bug #1132] Updated calendar interface to use different colors +* [Bug #1132] Using a renderer in CalendarExceptionType listing +* [Bug #1132] Modify CalendarExceptionType edition form +* [Bug #1132] Create new enum CalendarExceptionTypeColor +* [Bug #1133] Fix bug +* Fix issue in ConstraintChecker now error messages was not being shown +* [Bug #1132] Fix problem with CalendarExceptionType without name +* Fix problem in ConstraintChecker +* [Bug #1121] Fix issue adding @AssertTrue on AdvanceType entity +* [Bug #1119] DataIntegrityViolationException saving a new Process +* Fix highlighted days on calendar widget +* Use ContiguousDaysLine at OrderPlanningModel +* Implement ResourceLoadChartData using ContiguousDaysLine +* Add ContiguousDaysLine class +* Fix problem with chart colors +* Extract class for filling load charts +* Fix wrong label in "Work And Progress Per Task" report +* [Bug #1130] Fix issue changing text size and moving box +* [Bug #1107] Fix issue preventing NullPointerException +* [Bug #1113] Fix issue marking as not transient all allocations +* [Bug #1129] Fix bug setting scale for progress value +* [Bug #1111] Fix name and code of tasks in report +* Define CompanyPlanningModel using annotations +* Define OrderPlanningModel using annotations +* Remove not in effect annotations +* [Bug # 1111] Fix several issues in report: Task Scheduling Status In Project +* Show the precise efforts instead of the rounded amount in hours +* Use a valid url-pattern +* Switch to GanttDates +* [Bug #1124] Fix problem when calculating assigned duration +* Unify advanced allocation state +* Return empty list instead of throwing an exception +* Take into account the scenario +* Create mechanism for reusing common parts of the queries +* Remove unused methods +* Fix the check for checking if an allocation belongs to the order +* [Bug #1122] Fix bug +* [Bug #1117] Fix issue changing I18nHelper in business. +* Avoid workaround to not allow select rows in calendars tree. +* Upgrade ZK version to 5.0.7 +* Port client enhacements of BandboxMultipleSearch to ZK5 +* [Bug #1115] Fix bug and add new ProgressType for spread progress +* Change the way to update advances in parent elements. +* Not allow select rows in calendar tree. +* Don't use the returned by queries allocations belonging to the order +* Remove spurious annotation +* Reattach the order +* Provide PlanningState to ResourceLoadModel +* Move PlanningState to within PlanningStateCreator +* Reuse PlanningState +* [Bug #1088] Fixed issue in earned value chart +* Revert "[Bug #1088] fix the representation of the chart of earned value month and upper zoom" +* [Bug #1115] DataIntegrityViolationException saving a Cost Category with repeated name +* [Bug #1111] Change label in filter by project section +* [Bug #1111] Task status combo internationalized +* Modify CSS to show labels in containers when are expanded +* Improved getHumanId for worker entities. +* Adapted WorkReportTypeCRUDController in order to extend BaseCRUDController +* Adapted CriterionAdminController to extend BaseCRUDController. +* it changes the labels in the columns of the calendar list, fixes the error messages. +* Modify calendars controllers to show information about edited entity +* Use only editWindow and remove createWindow for BaseCalendarCRUDController +* Manually modified workers to show information about edited entity +* It retrieves the complete description of the type filtered object to show it in the results. +* Change the format of the matching results of a search in the gantt view and the resource allocation view. +* Change the format of the matching results of a search in the projects view. +* Change the format of the matching results of a search in the workers list and in the machine list. +* it adds the property description in the class FilterPair. +* add method in ResourceEnum to retrieve the lowercase value. +* it changes the order of the columns in the bandbox finders. +* Adapted ScenarioCRUDController to extend BaseCRUDController. +* Fixed NPE in tests due to changes in I18nHelper. +* Updated some entity types strings +* Adapted UnitTypeCRUDController in order to extend BaseCRUDController +* Adapted AdvanceTypesCRUDController in order to extend BaseCRUDController +* Revert "Adapted AdvanceTypesCRUDController in order to extend BaseCRUDController" +* Uses default browser locale when user has no language in settings +* Adapted CostCategoryCRUDController in order to extend BaseCRUDController +* Adapted QualityFormCRUDController in order to extend BaseCRUDController +* Adapted UserCRUDController in order to extend BaseCRUDController +* Adapted AdvanceTypesCRUDController in order to extend BaseCRUDController +* Adapted TypeofWorkHoursCRUDController in order to extend BaseCRUDController +* Adapted ProfileCRUDController in order to extend BaseCRUDController +* Released 1.1.2 version. +* Updated Spanish and Galician translations. +* [i18n] Update keys.pot files. +* [Bug #1108] Fixed problem if label is created by another user +* [Bug #1108] Fix bug +* [Bug #1106] Fix bug +* updates the work weeks table when the hours of a day are changed. +* Add "throws InstanceNotFoundException" to delete method and catch the exception into confirmDelete method +* [i18n] Fixed typo in Spanish translation. +* fix the layout in exceptions and work weeks table. +* fix returned values when the configuration is not loaded in BaseCalendarModel and in the EntitySequenceDao. +* Adds constraint to check the validation of the dates of the work weeks when these one are empty. +* it set a fixed width to the column headers in the exceptions table. +* On creating a work week derived from a calendar all the days are created as "Inherited", properly internationalized. +* Fill the combo to create a new work week with the first calendar in alphabetic order and changes the name columns and labels to the edition calendar view. +* It set a fixed width to the columns and changes its names. +* fix some errors when a new work week is added. +* Corrections in calendars test +* the parent from which a new work week derives, must be specified. +* the column parent is not shown if the calendar is not derived. +* shows the current parent from which it derives, in the description calendar +* shows the validation messages and constraint messages. +* it permits delete any work week except the last one +* It does not must permit overwrite another whole work week when a new work week is created. +* Corrections in calendars listing +* create default work week of non-derived calendar +* change how create and edit the work week in the calendars view. +* Refactorized PasswordUtil and used JavaScript to default password warnings in "Change Password" page. +* Add onBlur event calling to updateWindowTitle method in _editExternalCompany +* [Bug #1105] Fix bug +* Removed more controller interfaces related to entry points not being used. +* Removed ItEr75S13GenericCRUDController as it was not being used. +* Adapted ExternalCompanyCRUDController in order to extend BaseCRUDController +* Workaround for maven 3 +* [doc] Updated web services documentation with info about new methods. +* Added missing @XmlRootElement annotations. +* Implementation of method which returns one entity +* Remove unused constants and lines in WorkReportLine. +* Add Eclipse m2e settings to pom.xml files +* Merge branch 'master' into ldap +* [Bug #1104] Allow remove profile if it's only used in order authorizations +* Option to delete a user pending in the interface of user list +* Catches NamingException when a role in LDAP does not exist +* Modified export script to test new get methods by code in web services. +* Returning 404 status code if entity is not found in web service method. +* Generic getter for IntegrationEntities via webservice +* Fixed issue in LabelType controller with validation of labels. +* Adapted machines controller to MachineCRUDController. +* Adapted exception days controller to BaseCRUDController. +* Minor fixes in configuration.zul. +* Merge branch 'master' into ldap +* Fixed issue with wrong password in login window (error not shown). +* New option "Change password" in tab "Settings" +* Added default implementation for cancel method in BaseCRUDController. +* Added new beforeSaving method to BaseCRUDController +* Improved info about entities in messages for user. +* Fixed issue if user sets duplicated LDAP roles for the same LibrePlan role. +* Sorted ConfigurationRolesLDAP set in order to show information to user. +* Update window title dynamically for LabelType while user is editing. +* In edition mode show entity being edited in window title. +* Created IHumanIdentifiable interface and used in LabelType. +* Using a set for ConfigurationRolesLDAP instead of a List in order to fix issue. +* Removing unnecesary loop in matching roles +* Used ConstraintChecker in BaseCRUDController. +* Marked some methods in BaseCRUDController as final as they are not intended to be overridden. +* Moved more stuff to BaseCRUDController. +* Added more generic methods to BaseCRUDController. +* Created basic BaseCRUDController and used in LabelTypeCRUDController. +* Removed unneeded lines in worker edition zuls. +* Ensure that the mouseover event for TaskComponent is executed +* Fix end of the dependency was a little above than the pointer +* [Bug #1102] +* Small fixes related with some unneeded variables. +* Refactorization of method getMatchedRoles +* Fixed issue with combo style in Firefox and Epiphany. +* Fixed issue with getMatchingRoles +* Refactorized retrieveUser method in LDAPCustomAuthenticationProvider. +* Removed unneeded usernameInserted variable. +* Changed arguments of authenticateInDatabase. +* Added more responsibilities to authenticateInDatabase method. +* Use authenticateInDatabase in more places. +* Small fixes (groupbox not closable, remove not needed space) +* Move entity Language to package org.navalplanner.business.settings.entities +* Incorporate password and mail to settings window for each user +* Moved Spring LDAP dependencies to root pom.xml. +* Refactorization. Exceptions and generics. +* Add some profilling information for loading a project +* No feedback when loading a project from URL directly +* Refactorization of method retrieveUser +* Replaced tabs for 4-spaces in more files (.css and .js). +* Replaced tabs for 4-spaces in several files. +* Lets the user authenticate when LDAP role search is not properly configured +* [Bug #1103] Fix bug +* Remove unnecessary files +* Merge branch 'master' into ldap +* Fixing issue adding autoscroll to main area in template.zul. +* Move classes and settings.zul to new package +* Incorporate new fields to the user +* Avoid duplicating visual effect on arrows +* Merge branch 'master' into ldap +* [doc] Updated installation instructions due to new "cutycapt" command. +* [Bug #1094] Made changes to fix the issue and use "cutycapt" command. +* Added Nacho and Cristina to AUTHORS file. +* Added an extra grid in settings to format the page like others. +* Refactoring options about planning charts expanded to value per user +* [Bug #1100] Fix bug +* Fixed issue adding constructor without parameters for Hibernate. +* Changed [@user_id] by [USER_ID] in replacement for search query +* Matching-roles with dynamic query. +* Added column LDAP role search query in LDAPConfiguration +* Merge branch 'migration-to-ZK5' into master +* Fix ClassCastException on EffortDurationBox +* Remove still present spurious throws clauses +* ScriptsComponent and associated clases no longer needed +* Remove no longer necessary throws clauses +* Don't pollute throws clauses +* Fixed translation issue with language combo. +* Changed language como for listbox with mold select. +* Fixed copyright header of configuration.zul file. +* Create language configuration option for user +* [doc] Fixed small things in web services basic documentation. +* Created constructor for LDAPConfiguration component and added some doc. +* [Bug #1088] fix the representation of the chart of earned value month and upper zoom levels. +* Changed roles matching renderer code +* LibrePlan - LDAP role matching +* Remove no longer needed js files +* Mixin position restorer into QueueListComponent +* Add missing function adjustTimeTrackerSize +* Extract mixin for copied and pasted code +* Rename memoize to throttle +* Remove zk-Timeplot-1.0_2 project +* Delete no longer needed js files +* Throttle the drawing of the dependencies +* Reimplement moving dependencies when moving task +* Fix the key of the response +* The elements must be queried again otherwise the offset is calculated badly +* Remove unncessary calls to redraw +* Avoid error when moving a task +* [Bug #1096] Fix bug +* [Bug #1095] Fixed issue using header parameter of CutyCapt to set Accept-Language. +* [doc] Improved info about web services. +* [doc] Updated development doc to new REST scripts. +* Tidy not mandatory for example REST scripts. +* [doc] Get rid of Ruby. +* Updated script to get REST XML schema to new variables for environments. +* Remove needed to use Ruby for REST example scripts. +* Use method in SecurityUtils to get current user +* Added method getLoggedUser() in SecurityUtils class +* [Bug #1090] Added JavaScript removed in one of the previous patches. +* [Bug #1090] Removed unused variables in UserModel. +* [Bug #1090] Avoid pass Configuration to MandatoryUser. +* [Bug #1090] Fixed hidden warnings if user is disabled. +* [Bug #971] Fixed reseting Tree model to null. +* [doc] Created UPDATE file. +* [doc] Fixed small typo in INSTALL file. +* Sometimes a double was returned +* Fix error when changing zoom +* [doc] Updated INSTALL file. +* [doc] Improved HACKING file. +* Removed HSQLDB profile as it's not working anymore since we use Liquibase. +* [Bug #1091] Fix bug +* [Bug #1091] Be more lenient if the end date is before start date +* Extract validation checks and fix exception message +* [Bug #975] Cannot apply Sigmoid function is resource allocation has consolidated days +* Now rest clients use demo deployment by default and have 2 new options --prod and --dev. +* [Bug #1084] Fix bug +* Released 1.1.1 version. +* Captured generic exceptions. +* Updated TODO file with roadmap for 1.2 version. +* Changed OpenJDK dependency in Debian package for default-jdk or default-jre. +* [i18n] Fixed wrong translation of project in some reports. +* [i18n] Fixed uppercase/lowercases incoherences. +* [Bug #1084] Fix bug +* Avoid where possible to mark a method as throws Exception +* Avoid creation of array by reflection +* Review methods that provide variables that are known to be null +* Implement missing equals or add warning to classes that have a natural ordering +* Remove unnecessary null checks +* Mark classes as static when not referencing outer class +* Avoid the use of Number constructors +* [Bug #789] Script for parsing ZUL files should look for 'ganttzk_i18n' tag too +* [Bug #789] Renamed 'i18n' prefix in ganttzk to 'ganttzk_i18n' +* Fix possible NPE +* Fix NPE if provided allocation is null +* Avoid NPE if editedValue is null +* [Bug #1086] Fix bug +* [doc] Added explanation about different scopes development documentation. +* [doc] Fixed wrong dependency in training exercises. +* [doc] Fixed small issue in reports guide. +* [doc] Fixed typo in development documentation. +* Changed test to avoid it fails if it's launched on Saturday. +* Merge branch 'master' into migration-to-ZK5-merging +* [i18n] Fixed typo in progress with all tasks. +* [i18n] Fixed typo in "criterions" using "criteria". +* [i18n] Updated Spanish and Galician translations. +* [i18n] Fixed issue in keys generator and updated keys.pot files. +* [i18n] Updated Spanish and Galician translations. +* [i18n] Fixed translation of "progress" to Galician and Spanish. +* [i18n] Marked "Choosing template" for translate. +* [i18n] Changed "order sequence" for "entity sequence" +* [i18n] Updated keys.pot files +* Fixed two translation issues. +* Fixed problem when LDAP host is reachable but LDAP is out-of-service +* Fixed bug in button Test LDAP connection +* [Bug #1083] Fix bug +* Added log messages for "Test LDAP connection" button. +* Corrections of previous patch +* [Bug #1014] add borders in the table of the report of worked hours per each resource. +* [Bug #1014] +* [Bug #1014] +* [Bug #1081] validate and action stop if something fails while saving data in progress type view. +* [Bug #1013] increase the width in filter search box. +* LDAP Authentication +* [Bug #1082] Fix bug +* Revert "Fix bug" +* improve the view of autocomplete property of the login form. +* Fixed problem with last LiquiBase change in PostgreSQL. +* [Bug #1075] Fix the some features in the autocomplete property configuration. +* Add isNavalPlanUser column to users list. +* Composite Handler LDAP-Database. Import of users from LDAP. Support of two types of users (LDAP and Database). +* Adding LDAP configuration properties to Configuration and User +* [Bug #1075] disables the autocomplete login form property if the admin password is not on default. +* [Bug #1075] adds compiling option to disable/enable the autocomplete login. +* [Bug #954] Fix bug +* Revert "[Bug #954] Handle concurrency support in Configuration window" +* The new support for parametrizing the clearing of handlers is used +* Now the clearing behaviour can be parametrized +* More aggresive discarding of sessions and desktops +* Basic LDAP Authentication added on login form. +* [Bug #1080] Fixed issue with Montecarlo method when critical path has more than 10 tasks. +* [Bug #1079] Fixed lazy exception initializing parent calendar too. +* Improve toString message +* Fix bug +* [Bug #984] Add ON_OK event on project name textbox in creation project wizard. +* [Bug #1074] check if exists indicators of the earned value for that date. +* [Bug #1076] Fixed NullPointerException going to Gantt view when project is not scheduled. +* Reduce the time that request handlers are kept around in CallbackServlet +* Fix memory leak in TemplateController +* Refactor password not changed controller code +* Allow to GC the page before the desktop is discarded +* Don't let the thread local hang forever in the threads local map +* Fix leak +* Remove unnecessary timers. +* [Bug #1022] Include filtering criteria information in the hearders of the reports. +* Reduce the live time of desktops +* Fix memory leak +* Determine the log directory dinamically +* Use asynchronous appender +* Move default log4j.properties to application +* Added new Liquibase changelog file for new developments on stable branch. +* Added dependencies +* Configured our JfreeChartEngine as the chart engine +* Deleted JFreeChartEngine class +* GPL implementation of JFreeChartEngine +* Deleted files related with JasperreportComponent +* Fixed shrinked rows on Montercarlo chart +* Fixed shrinked rows on grids at Montecarlo view +* Deleted ExtendedJasperreport +* Deleted forgotten references to ExtendedJasperreport +* Added a temporary fix for Chrome bug +* Added missing files for JasperreportComponent +* Changed report component on all report controllers +* Adapted NavalplannerReportController to make use of JasperreportComponent +* Created JasperreportComponent a free implementation of ZK Jasperreport +* Fixed bug related with the model used with a combobox +* Changed some css to fix some errors +* Merge commit 'navalplan-1.0.1' into HEAD +* Fixed invalid timetracker's width for days +* Changed timeplotz version +* Renamed TimeTrackerComponent#afterCompose method +* Made tabs to use all avaliable width +* Fixed bug regarding timetrackergap +* Fixed shrikend boxes on calendars/_edition.zul +* Fixes shrinked boxes on Work Reports +* Fixed shrinked boxes in Resources>Companies>Edit company +* Fixed shrinked boxes in Resources>WorkReports>Edit Work Report +* Fixed shrinked boxes in Resources>Machines>Edit machine +* Fixed shrinked boxes on Resources>Worker>Edit Worker +* FEA: ItEr02S03MigracionZK5 Fixed tree header visualization problems on Chrome +* Fixed bug with watermkars on secondlevel timetracker +* Changed fixedByLayout by sizedByContent +* Released 1.0.1 version. +* Updated TODO file with decisions from roadmap meeting. +* [Bug #803] Remove unused code +* [Bug #803] Change Zoom level in LimitingResources launches Validation exception +* [Bug #804] Fix bug +* [Bug #788] changes the structure and labels in resource load view. +* [Bug #808] Fix bug when a resource field in Resource search is selected for the first time, set 'Current selection' as name of that resource +* [Bug #785] fixes translations in company list. +* Added dependency with ttf-freefont on debian/control. +* [Bug #801] Fixed typo in Spanish translation. +* [Bug #785] Add improvements in companies list. +* [Bug #784] Sort results of add criterion combo in resource edition +* Reset the progressmeter to zero when the MonteCarlo chart is closed +* [Bug #800] Fix closable button in 'Calendar allocation' window +* [Bug #800] Fix closable button in 'Progress consolidation' window +* [Bug #800] Add closable button to 'Progress assignment' window +* [Bug #800] Add closable button to 'Project details' window +* Added a default "left" value for timetrackergap +* [Bug #782] Fix bug +* Fix asyncNotifications +* Fix the type parameter +* [Bug #779] Fix bug +* Avoid LazyInitializationException accessing template's labels +* [Bug #798] Refactor 'Remove Criterion' window, change it for a MessageBox window +* Changed the order Plotinfos are appended +* [Bug #795] Refactor calendar remove dialog box and change it to a MessageBox +* Deleted method used to adapt callbacks for older versions on Timelinez +* Fixed some bugs on DependencyComponent's widget-class +* Deleted native namespace +* Missing commit +* Added configuration property for using trendy molds +* Added a comment to explain why we are not using XulElement#setContext +* Replaced EventListener by XulElement#setContext +* Upgraded to ZK 5.0.5 +* Changed base widget-class for DependencyComponent +* Fixed bug on TaskComponent widget +* Adding a dependency is cancelled if you click anywhere that's not a task +* ESC keypress event is now handled +* Added initial implementation for Milestone widget +* Added missing ">" symbol at task-list mold +* Fixed bug on TaskComponent widget-class +* Added if-check to avoid exception caused by Milestone +* Fixed shrinked treecol on resource load view +* Changed the given id for TimeTracker at AdvancedAllocationController +* Recoded advanceAllocation Javascript file +* Added method to retrieve the TimeTracker's real width +* Added scrolling functionallity to TimeTracker's widget-class +* Added code to make TimeTracker's widget-class singleton +* Skeletal code for TimeTracker widget-class +* Explicitly set width to solve shrinking problems with chrome +* Fixed shrinked tables on labels tab +* Added missing closing symbol +* FEA: ItEr02S03MigracionZK5 Avoid uses of Mode#goToOrderMode that cause unnecessary repaintings +* Changed valing attribute to pack +* Replaced DOM methods with jQuery +* Fixed bug that caused Duplicated ID exception +* Fixed onflicts: ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java +* Missing commit +* Revert comments that prevented the use of timeplot +* Polished version of previous commit (load chart on demand) +* First approach for loading charts on demand +* Added named parameters for TaskComponent widget-events +* Added resize capabilities to tasks +* Fixed bug regarding Widget.addAft() function +* Merge branch 'master' into migration-to-ZK5-dev +* Added missing setClass method for TaskComponent widget-class +* Deleted deprecated code +* Ganttpanel changed to scroll on zoomlevel change +* Sent timetracker's scroll_left value when planner's zoom level changes +* Added a token for referencing elements on event data +* Replaced listener on zul code with listener on widget +* Delay the construction and data retrieval for the charts below the company view until they are actually shown. +* Updated timelinez version to 2.3.1_50 +* Added a scroll listener for LimitingResourcesPanel +* Overwritten getWidgetClass method for LimitingResourcesPanel +* Created LimitingResourcesPanel widget-class +* Explicitely added width attr for vbox at _orderElementTree +* Deleted useless Javascript dependencies +* Changed how the CSS class of a class is set +* Overwrote default setLeft method +* Added drag&drop functionallity +* Added missing methods for adding depencies +* Changed how we retrieve the DependencyList widget +* Added a z-index property to .box class +* Modified UnlinkedDependencyComponent and how it's inserted on the DOM +* Added singleton-like structure for DependencyList +* Added behaviour for consolidating a new depedency +* New isOverTask method +* Fixed method call at DependencyComponentBase +* Fixed typo on variable name +* Converted jQuery-Array-like to proper Array +* Test code for using UnlinkedDependencyComponent +* Done some changes to improve performance while adding dependencies +* Behaviour for UnlinkedDependencyComponent +* Added missing Math.abs(...) +* Added missing constant for DependencyComponentBase +* Moved setupArrow method to top class +* Basic implementation for UnlinkedDependencyComponent +* Created a base widget-class for dependency elements +* Added missing $supers call at overwrote method +* Fixed bug that caused and exception on empty Strings +* Adapted retrieveData to use JSONArray objects +* Added addRelatedDependency method for TaskComponent widget-class +* Added methods for drawing dependency arrows +* Added required constants for TaskComponent widget-class +* Added common.Common as a dependency for ganttz package +* Created a Common widget-class +* Overwrote appendChild method for DependencyList widget-class +* Fixed bug on TaskContainer mold +* Added a method for initializing commonly used properties at DependencyComponent widget-objecs +* Added missing mold content for DependencyList component +* Content for DependencyComponent mold +* Added $define property for DependencyComponent widget-class +* Added renderProperties method for DependencyComponent +* Added skeletal mold and widget-class for DependencyComponent +* Avoid adding Timeplot because it is failing. +* Replaced deprecated valign property +* Replaced deprecated valign property +* Added show/hideResourceTooltips methods +* Added hide/showAllTaskLabels methods +* Renamed method at TaskComponent widget-class +* Replaced deprecated LayoutRegion import +* Replaced deprecated propertie: valign +* Changed super-widget-class for TaskContainerComponent +* Mold content for TaskContainerComponent +* Skeletal mold and widget class for TaskContainerComponent +* Adapted css classes +* Added adjustResourceLoadRows for QueueListComponent +* QueueListComponent now extends XulElement +* Fixed typos +* Mold content for QueueListComponent +* Skeletal mold and widget-class for QueueListComponent +* Mold content for LimitingDependencyComponent +* Mold content for LimitingDependencyList +* Mold content for QueueComponent +* Basic widget-clasess and molds for Limitin Resources perspective +* Added adjustScrollableDimensions to Planner widget-class +* Refactored event listener from TaskList to GanttPannel +* Added method to ResourceLoadList +* Added event handler for scrolling +* Fixed bug on overwritted method +* Event handler for resize event +* Replaced Clients.evalJavascript argument +* Added recalculateTimeTrackerHeight +* Fixed typos +* Added class-methods setInstance and getIntance +* Added ResourceLoadList to WPD file for resourceload package +* Basic widget-class and mold for ResourceLoadList +* Changed inherited class for ResourceLoadList +* Mold content for ResourceLoadCompononent +* GanttPanel static-widget-instance is updated on each instantiation +* Replaced setStyle with render(...,"style",...) +* Replaced deprecated method +* Fix compiler error. +* Proper setup of zkforge dependencies +* Replaced deprecated interface import +* Basic widget-class and mold for ResourceLoadComponent +* Added widget and mold config for ResourceLoadComponent +* zk.wpd file for ganttz.resourceload package +* Fixed width for modal window +* Fixed typo on method name +* Enabled event thread +* Added directive +* Replaced Javascript sent to client +* Replaced jQuery by jq +* Fixed scroll handling for GanttPanel +* Added mold attribute to button component +* Added directive +* Added methods to TaskComponent widget-class +* Added method to TaskComponent widget-class +* Fixed bug on attribute setting +* Added method for displaying deadlines +* Set "trendy" mold for main buttons +* Added a trim method to adapt callback uri +* remove contextpath from callback uri +* Conf. maven for sources.jar +* Created widget-class for TaskComponent +* Created GanttPanel widget-class +* Added javascript dependencies for Ganttz +* Modified how Javascript dependencies are loaded +* Minor bug fixing +* Mold for TaskComponent +* Mold for TaskRow component +* Bugfix at TaskList mold +* Mold for GanttPanel comp. +* Mold for TaskList comp. +* Skeletal widgets for ganttz +* Upgraded timelinez version +* Conf. Maven for sources.jar +* Upgraded timeplot package +* Changed South import +* Added throws statements +* Added throws statement +* Added throws statement +* Removed deprecated method getRealStyle +* Upgrading TaskComponent to ZK 5 +* Upgraded TimeTrackerComponent to ZK 5 +* Upgrade ZK version to 5.0.3 + Version 1.1.3 (12 Aug 2011) --------------------------- @@ -11,12 +1370,18 @@ screen for big projects using labels. Under some special conditions not all the labels were loaded and the persistence to disk failed. Other minor fixes included in this version: + * Task Scheduling Status In Project report has been reviewed and fixed. -* Now LibrePlan does not depend on server language for translations of strings + +* Now NavalPlan does not depend on server language for translations of strings in the business module. + * Resource load chart is fixed for tasks finishing in the middle of a day. + * Solved issue on Gantt saving due to transient resource allocations. + * Added some basic constraints checkers to exception days and progress type. + * New log file to register login attempts. Changes @@ -185,7 +1550,7 @@ Changes Version 1.1.0 (19 May 2011) --------------------------- -New major version of LibrePlan. Apart from a lot of bugfixing the main features +New major version of NavalPlan. Apart from a lot of bugfixing the main features included in this version are: * Fixed problem with WebKit based browsers. @@ -217,7 +1582,7 @@ included in this version are: * Hierarchical criteria enforced. - Criteria in LibrePlan are like dynamic roles that resources can satisfy and + Criteria in NavalPlan are like dynamic roles that resources can satisfy and can be hierarchical. This means that one general criterion can include other more specific criteria inside. For instance, it is possible to configure the general criterion Engineer with two children like Electric Engineer and @@ -230,7 +1595,7 @@ included in this version are: Generic allocation is the assignment based on criteria. You specify the set of criteria which must be satisfied by the workers who are able to do the - task and, after this, LibrePlan looks for them and selects the ones less + task and, after this, NavalPlan looks for them and selects the ones less loaded to be planned. The algorithm which selects the workers to be assigned to a task when @@ -268,7 +1633,7 @@ included in this version are: * admin/admin. This user is the user with administration privileges. * user/user. This is a common user without administration privileges. * wswriter/wswriter. This user has write permissions to use then web - services operations which require modify or insert data in LibrePlan. + services operations which require modify or insert data in NavalPlan. * wsreader/wsreader. This user has read permissions to the use web services operations which only require read permissions. @@ -309,7 +1674,7 @@ Notes If you are upgrading from any 1.0.x verion, you will need to manually execute on your database the SQL sentences from file: -``/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.1.0`` +``/usr/share/dbconfig-common/data/navalplan/upgrade/pgsql/1.1.0`` To get database access information review ``/etc/tomcat6/context.xml`` file. @@ -816,7 +2181,7 @@ Changes * [Bug #898] Add column criterion type (worker or machine) in criterion types list. * [Bug #924] Call method useSchedulingDataFor for each order. -* LibrePlan exercises for formation course in Spanish in reStructuredText. +* NavalPlan exercises for formation course in Spanish in reStructuredText. * [doc] Added more sections to use case development guide. * [Bug #884] Show progress measurements list in reverse order. * [Bug #884] Sort progress measurements list in reverse order. @@ -837,7 +2202,7 @@ Changes * [i18n] Updated translations. * [Bug #910] Change string 'Type resource assignation' to 'Resource allocation type' -* LibrePlan formation manual in spanish in reStructuredText. +* NavalPlan formation manual in spanish in reStructuredText. * [doc] Added information about interface in use case development guide. * [Bug #892] Rename labels in 'Overall progress' * [doc] Use case development guide. @@ -883,7 +2248,7 @@ Changes hoursWorkedPerWorkerReport.jrxml. * Training material update * [doc] Added info about model and extract database data to report guide. -* [doc] First version of basic tutorial to create a new report on LibrePlan. +* [doc] First version of basic tutorial to create a new report on NavalPlan. * Added comment in main pom.xml to mark the point where bundle folders for reports are specified. * Give more priority to the resources already picked @@ -922,7 +2287,7 @@ Changes * Apply validation annotation to the field * [Bug #871] The problem is due to receiving an empty list of tasks * [Bug #865] Fix bug -* [Bug #870] LibrePlan appears in English if browser is configured with es-es +* [Bug #870] NavalPlan appears in English if browser is configured with es-es * Fix bug create or edit resource should start on first tab * [Bug #864] S-curve changes the end date of a task * [Bug #868] It does not update the row of the order element correctly @@ -1064,7 +2429,7 @@ Changes * Make canWork rely on Capacity data * Use Capacity in BaseCalendar * Make consufing method private -* Updated LibrePlan license headers to 2011. +* Updated NavalPlan license headers to 2011. * Refactored components allocation_search and allocation_search_component * Added Resource.getCaptionFor() * Replaced method IResourceSearchModel.byLimiting(boolean) with .byResourceType @@ -1217,7 +2582,7 @@ Changes Version 1.0.5 (8 Apr 2011) -------------------------- -Last bugfixing version of LibrePlan for 1.0.x cycle, like in previous releases +Last bugfixing version of NavalPlan for 1.0.x cycle, like in previous releases it includes all the fixes done in the stable branch since 1.0.4. Among them we would like to highlight: @@ -1305,7 +2670,7 @@ Changes Version 1.0.4 (17 Mar 2011) --------------------------- -A new bugfixing version of LibrePlan, including a lot of bugs fixed during this +A new bugfixing version of NavalPlan, including a lot of bugs fixed during this month. * Resolved some stability problems appearing under certain circumstances. @@ -1368,7 +2733,7 @@ Changes * [Bug #898] Add column criterion type (worker or machine) in criterion types list. * [Bug #924] Call method useSchedulingDataFor for each order. -* LibrePlan exercises for formation course in Spanish in reStructuredText. +* NavalPlan exercises for formation course in Spanish in reStructuredText. * [Bug #884] Show progress measurements list in reverse order. * [Bug #884] Sort progress measurements list in reverse order. * [Bug #854] fix the labels in workingProgressPerTask report @@ -1388,7 +2753,7 @@ Changes * [i18n] Updated translations. * [Bug #910] Change string 'Type resource assignation' to 'Resource allocation type' -* LibrePlan formation manual in spanish in reStructuredText. +* NavalPlan formation manual in spanish in reStructuredText. * [Bug #892] Rename labels in 'Overall progress' * [Bug #903] Fix regression: creating a gap out of a LocalDate caused tasks may overlap due to loose of information about hour @@ -1444,7 +2809,7 @@ Changes * [Bug #855] Fix bug * Apply validation annotation to the field * [Bug #871] The problem is due to receiving an empty list of tasks -* [Bug #870] LibrePlan appears in English if browser is configured with es-es +* [Bug #870] NavalPlan appears in English if browser is configured with es-es * Fix bug create or edit resource should start on first tab * [Bug #864] S-curve changes the end date of a task * [Bug #868] It does not update the row of the order element correctly @@ -1568,7 +2933,7 @@ Notes If you are upgrading from any 1.0.x verion, you will need to manually execute on your database the SQL sentences from file: -``/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.0.0`` +``/usr/share/dbconfig-common/data/navalplan/upgrade/pgsql/1.0.0`` To get database access information review ``/etc/tomcat6/context.xml`` file. @@ -1638,7 +3003,7 @@ Changes Version 1.0.0 (07 Jan 2011) --------------------------- -This is the first stable release of *LibrePlan*, a free software web +This is the first stable release of *NavalPlan*, a free software web application for project management. Main features @@ -1653,7 +3018,7 @@ Main features * Overload resource allocation control. * Earned Value Management (EVM). * Cost analysis based on work reports. -* Integration with other *LibrePlan* instances and third-parties. +* Integration with other *NavalPlan* instances and third-parties. * Other functionalities: materials, quality forms, project templates, planning scenarios, multiple task progress measurement ... diff --git a/README b/README index e8a365c39..215034dae 100644 --- a/README +++ b/README @@ -5,32 +5,84 @@ LibrePlan Description ----------- -*LibrePlan* is a free software web application for project management. +*LibrePlan* is a free software web application for project management, +monitoring and control. -*LibrePlan* is a planning tool for users based on some concepts: company and -multi-project overview, criteria assignments, tasks tagging, resources -management, resource allocation (specific and generic), company load control, -external integration, etc. +*LibrePlan* is a collaborative tool to plan, monitor and control projects and +has a rich web interface which provides a desktop alike user experience. All the +team members can take part in the planning and this makes possible to have a +real-time planning. + +It was designed thinking on a scenario where multiple projects and resources +interact to carry out the work inside a company. Besides, it makes possible +the communication with other company tools providing a wide set of web +services to import and export data. -Although its name is clearly related to shipbuilding, *LibrePlan* is a fully -useful planning tool for any type of company whose workflow requires project and -order administration and scheduling. Features ~~~~~~~~ -* Multiproject management. It offers a global vision of the company managing - several projects sharing resources. -* Group resource allocations: dynamic groups based on criteria. -* Flexible calendars. -* Configurable Gantt chart from Work Breakdown Structure (WBS) [1]_. -* Resource Breakdown Structure (RBS) chart [2]_. -* Overload resource allocation control. -* Earned Value Management [3]_. -* Cost analysis based on work reports. -* Integration with other *LibrePlan* instances and third-parties. -* Other functionalities: Materials, quality forms, project templates, planning - scenarios, multiple task progress measurement ... +* Resource management: + + * Two type of resources: machines and workers. + * Flexible calendars easily reusable. + * Resource configuration based on skills and roles. + +* Planning: + + * Simple way to configure and estimate the work to plan. It is carried out + through Work Breakdown Structures (WBS) [1]_. + * Different detail levels during the planning. + * Two ways to allocate resources: + + * Specific allocation: Concrete individuals. + * Assisted generic allocation: Based on skills and roles fulfilled by the + resources. + + * Templates to reuse work. Projects can be created based on templates for + repeatable tasks being able to save time. + + * Automatic resource reallocation in order to minimize overload (overtime). + + * Advanced allocation. Manual configuration of daily work hours on a task + when automatic allocation does not suit your needs. + + * Monte Carlo method. Statistical simulation to calculate the possibility to + complete a project in a range of dates. + +* Projects control and monitoring: + + * Company global analysis. + + * Earned Value Management [2]_. Project management method to objectively + measure progress and performance of a project. + + * Planning quality management. It is possible to control quality of the tasks + to be performed through forms. + + * Projects cost analysis. + + * Reported hours: worked hours are assigned to each task to track costs during + the planning + + * Progress measurement through different unit types. + +* Outsourcing + + LibrePlan provides support for companies that do outsourcing: + + * Project tasks can be outsourced and sent to the LibrePlan installation of + the supplier. + + * You can receive progress notifications of the subcontractors to know how + outsourced tasks are evolving . + +* Other features: + + * Materials. You can manage the materials that planned tasks need to be + carried out. + + * Complete users system with permissions, LDAP authentication, etc. Requirements @@ -74,17 +126,17 @@ Availability ------------ The cutting-edge version of this project is always available from the Git -repository at http://libreplan.git.sourceforge.net/. +repository at http://navalplan.git.sourceforge.net/. Released versions are available at -http://sourceforge.net/projects/libreplan/files. +http://sourceforge.net/projects/navalplan/files. Webpage ------- You can find more information about *LibrePlan* at -http://www.libreplan.org/en/. +http://www.libreplan.com/. For information related with *LibrePlan* development you can visit the wiki at http://wiki.libreplan.org/. @@ -100,7 +152,7 @@ License ------- *LibrePlan* is released under the terms of the GNU Affero General Public -License version 3 [4]_. +License version 3 [3]_. Please read the ``COPYING`` file for details. @@ -109,14 +161,13 @@ Authors ------- This project is sponsored by *Fundación para o Fomento da Calidade Industrial e -o Desenvolvemento Tecnolóxico de Galicia* [5]_. +o Desenvolvemento Tecnolóxico de Galicia* [4]_. Please see ``AUTHORS`` file for more information about the authors. .. [1] http://en.wikipedia.org/wiki/Work_Breakdown_Structure -.. [2] http://en.wikipedia.org/wiki/Resource_Breakdown_Structure -.. [3] http://en.wikipedia.org/wiki/Earned_Value_Management -.. [4] http://www.fsf.org/licensing/licenses/agpl.html -.. [5] http://www.fundacioncalidade.org/ +.. [2] http://en.wikipedia.org/wiki/Earned_Value_Management +.. [3] http://www.fsf.org/licensing/licenses/agpl.html +.. [4] http://www.fundacioncalidade.org/ diff --git a/UPDATE b/UPDATE index 7c98a8fa2..4364280f6 100644 --- a/UPDATE +++ b/UPDATE @@ -26,11 +26,11 @@ Instructions: * Download the new package:: - $ wget http://downloads.sourceforge.net/project/libreplan/LibrePlan/libreplan_1.1.1-1_amd64.deb + $ wget http://downloads.sourceforge.net/project/navalplan/NavalPlan/navalplan_1.1.1-1_amd64.deb * Install package:: - # dpkg -i libreplan_1.1.1-1_amd64.deb + # dpkg -i navalplan_1.1.1-1_amd64.deb * Install new dependencies if needed:: @@ -51,7 +51,7 @@ Debian/Ubuntu are upgrading from *LibrePlan 1.0.4* to *LibrePlan 1.1.1* you should download ``upgrade_1.1.0.sql``:: - $ wget http://downloads.sourceforge.net/project/libreplan/LibrePlan/upgrade_1.1.0.sql + $ wget http://downloads.sourceforge.net/project/navalplan/NavalPlan/upgrade_1.1.0.sql * Upgrade database:: @@ -59,7 +59,7 @@ Debian/Ubuntu * Download ``.war`` file of new version from SourceForge.net:: - $ wget -O libreplan.war http://downloads.sourceforge.net/project/libreplan/LibrePlan/libreplan_1.1.1.war + $ wget -O libreplan.war http://downloads.sourceforge.net/project/navalplan/NavalPlan/navalplan_1.1.1.war * Backup current deployed application:: @@ -87,7 +87,7 @@ openSUSE are upgrading from *LibrePlan 1.0.4* to *LibrePlan 1.1.1* you should download ``upgrade_1.1.0.sql``:: - $ wget http://downloads.sourceforge.net/project/libreplan/LibrePlan/upgrade_1.1.0.sql + $ wget http://downloads.sourceforge.net/project/navalplan/NavalPlan/upgrade_1.1.0.sql * Upgrade database:: @@ -95,7 +95,7 @@ openSUSE * Download ``.war`` file of new version from SourceForge.net:: - $ wget -O libreplan.war http://downloads.sourceforge.net/project/libreplan/LibrePlan/libreplan_1.1.1.war + $ wget -O libreplan.war http://downloads.sourceforge.net/project/navalplan/NavalPlan/navalplan_1.1.1.war * Backup current deployed application:: diff --git a/debian/changelog b/debian/changelog index c6ccdc5eb..f2c9f891e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,12 @@ -libreplan (1.1.3-1) maverick; urgency=low +libreplan (1.2.0-1) maverick; urgency=low + + * Released LibrePlan 1.2.0 + * Created a transitional package navalplan-1.2.0-1 in order to ease the + migration from NavalPlan 1.1 to LibrePlan 1.2 + + -- Manuel Rego Casasnovas Thu, 01 Dec 2011 16:40:00 +0100 + +navalplan (1.1.3-1) maverick; urgency=low * Fixed important issue in Gantt view for big projects with labels. * Added bugs fixed from stable branch. @@ -6,7 +14,7 @@ libreplan (1.1.3-1) maverick; urgency=low -- Manuel Rego Casasnovas Fri, 12 Aug 2011 13:08:00 +0200 -libreplan (1.1.2-1) maverick; urgency=low +navalplan (1.1.2-1) maverick; urgency=low * Fixed critical bug that causes concurrency issues editing projects with labels. @@ -15,7 +23,7 @@ libreplan (1.1.2-1) maverick; urgency=low -- Manuel Rego Casasnovas Wed, 18 Jul 2011 13:23:00 +0200 -libreplan (1.1.1-1) maverick; urgency=low +navalplan (1.1.1-1) maverick; urgency=low * Changed dependency from OpenJDK to default-jdk or default-jre. * Added bugs fixed from stable branch. @@ -23,7 +31,7 @@ libreplan (1.1.1-1) maverick; urgency=low -- Manuel Rego Casasnovas Wed, 07 Jun 2011 09:15:00 +0200 -libreplan (1.1.0-1) maverick; urgency=low +navalplan (1.1.0-1) maverick; urgency=low * Removed unnecessary dependency with texlive-latex-recommended and pgf packages. @@ -33,35 +41,35 @@ libreplan (1.1.0-1) maverick; urgency=low -- Manuel Rego Casasnovas Wed, 19 Apr 2011 07:50:00 +0200 -libreplan (1.0.6-1) maverick; urgency=low +navalplan (1.0.6-1) maverick; urgency=low * Several important bugs fixed during 1.1 stabilization. * Released version 1.0.6. -- Manuel Rego Casasnovas Tue, 27 Apr 2011 11:49:00 +0200 -libreplan (1.0.5-1) maverick; urgency=low +navalplan (1.0.5-1) maverick; urgency=low * Added bugs fixed from stable branch. * Released version 1.0.5. -- Manuel Rego Casasnovas Fri, 08 Apr 2011 11:20:46 +0200 -libreplan (1.0.4-1) maverick; urgency=low +navalplan (1.0.4-1) maverick; urgency=low * Added bugs fixed from stable branch. * Released version 1.0.4. -- Manuel Rego Casasnovas Thu, 17 Mar 2011 12:27:47 +0100 -libreplan (1.0.3-1) maverick; urgency=low +navalplan (1.0.3-1) maverick; urgency=low * Added bugs fixed from stable branch. * Released version 1.0.3. -- Manuel Rego Casasnovas Mon, 14 Feb 2011 07:23:58 +0100 -libreplan (1.0.2-1) maverick; urgency=low +navalplan (1.0.2-1) maverick; urgency=low * Fixed database installation script. * Added bugfixed from stable branch. @@ -69,7 +77,7 @@ libreplan (1.0.2-1) maverick; urgency=low -- Manuel Rego Casasnovas Fri, 21 Jan 2011 12:07:33 +0100 -libreplan (1.0.1-1) maverick; urgency=low +navalplan (1.0.1-1) maverick; urgency=low * Added dependency with ttf-freefont on Debian package (needed for Jasper reports). @@ -78,7 +86,7 @@ libreplan (1.0.1-1) maverick; urgency=low -- Manuel Rego Casasnovas Fri, 14 Jan 2011 09:58:33 +0100 -libreplan (1.0.0-1) maverick; urgency=low +navalplan (1.0.0-1) maverick; urgency=low * Updated to upstream. Released version 1.0. * Added upgrade script needed to upgrade to version 1.0. @@ -86,33 +94,33 @@ libreplan (1.0.0-1) maverick; urgency=low -- Manuel Rego Casasnovas Tue, 07 Jan 2011 16:45:00 +0100 -libreplan (0.9.2-3) maverick; urgency=low +navalplan (0.9.2-3) maverick; urgency=low * Added missing postgresql dependency. -- Manuel Rego Casasnovas Tue, 07 Jan 2011 10:00:00 +0100 -libreplan (0.9.2-2) maverick; urgency=low +navalplan (0.9.2-2) maverick; urgency=low * Added postgresql-client dependency needed because of dbconfig. -- Manuel Rego Casasnovas Tue, 05 Jan 2011 16:12:00 +0100 -libreplan (0.9.2-1) maverick; urgency=low +navalplan (0.9.2-1) maverick; urgency=low * Updated to upstream. * Fixed issues on debian package. -- Manuel Rego Casasnovas Tue, 04 Jan 2011 15:58:19 +0100 -libreplan (0.9.1) maverick; urgency=low +navalplan (0.9.1) maverick; urgency=low * Updated to upstream. * Fixed problems with translations. -- Manuel Rego Casasnovas Thu, 23 Dec 2010 00:14:54 +0100 -libreplan (0.9.0) maverick; urgency=low +navalplan (0.9.0) maverick; urgency=low * Updated to upstream. * Fixed issues with context.xml file. @@ -121,19 +129,19 @@ libreplan (0.9.0) maverick; urgency=low -- Manuel Rego Casasnovas Tue, 21 Dec 2010 17:31:08 +0100 -libreplan (20100908) lucid; urgency=low +navalplan (20100908) lucid; urgency=low * Updated to upstream. -- Jose Maria Casanova Crespo (Chema) Wed, 8 Sep 2010 00:00:00 +0000 -libreplan (20100415) karmic; urgency=low +navalplan (20100415) karmic; urgency=low * Updated to upstream. -- Jose Maria Casanova Crespo (Chema) Thu, 15 Mar 2010 14:30:00 +0000 -libreplan (20100324) karmic; urgency=low +navalplan (20100324) karmic; urgency=low * Initial release. diff --git a/debian/control b/debian/control index 033c1eff6..b49b8bbe7 100644 --- a/debian/control +++ b/debian/control @@ -5,19 +5,32 @@ Maintainer: Adrian Perez Build-Depends: debhelper (>= 7.0.50), maven2, python-docutils, gettext (>= 0.17), default-jdk Standards-Version: 3.8.4 -Homepage: http://www.libreplan.org/en/ +Homepage: http://www.libreplan.com/ Package: libreplan Architecture: any Depends: cutycapt, postgresql, postgresql-client, xvfb, dbconfig-common, ucf, tomcat6, default-jre-headless | default-jre, libpg-java, ttf-freefont, ${misc:Depends} -Description: Web application for project management. - LibrePlan is a planning tool for users based on some concepts: company and +Description: Web application for project planning, monitoring and control. + LibrePlan is a collaborative tool to plan, monitor and control projects and has + a rich web interface which provides a desktop alike user experience. All the + team members can take part in the planning and this makes possible to have a + real-time planning. + . + It was designed thinking on a scenario where multiple projects and resources + interact to carry out the work inside a company. Besides, it makes possible + the communication with other company tools providing a wide set of web + services to import and export data. + +Package: navalplan +Architecture: all +Pre-Depends: libreplan (>= 1.2.0-1) +Depends: ${misc:Depends} +Description: Web application for project management (transitional package) + NavalPlan is a planning tool for users based on some concepts: company and multi-project overview, criteria assignments, tasks tagging, resources management, resource allocation (specific and generic), company load control, external integration, etc. . - Although its name is clearly related to shipbuilding, LibrePlan is a fully - useful planning tool for any type of company whose workflow requires project - and order administration and scheduling. + This package can be safely deleted after Libreplan is successfully installed. diff --git a/debian/control.lucid b/debian/control.lucid index ed05b300c..3f9f791bb 100644 --- a/debian/control.lucid +++ b/debian/control.lucid @@ -3,21 +3,34 @@ Section: web Priority: optional Maintainer: Adrian Perez Build-Depends: debhelper (>= 7.0.50), maven2, python-docutils, - gettext (>= 0.17), texlive-latex-recommended, pgf, openjdk-6-jdk + gettext (>= 0.17), openjdk-6-jdk Standards-Version: 3.8.4 -Homepage: http://www.libreplan.org/en/ +Homepage: http://www.libreplan.com/ Package: libreplan Architecture: any Depends: cutycapt, postgresql, postgresql-client, xvfb, dbconfig-common, ucf, tomcat6, openjdk-6-jre-headless | openjdk-6-jre, libpg-java, ttf-freefont, ${misc:Depends} -Description: Web application for project management. - LibrePlan is a planning tool for users based on some concepts: company and +Description: Web application for project planning, monitoring and control. + LibrePlan is a collaborative tool to plan, monitor and control projects and has + a rich web interface which provides a desktop alike user experience. All the + team members can take part in the planning and this makes possible to have a + real-time planning. + . + It was designed thinking on a scenario where multiple projects and resources + interact to carry out the work inside a company. Besides, it makes possible + the communication with other company tools providing a wide set of web + services to import and export data. + +Package: navalplan +Architecture: all +Pre-Depends: libreplan (>= 1.2.0-1) +Depends: ${misc:Depends} +Description: Web application for project management (transitional package) + NavalPlan is a planning tool for users based on some concepts: company and multi-project overview, criteria assignments, tasks tagging, resources management, resource allocation (specific and generic), company load control, external integration, etc. . - Although its name is clearly related to shipbuilding, LibrePlan is a fully - useful planning tool for any type of company whose workflow requires project - and order administration and scheduling. + This package can be safely deleted after Libreplan is successfully installed. diff --git a/debian/control.squeeze b/debian/control.squeeze index ed05b300c..3f9f791bb 100644 --- a/debian/control.squeeze +++ b/debian/control.squeeze @@ -3,21 +3,34 @@ Section: web Priority: optional Maintainer: Adrian Perez Build-Depends: debhelper (>= 7.0.50), maven2, python-docutils, - gettext (>= 0.17), texlive-latex-recommended, pgf, openjdk-6-jdk + gettext (>= 0.17), openjdk-6-jdk Standards-Version: 3.8.4 -Homepage: http://www.libreplan.org/en/ +Homepage: http://www.libreplan.com/ Package: libreplan Architecture: any Depends: cutycapt, postgresql, postgresql-client, xvfb, dbconfig-common, ucf, tomcat6, openjdk-6-jre-headless | openjdk-6-jre, libpg-java, ttf-freefont, ${misc:Depends} -Description: Web application for project management. - LibrePlan is a planning tool for users based on some concepts: company and +Description: Web application for project planning, monitoring and control. + LibrePlan is a collaborative tool to plan, monitor and control projects and has + a rich web interface which provides a desktop alike user experience. All the + team members can take part in the planning and this makes possible to have a + real-time planning. + . + It was designed thinking on a scenario where multiple projects and resources + interact to carry out the work inside a company. Besides, it makes possible + the communication with other company tools providing a wide set of web + services to import and export data. + +Package: navalplan +Architecture: all +Pre-Depends: libreplan (>= 1.2.0-1) +Depends: ${misc:Depends} +Description: Web application for project management (transitional package) + NavalPlan is a planning tool for users based on some concepts: company and multi-project overview, criteria assignments, tasks tagging, resources management, resource allocation (specific and generic), company load control, external integration, etc. . - Although its name is clearly related to shipbuilding, LibrePlan is a fully - useful planning tool for any type of company whose workflow requires project - and order administration and scheduling. + This package can be safely deleted after Libreplan is successfully installed. diff --git a/debian/libreplan.install b/debian/libreplan.install index eb250a244..96d84a98c 100644 --- a/debian/libreplan.install +++ b/debian/libreplan.install @@ -3,4 +3,4 @@ debian/tmp/etc/tomcat6/policy.d/51libreplan.policy debian/tmp/usr/share/dbconfig-common/data/libreplan/install/pgsql debian/tmp/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.0.0 debian/tmp/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.1.0 -debian/tmp/usr/share/tomcat6/lib/postgresql-jdbc3.jar +debian/tmp/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.2.0 diff --git a/debian/libreplan.postinst b/debian/libreplan.postinst index b4bc4d563..ebf1c6100 100644 --- a/debian/libreplan.postinst +++ b/debian/libreplan.postinst @@ -68,6 +68,9 @@ then fi +if [ ! -L /usr/share/tomcat6/lib/postgresql-jdbc3.jar ] ; then + ln -sf /usr/share/java/postgresql-jdbc3.jar /usr/share/tomcat6/lib/ +fi if [ -x /etc/init.d/tomcat6 ] ; then if [ -x "$(which invoke-rc.d 2> /dev/null)" ] ; then diff --git a/debian/navalplan.postinst b/debian/navalplan.postinst new file mode 100755 index 000000000..d8e8592e3 --- /dev/null +++ b/debian/navalplan.postinst @@ -0,0 +1,26 @@ +#! /bin/bash + +if [[ $1 = configure ]] +then + # Remove old deployment directory as it's no longer necessary. + if [ -d /var/lib/tomcat6/webapps/navalplan/ ] ; then + rm -r /var/lib/tomcat6/webapps/navalplan/ + fi + + # Make sure the driver is there, as it might be removed when + # uninstalling older versions of the package. + if [ ! -L /usr/share/tomcat6/lib/postgresql-jdbc3.jar ] ; then + ln -sf /usr/share/java/postgresql-jdbc3.jar /usr/share/tomcat6/lib/ + fi + + # Start tomcat again + if [ -x /etc/init.d/tomcat6 ] ; then + if [ -x "$(which invoke-rc.d 2> /dev/null)" ] ; then + invoke-rc.d tomcat6 start + else + /etc/init.d/tomcat6 start + fi + fi + +fi +#DEBHELPER# diff --git a/debian/navalplan.preinst b/debian/navalplan.preinst new file mode 100755 index 000000000..b2388468f --- /dev/null +++ b/debian/navalplan.preinst @@ -0,0 +1,95 @@ +#! /bin/bash + +base_dbconfig_data_dir="/usr/share/dbconfig-common/data" + +install_upgrade_to() { + upgrade_file="$base_dbconfig_data_dir/libreplan/upgrade/pgsql/$1" + echo "Applying SQL statements to upgrade to version $1..." + push_sql_from_file_as_user $upgrade_file $navalplan_user $navalplan_db +} + +push_sql_from_file_as_user() { + filepath=$1 + username=$2 + database=$3 + psql -U $username -h $database_host \ + $database < $filepath > /dev/null 2>&1 +} + +execute_sql_as_admin() { + sql=$1 + su - -s /bin/sh $navalplan_admin_user -c "psql -c \"$sql\"" > /dev/null +} + +if [[ $1 = upgrade && -r /etc/dbconfig-common/libreplan.conf + && -r /etc/dbconfig-common/navalplan.conf ]] +then + old_version=$2 + + . /etc/dbconfig-common/libreplan.conf + libreplan_user=${dbc_dbuser} + libreplan_passwd=${dbc_dbpass} + libreplan_db=${dbc_dbname} + + . /etc/dbconfig-common/navalplan.conf + navalplan_user=${dbc_dbuser} + navalplan_passwd=${dbc_dbpass} + navalplan_db=${dbc_dbname} + navalplan_admin_user=${dbc_dbadmin} + + if [ -z "${dbc_dbhost}" ] ; then + database_host='localhost' + else + database_host=${dbc_dbhost} + fi + + export PGPASSFILE=`mktemp` + chmod 600 $PGPASSFILE + + old_db_dump=`mktemp` + chown $navalplan_admin_user:root $old_db_dump; + chmod 660 $old_db_dump; + + # Stop tomcat to flush active connections. + if [ -x /etc/init.d/tomcat6 ] ; then + if [ -x "$(which invoke-rc.d 2> /dev/null)" ] ; then + invoke-rc.d tomcat6 stop + else + /etc/init.d/tomcat6 stop + fi + fi + + echo "Dropping newly created empty database..."; + execute_sql_as_admin "DROP DATABASE $libreplan_db;" + + echo "Trying to apply upgrades to old database..." + + echo "*:*:*:*:$navalplan_passwd" > $PGPASSFILE + + dpkg --compare-versions $old_version "<<" "1.0.0-1" + if [ $? -eq 0 ]; then + install_upgrade_to "1.0.0" + fi + dpkg --compare-versions $old_version "<<" "1.1.0-1" + if [ $? -eq 0 ]; then + install_upgrade_to "1.1.0" + fi + dpkg --compare-versions $old_version "<<" "1.2.0-1" + if [ $? -eq 0 ]; then + install_upgrade_to "1.2.0" + fi + + echo "Dumping old database..." + su - -s /bin/sh $navalplan_admin_user -c "pg_dump $navalplan_db >> $old_db_dump" > /dev/null + + echo "Creating and populating new database..."; + execute_sql_as_admin "CREATE DATABASE $libreplan_db;" + execute_sql_as_admin "GRANT ALL PRIVILEGES ON DATABASE $libreplan_db TO $libreplan_user;" + execute_sql_as_admin "ALTER DATABASE $libreplan_db OWNER TO $libreplan_user;" + echo "*:*:*:*:$libreplan_passwd" > $PGPASSFILE + push_sql_from_file_as_user $old_db_dump $libreplan_user $libreplan_db + + rm $PGPASSFILE $old_db_dump + +fi +#DEBHELPER# diff --git a/debian/rules b/debian/rules index f5c040518..f08cc3c9a 100755 --- a/debian/rules +++ b/debian/rules @@ -81,13 +81,16 @@ install: # Copy SQL upgrade script for version 1.1.0 $(call CMD,cp $(CURDIR)/scripts/database/upgrade_1.1.0.sql \ $(CURDIR)/debian/tmp/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.1.0) + # Copy SQL upgrade script for version 1.2.0 + $(call CMD,cp $(CURDIR)/scripts/database/upgrade_1.2.0.sql \ + $(CURDIR)/debian/tmp/usr/share/dbconfig-common/data/libreplan/upgrade/pgsql/1.2.0) # Install Policy file $(call CMD,mkdir -p $(CURDIR)/debian/tmp/etc/tomcat6/policy.d) $(call CMD,cp $(CURDIR)/debian/51libreplan.policy \ $(CURDIR)/debian/tmp/etc/tomcat6/policy.d/) # Link Java PostgreSQL library - $(call CMD,mkdir -p $(CURDIR)/debian/tmp/usr/share/tomcat6/lib) - $(call CMD,ln -sf /usr/share/java/postgresql-jdbc3.jar $(CURDIR)/debian/tmp/usr/share/tomcat6/lib) + #$(call CMD,mkdir -p $(CURDIR)/debian/tmp/usr/share/tomcat6/lib) + #$(call CMD,ln -sf /usr/share/java/postgresql-jdbc3.jar $(CURDIR)/debian/tmp/usr/share/tomcat6/lib) $(call CMD,dh_install) binary-indep: build install diff --git a/doc/src/technical/howto-create-a-new-report-in-libreplan.rst b/doc/src/technical/howto-create-a-new-report-in-libreplan.rst index 9686d4d18..076dd7163 100644 --- a/doc/src/technical/howto-create-a-new-report-in-libreplan.rst +++ b/doc/src/technical/howto-create-a-new-report-in-libreplan.rst @@ -44,9 +44,9 @@ work as ``.zul`` page still does not exist. If you want to run LibrePlan in development mode you need to follow the next instructions: - * Create a PostgreSQL database called ``navaldev`` with permissions for a - user ``naval`` with password ``naval`` (see ``INSTALL`` file for other - databases and more info). + * Create a PostgreSQL database called ``libreplandev`` with permissions for a + user ``libreplan`` with password ``libreplan`` (see ``INSTALL`` file for + other databases and more info). * Compile LibrePlan with the following command from project root folder:: diff --git a/doc/src/technical/howto-develop-a-use-case-in-libreplan.rst b/doc/src/technical/howto-develop-a-use-case-in-libreplan.rst index 771bc35fa..153bc9877 100644 --- a/doc/src/technical/howto-develop-a-use-case-in-libreplan.rst +++ b/doc/src/technical/howto-develop-a-use-case-in-libreplan.rst @@ -82,9 +82,9 @@ this behaviour and use it in all the tasks they want. If you want to run LibrePlan in development mode you need to follow the next instructions: - * Create a PostgreSQL database called ``navaldev`` with permissions for a - user ``naval`` with password ``naval`` (see ``HACKING`` file for other - databases and more info). + * Create a PostgreSQL database called ``libreplandev`` with permissions for a + user ``libreplan`` with password ``libreplan`` (see ``HACKING`` file for + other databases and more info). * Compile LibrePlan with the following command from project root folder:: @@ -2637,7 +2637,7 @@ developing new web services. For each web service, some test scripts are provided in order to check implementation. -.. _LibrePlan: http://www.libreplan.org/en/ +.. _LibrePlan: http://www.libreplan.com/ .. _CRUD: http://en.wikipedia.org/wiki/Create,_read,_update_and_delete .. _Hibernate: http://www.hibernate.org/ .. _`Optimistic Locking`: http://en.wikipedia.org/wiki/Optimistic_locking diff --git a/doc/src/technical/howto-install-libreplan.txt b/doc/src/technical/howto-install-libreplan.txt index 877ff6d5e..b5dd3b010 100644 --- a/doc/src/technical/howto-install-libreplan.txt +++ b/doc/src/technical/howto-install-libreplan.txt @@ -5,9 +5,9 @@ $ sudo apt-get install postgresql $ sudo su -c "psql" postgres <----------------- Executar os seguintes comandos SQL ---------- -create database navaldev; -create user naval with password 'naval'; -grant all privileges on database navaldev to naval; +create database libreplandev; +create user libreplan with password 'libreplan'; +grant all privileges on database libreplandev to libreplan; \q ------------------------------------------------------------------ @@ -40,9 +40,9 @@ para permitir o acceso a base de datos + url="jdbc:postgresql://localhost/libreplandev"/> ... ---------------------- --------------------------------------- @@ -96,4 +96,4 @@ Neste intre a aplicación debería estar accesible en : http://localhost:8080/li ------------------------------------------------------------------------ Se quixeramos facer un volcado da base de datos so precisariamos empregar o seguinte comando, isto non é necesario para a instalación. -$ pg_dump -h localhost -U naval -c -F p -v -f bdxestionproducion.dump navaldev +$ pg_dump -h localhost -U libreplan -c -F p -v -f bdxestionproducion.dump libreplandev diff --git a/doc/src/user/en/01-introducion.rst b/doc/src/user/en/01-introducion.rst index 1c8cd612d..f675b06b7 100644 --- a/doc/src/user/en/01-introducion.rst +++ b/doc/src/user/en/01-introducion.rst @@ -6,7 +6,7 @@ Introduction The purpose of this document is to describe the features of LibrePlan and provide user information on how to configure and use the application. LibrePlan is an opensource web application for project planning. Its main goal is to provide a complete solution for company project management. -For any specific information you may need about this software, please contact the development team at http://www.libreplan.org/en/contact +For any specific information you may need about this software, please contact the development team at http://www.libreplan.com/contact/ .. figure:: images/company_view.png diff --git a/doc/src/user/en/08-asignacion.rst b/doc/src/user/en/08-asignacion.rst index acf5a269b..cb7d9f329 100644 --- a/doc/src/user/en/08-asignacion.rst +++ b/doc/src/user/en/08-asignacion.rst @@ -4,16 +4,20 @@ Assignment of resources .. asigacion_ .. contents:: -The assignment of resources is one of the program's most important features, and can be carried out in two different ways: +The assignment of resources is one of the program's most important features, +and can be carried out in two different ways: * Specific assignment. + * Generic assignment. Both types of assignment are explained in the following sections. -To carry out either of the two types of resource assignment, the following steps are necessary: +To carry out either of the two types of resource assignment, the following +steps are necessary: * Go to the planning of an order. + * Right click on the task to be planned. .. figure:: images/resource-assignment-planning.png @@ -23,16 +27,37 @@ To carry out either of the two types of resource assignment, the following steps * The program shows a screen in which the following information can be viewed: - * List of criteria that must be fulfilled. For each hour group, a list of hour groups is shown, each of which requires a list of criteria. - * Task information: start and end date of the task. - * Type of calculation: The system allows users to choose the strategy to be used to calculate assignments: + * List of criteria that must be fulfilled. For each hour group, a list of + hour groups is shown, each of which requires a list of criteria. - * Calculate number of hours: This calculates the number of hours required to be devoted to the assigned resources, which are given an end date and a resource number per day. - * Calculate end date: This calculates the end date of the task based on the number of task resources and the total number of hours to finish the task. - * Calculate number of resources: This calculates the number of resources required to finish the task on a specific date and devotes a known number of hours to them. + * Task information: start and end date of the task. - * Recommended assignment: This option allows the program to gather criteria that must be fulfilled and the total number of hours from all hour groups, and then recommends a generic assignment. If there was a prior assignment, the system deletes it and replaces it with the new one. - * Assignments: A list of assignments that have been carried out. This list shows the generic assignments (the number will be the list of fulfilled criteria, and the number of hours and resources per day). Every assignment carried out can be explicitly removed by clicking the delete button. + * Type of calculation: The system allows users to choose the strategy to + be used to calculate assignments: + + * Calculate number of hours: This calculates the number of hours + required to be devoted to the assigned resources, which are given an + end date and a resource number per day. + + * Calculate end date: This calculates the end date of the task based on + the number of task resources and the total number of hours to finish + the task. + + * Calculate number of resources: This calculates the number of resources + required to finish the task on a specific date and devotes a known + number of hours to them. + + * Recommended assignment: This option allows the program to gather + criteria that must be fulfilled and the total number of hours from all + hour groups, and then recommends a generic assignment. If there was + a prior assignment, the system deletes it and replaces it with the new + one. + + * Assignments: A list of assignments that have been carried out. This list + shows the generic assignments (the number will be the list of fulfilled + criteria, and the number of hours and resources per day). Every + assignment carried out can be explicitly removed by clicking the delete + button. .. figure:: images/resource-assignment.png :scale: 50 @@ -40,7 +65,9 @@ To carry out either of the two types of resource assignment, the following steps Resource assignment * Users select "Search resources". -* The program shows a new screen consisting of a criteria tree and a list to the right of workers that fulfil the selected criteria: + +* The program shows a new screen consisting of a criteria tree and a list to + the right of workers that fulfil the selected criteria: .. figure:: images/resource-assignment-search.png :scale: 50 @@ -49,22 +76,34 @@ To carry out either of the two types of resource assignment, the following steps * Users can select: - * Specific assignment. See the "Specific assignment" section to find out what is involved when choosing this option. - * Generic assignment. See the "Generic assignment" section to find out what is involved when choosing this option. + * Specific assignment. See the "Specific assignment" section to find out + what is involved when choosing this option. -* Users select a list of criteria (generic) or a list of workers (specific). A multiple-choice selection is performed by pressing the "Ctrl" button when clicking each worker/criterion. + * Generic assignment. See the "Generic assignment" section to find out + what is involved when choosing this option. -* Users then click the "Select" button. It is important to remember that if a generic assignment is not marked, users need to choose a worker or machine to perform an assignment. If this is not done, it is sufficient for users to choose one or several criteria. +* Users select a list of criteria (generic) or a list of workers (specific). + A multiple-choice selection is performed by pressing the "Ctrl" button + when clicking each worker/criterion. -* The program then shows the selected criteria or resource list on the list of assignments from the original resource assignment screen. +* Users then click the "Select" button. It is important to remember that if + a generic assignment is not marked, users need to choose a worker or + machine to perform an assignment. If this is not done, it is sufficient + for users to choose one or several criteria. -* Users must choose the hours or resources per day depending on the assignment method used on the program. +* The program then shows the selected criteria or resource list on the list + of assignments from the original resource assignment screen. + +* Users must choose the hours or resources per day depending on the + assignment method used on the program. Specific assignment =================== -This is the specific assignment of a resource to a project task, i.e. the user decides which specific "name and surname(s)" or "machine" must be assigned to a task. +This is the specific assignment of a resource to a project task, i.e. the +user decides which specific "name and surname(s)" or "machine" must be +assigned to a task. Specific assignment can be carried out on the screen shown in this image: @@ -74,20 +113,38 @@ Specific assignment can be carried out on the screen shown in this image: Specific resource assignment -When a resource is specifically assigned, the program creates daily assignments in relation to the percentage of daily assigned resources selected, by previously comparing it with the available resource calendar. For example, an assignment of 0.5 resources for a 32-hour task means that 4 hours per day are assigned to the specific resource to fulfil the task (supposing a working calendar of 8 hours per day). +When a resource is specifically assigned, the program creates daily +assignments in relation to the percentage of daily assigned resources +selected, by previously comparing it with the available resource calendar. +For example, an assignment of 0.5 resources for a 32-hour task means that +4 hours per day are assigned to the specific resource to fulfil the +task (supposing a working calendar of 8 hours per day). Specific machine assignment --------------------------- -Specific machine assignment functions in the same way as that for workers. When a machine is assigned a task, the system stores a specific assignment of hours for the chosen machine. The main difference is that the system searches the list of assigned workers or criteria at the moment the machine is assigned: +Specific machine assignment functions in the same way as that for workers. +When a machine is assigned a task, the system stores a specific assignment +of hours for the chosen machine. The main difference is that the system +searches the list of assigned workers or criteria at the moment the machine +is assigned: -* If the machine has a list of assigned workers, the program chooses from those that are required by the machine for the assigned calendar. For example, if the machine calendar is 16 hours per day and the resource calendar is 8 hours, two resources are assigned from the list of available resources. -* If the machine has one or several assigned criteria, generic assignments are carried out from among the resources that fulfil the criteria assigned to the machine. +* If the machine has a list of assigned workers, the program chooses from + those that are required by the machine for the assigned calendar. For + example, if the machine calendar is 16 hours per day and the resource + calendar is 8 hours, two resources are assigned from the list of available + resources. + +* If the machine has one or several assigned criteria, generic assignments + are carried out from among the resources that fulfil the criteria assigned + to the machine. Generic assignment ================== -Generic assignment occurs when users do not choose resources specifically, but leave the decision to the program, which distributes the loads among the company's available resources. +Generic assignment occurs when users do not choose resources specifically, +but leave the decision to the program, which distributes the loads among the +company's available resources. .. figure:: images/asignacion-xenerica.png :scale: 50 @@ -97,42 +154,77 @@ Generic assignment occurs when users do not choose resources specifically, but l The assignment system uses the following assumptions as a basis: * Tasks have criteria that are required from resources. + * Resources are configured to fulfil criteria. -However, the system does not fail when criteria have not been assigned, but when all resources fulfil the non-requirement of criteria. +However, the system does not fail when criteria have not been assigned, but +when all resources fulfil the non-requirement of criteria. The generic assignment algorithm functions in the following way: -* All resources and days are treated as containers where daily assignment of hours fit, based on the maximum assignment capacity in the task calendar. +* All resources and days are treated as containers where daily assignment of + hours fit, based on the maximum assignment capacity in the task calendar. + * The system searches for the resources that fulfil the criterion. -* The system analyses which assignments currently have different resources that fulfil criteria. -* The resources that fulfil the criteria are chosen from those that have sufficient availability. -* If freer resources are not available, assignments are made to the resources that have less availability. -* Over-assignment of resources only starts when all the resources that fulfil the respective criteria are 100% assigned until the total amount required to carry out the task is attained. + +* The system analyses which assignments currently have different resources + that fulfil criteria. + +* The resources that fulfil the criteria are chosen from those that have + sufficient availability. + +* If freer resources are not available, assignments are made to the + resources that have less availability. + +* Over-assignment of resources only starts when all the resources that + fulfil the respective criteria are 100% assigned until the total amount + required to carry out the task is attained. Generic machine assignment -------------------------- -Generic machine assignment functions in the same way as worker assignment. For example, when a machine is assigned to a task, the system stores a generic assignment of hours for all machines that fulfil the criteria as described for the resources in general. However, in addition, the system performs the following procedure for machines: +Generic machine assignment functions in the same way as worker assignment. +For example, when a machine is assigned to a task, the system stores +a generic assignment of hours for all machines that fulfil the criteria as +described for the resources in general. However, in addition, the system +performs the following procedure for machines: * For all machines chosen for generic assignment: - * It collects the machine's configuration information: alpha value, assigned workers and criteria. - * If the machine has an assigned list of workers, the program chooses the number required by the machine depending on the assigned calendar. For example, if the machine calendar is 16 hours per day and the resource calendar is 8 hours, the program assigns two resources from the list of available resources. - * If the machine has one or several assigned criteria, the program makes generic assignments from among the resources that fulfil the criteria assigned to the machine. + * It collects the machine's configuration information: alpha value, + assigned workers and criteria. + + * If the machine has an assigned list of workers, the program chooses the + number required by the machine depending on the assigned calendar. For + example, if the machine calendar is 16 hours per day and the resource + calendar is 8 hours, the program assigns two resources from the list of + available resources. + + * If the machine has one or several assigned criteria, the program makes + generic assignments from among the resources that fulfil the criteria + assigned to the machine. Advanced assignment =================== -Advanced assignments allow users to design assignments that are automatically carried out by the application in order to personalise them. This procedure allows users to manually choose the daily hours that are dedicated by resources to tasks that are assigned or define a function that is applied to the assignment. +Advanced assignments allow users to design assignments that are +automatically carried out by the application in order to personalise them. +This procedure allows users to manually choose the daily hours that are +dedicated by resources to tasks that are assigned or define a function that +is applied to the assignment. The steps to follow in order to manage advanced assignments are: * Go to the advanced assignment window. There are two ways to access advanced assignments: - * Go to a specific order and change the view to advanced assignment. In this case, all the tasks on the order and assigned resources (specific and generic) will be shown. - * Go to the resource assignment window by clicking the "Advanced assignment" button. In this case, the assignments that show the resources (generic and specific) assigned for a task will be shown. + * Go to a specific order and change the view to advanced assignment. In + this case, all the tasks on the order and assigned resources (specific + and generic) will be shown. + + * Go to the resource assignment window by clicking the "Advanced + assignment" button. In this case, the assignments that show the + resources (generic and specific) assigned for a task will be shown. .. figure:: images/advance-assignment.png :scale: 45 @@ -141,25 +233,45 @@ The steps to follow in order to manage advanced assignments are: * Users can choose the required zoom level they want: - * If the chosen zoom is more than one day. If users change the assigned hour value to a week, month, four-month or six-month period, the system distributes the hours lineally for all days throughout the chosen period. - * If the chosen zoom is one day. If users change the assigned hour value to a day, these hours only apply to a day. Consequently, users can decide how many hours they want to assign per day to task resources. + * If the chosen zoom is more than one day. If users change the assigned + hour value to a week, month, four-month or six-month period, the system + distributes the hours lineally for all days throughout the chosen + period. + + * If the chosen zoom is one day. If users change the assigned hour value + to a day, these hours only apply to a day. Consequently, users can + decide how many hours they want to assign per day to task resources. * Users can choose to design an advanced assignment function. In order to do so, users have to: - * Choose the function on the selection list that appears at the side of each resource and click "Configure". - * The system shows a new window if the chosen function needs to be specifically configured. Supported functions: + * Choose the function on the selection list that appears at the side of + each resource and click "Configure". - * Segments: A function that allows users to define segments to which a polynomial function is applied. The function per segment is configured as follows: + * The system shows a new window if the chosen function needs to be + specifically configured. Supported functions: + * Segments: A function that allows users to define segments to which + a polynomial function is applied. The function per segment is + configured as follows: - * Date. Date on which the segment ends. If the following value is established (length), the date is calculated, alternatively, length is calculated. - * Defining the length of each segment. This indicates what percentage of the task's duration is required for the segment. - * Defining the amount of work. This indicates what workload percentage is expected to be completed in this segment. The quantity of work must be incremental. For example, if there is a 10% segment, the next one must be larger (for example, 20%). - * Segment graphs and accumulated loads. + * Date. Date on which the segment ends. If the following value is + established (length), the date is calculated, alternatively, length is + calculated. + * Defining the length of each segment. This indicates what percentage of + the task's duration is required for the segment. - * Users then click "Accept". - * The program stores the function and applies it to the daily resource assignments. + * Defining the amount of work. This indicates what workload percentage + is expected to be completed in this segment. The quantity of work must + be incremental. For example, if there is a 10% segment, the next one + must be larger (for example, 20%). + + * Segment graphs and accumulated loads. + + * Users then click "Accept". + + * The program stores the function and applies it to the daily resource + assignments. .. figure:: images/stretches.png :scale: 40 diff --git a/doc/src/user/en/15-informes.rst b/doc/src/user/en/15-informes.rst index cca23cc97..8d32df8d2 100644 --- a/doc/src/user/en/15-informes.rst +++ b/doc/src/user/en/15-informes.rst @@ -1,17 +1,21 @@ -Reports -######## - -.. _informes: -.. contents:: - - -Reports -======= - -"LibrePlan" is integrated with *JasperReports* to manage reports, which allows users to enter various reports to analyse available data in the program. - -The defined reports are: - -#. `Report on worked hours by resource <15-1-report-hours-worked-by-resource.html>`__ -#. `Report on the total hours worked by resource in a month <15-2-total-hours-by-resource-month.html>`__ -#. `Report on the work and progress per report <15-3-work-progress-per-project.html>`__ +Reports +####### + +.. _informes: +.. contents:: + + +"LibrePlan" is integrated with *JasperReports* to manage reports, which allows users to enter various reports to analyse available data in the program. + +The defined reports are: + +.. raw:: html + + diff --git a/doc/src/user/en/16-ldap-authentication.rst b/doc/src/user/en/16-ldap-authentication.rst new file mode 100644 index 000000000..54ea7a26c --- /dev/null +++ b/doc/src/user/en/16-ldap-authentication.rst @@ -0,0 +1,83 @@ +LDAP Configuration +################## + +.. contents:: + +This screen allows to establish a connection with LDAP to delegate +authentication and/or authorization. + +It is divided in four different areas related which are explained below: + +Activation +========== + +This area is used to set the properties about the way in which *LibrePlan* uses +LDAP. + +If the field *Enable LDAP authentication* is checked, *LibrePlan* will look in +LDAP each time an user tries to login in the application. + +The field *Use LDAP roles* checked means that a mapping between LDAP roles and +LibrePlan roles is established, so the permissions for an user in LibrePlan +will depend on the roles in LDAP that the user has. + +Configuration +============= + +This section has the parameter values for accessing LDAP.*Base, UserDN and +Password* are parameters used to connect to LDAP and search for the users, so +given user must have permission to do that operation in LDAP. At bottom part of +this section there is a button to check if LDAP connection is possible with the +given parameters. It is a good idea to try it before continuing the +configuration. + +Authentication +============== + +Here can be configured the property in LDAP nodes where should be found the +given login name. The property *UserId* must be filled with the name of the +property where the login name is stored in LDAP. + +The checkbox *Save passwords in database* when it is checked, means that the +password is stored also in LibrePlan database. In this way, if LDAP is offline +or unreachable, LDAP users could authenticate against LibrePlan database. If it +is not checked, LDAP users can only be authenticated against LDAP. + +Authorization +============= + +This section allows to define an strategy for matching LDAP roles with +LibrePlan roles. In fact, the first choice is the strategy to use, depending on +LDAP implementation. + +Group strategy +-------------- + +When this strategy is used, it means that LDAP has a role-group strategy. It +means that users in LDAP are nodes that hang directly from a branch which +represents the group. In this way, considering as example an LDAP with a branch +(group) called *Admin* and two nodes (users) in the branch called *John* and +*William*, an administrator could assign to both users a role in LibrePlan. The +only parameter needed in this case is the *Group path* that represents the path +in LDAP to find the branches with the groups. + +Property strategy +----------------- + +When administrator decides to use this strategy, it means that each user is a +LDAP node and in the node exists a property that represents the group(s) for +the user. In this case, the configuration needs two parameters: + +* *Role property*. It represents the property in user's node in LDAP which + contains all the roles for that user. + +* *Role search query*. It represents the path in LDAP to find the nodes of + the users; in this case, note that is important to know that string + "[USER_ID]" represents the place where the login name given in the login + form should be placed to get the correct user's node in LDAP. + +At the bottom of this section there is a table with all the LibrePlan roles and +a text field next to each one. This is for matching roles. For instance, if +administrator decides that *Administration* LibrePlan role matches with *admin* +and *administrators* roles of LDAP, in the text field should appear: +"admin;administrators". The character for splitting roles is ";". diff --git a/doc/src/user/en/20-acerca-de.rst b/doc/src/user/en/20-acerca-de.rst index c78f44e3c..31b1ef821 100644 --- a/doc/src/user/en/20-acerca-de.rst +++ b/doc/src/user/en/20-acerca-de.rst @@ -31,7 +31,7 @@ Written by LibrePlan Team -------------- -* Cristina Alavariño Pérez +* Cristina Alvariño Pérez * Jacobo Aragunde Pérez * Nacho Barrientos Arias * Xavier Castaño García @@ -79,6 +79,6 @@ Inside the global scope that LibrePlan is designed for regarding planning manage This project was part of Plan Avanza: -.. figure:: images/avanza.gif +.. figure:: images/avanza.png :scale: 100 diff --git a/doc/src/user/en/images/avanza.gif b/doc/src/user/en/images/avanza.gif deleted file mode 100644 index cd959cf3a..000000000 Binary files a/doc/src/user/en/images/avanza.gif and /dev/null differ diff --git a/doc/src/user/en/images/avanza.png b/doc/src/user/en/images/avanza.png new file mode 100644 index 000000000..a51893f80 Binary files /dev/null and b/doc/src/user/en/images/avanza.png differ diff --git a/doc/src/user/en/parts b/doc/src/user/en/parts index 302f004ad..93cf0f1ee 100644 --- a/doc/src/user/en/parts +++ b/doc/src/user/en/parts @@ -23,4 +23,5 @@ 12-formularios-calidad Xavier Castaño (xcastanho@igalia.com) 13-usuarios Xavier Castaño (xcastanho@igalia.com) 14-custos Xavier Castaño (xcastanho@igalia.com) -15-informes Xavier Castaño (xcastanho@igalia.com) \ No newline at end of file +15-informes Xavier Castaño (xcastanho@igalia.com) +16-ldap-authentication Ignacio Diaz Teijido (ignacio.diaz@cafedered.com)y Javier Moran Rua (jmoran@igalia.com) diff --git a/doc/src/user/es/01-introducion.rst b/doc/src/user/es/01-introducion.rst index 62d7a978e..68ef02e99 100644 --- a/doc/src/user/es/01-introducion.rst +++ b/doc/src/user/es/01-introducion.rst @@ -12,7 +12,7 @@ proyectos. Su objetivo principal es proporcionar una solución completa para la gestión de los proyectos de la empresa. Para cualquier información específica que necesites sobre este software, por favor ponte en contacto con el equipo de desarrollo en -http://www.libreplan.org/es/contacto +http://www.libreplan.com/contact/ .. figure:: images/company_view.png diff --git a/doc/src/user/es/16-ldap-authentication.rst b/doc/src/user/es/16-ldap-authentication.rst new file mode 100644 index 000000000..9419d055a --- /dev/null +++ b/doc/src/user/es/16-ldap-authentication.rst @@ -0,0 +1,90 @@ +Configuracion LDAP +################## + +.. contents:: + +Esta pantalla permite establecer una conexión LDAP para delegar autenticación y/o autorización. + +Está dividida en catro áreas diferentes relacionadas que se explican debajo: + +Activación +========== + + +Esta área se usa para establecer las propiedades que configuran como *LibrePlan* usa LDAP. + +Si el campo *Habilita autenticación LDAP* está marcado, *LibrePlan* utiliza el +LDAP para autenticar cada vez que el usuario intenta entrar en la aplicación. + +El campo *Usar LDAP roles* marcado significa que el mapping entre el roles LDAP +y roles LibrePlan está establecido, de manera que los permisos en LibrePlan dependen +de los roles que el usuario tiene en el LDAP. + +Configuración +============= + +Esta sección tiene los parámentros para el acceso al LDAP. Los parámetros +*Base, UserDN y Password* son los parámetros para conectar al LDAP y buscar a +los usuarios. El usuario configurado debe tener permiso en +el LDAP. En la última parte de esta sección hay un botón para comprobar que la +conexión con el LDAP es posible con los parámetros configurados. Es una buena idea +probar la conexión antes de continuar con la configuración. + +Autenticación +============= + +En esta sección se configuran la propiedad de los nodos de LDAP donde se +encuentra almacenada el login del usuario. La propiedad *UserId* debe ser +rellenado con el nombre de la propiedad donde el login está almacenado en el +LDAP. + +El checkbox *Almacenar contraseñas en la base de datos* cuando se encuentra +marcado, indica que la contraseña se almacena también en la base de datos +LibrePlan. De esta forma, si el LDAP está offline o no existe conectividad, los +usuarios del LDAP pueden autenticarse contra la base de datos de LibrePlan. Si +no está marcado, los usuario de LDAP sólo pueden ser autenticados contro el +LDAP. + + +Autorización +============ + +Esta sección permite definir la estrategia para asociar los roles de LDAP con +los roles de LibrePlan. + +Estrategia de grupo +------------------- + +Cuando se usa esta estrategia, implica que el LDAP está usando una estrageia de +grupo de rol. Significa que los usuarios en el LDAP son nodos que cuelgan +directamente de una rama que representa el grupo. Un ejemplo de ello sería tener +un LDAP con una rama (grupo) llamada *Admin* y que tuviera debajo dos nodos +(usuarios) llamados *John* y *William*. En este caso un administrador de +LibrePlan podría asignar ambos usuarios a un rol en LibrePlan. + +El único parámetro en este caso es el *Path de grupo* que representa la ruta en +LDAP para encontras las ramas que representan los grupos. + +Estrategia de propiedad +----------------------- + +Cuando un usuario administrador decide usar esta estrategia, implica que cada +usuario es un nodo de LDAP y que en el nodo existe una propiedad que representa +el grupo o grupos al que pertenece el usuairo. En este caso, la configuración +necesita dos parámetros: + +* *Propiedad del rol*. Representa la propiedad en el nodo del usuario que + contiene todos los roles para el mismo. + +* *Consulta para la búsqueda de roles*. Representa la ruta en el LDAP para + encontrar los nodos de los usuarios. En este caso, hay que tener en cuenta que + la cadena "[USER_ID]" representa el lugar en el que el nombre del usuario + proporcionado en el formulario de entrada debe ser situado para obtener el + nodo apropiado correspondiente al usuario en el LDAP. + +En el fondo de la pantalla de esta sección hay una tabla con todos los roles de +LibrePlan y un campo de texto anexo a cada uno de ellos. Esta área es para la +asociación de los roles. Por ejemplo, si un usuario administrador de LibrePlan +decide que rol de LibrePlan *Administración* se corresponde con los roles +*admin* y *administrators* del LDAP en el campo de texto hay que configurar: +"admin;administrators". El carácter de separación de roles es ";". diff --git a/doc/src/user/es/20-acerca-de.rst b/doc/src/user/es/20-acerca-de.rst index 14b0d63b2..a9c69fcbe 100644 --- a/doc/src/user/es/20-acerca-de.rst +++ b/doc/src/user/es/20-acerca-de.rst @@ -28,7 +28,7 @@ Escrito por Equipo de LibrePlan ------------------- -* Cristina Alavariño Pérez +* Cristina Alvariño Pérez * Jacobo Aragunde Pérez * Nacho Barrientos Arias * Xavier Castaño García diff --git a/doc/src/user/es/parts b/doc/src/user/es/parts index 302f004ad..e1d65d383 100644 --- a/doc/src/user/es/parts +++ b/doc/src/user/es/parts @@ -23,4 +23,5 @@ 12-formularios-calidad Xavier Castaño (xcastanho@igalia.com) 13-usuarios Xavier Castaño (xcastanho@igalia.com) 14-custos Xavier Castaño (xcastanho@igalia.com) -15-informes Xavier Castaño (xcastanho@igalia.com) \ No newline at end of file +15-informes Xavier Castaño (xcastanho@igalia.com) +16-ldap-authentication Ignacio Diaz Teijido (ignacio.diaz@cafedered.com) y Javier Moran Rua (jmoran@igalia.com) diff --git a/doc/src/user/gl/01-introducion.rst b/doc/src/user/gl/01-introducion.rst index 92ac8d56d..b50195f2a 100644 --- a/doc/src/user/gl/01-introducion.rst +++ b/doc/src/user/gl/01-introducion.rst @@ -12,7 +12,7 @@ proxectos. O seu obxectivo principal é proporcionar unha solución completa par xestión dos proxectos da empresa. Para calquera información específica que necesites sobre este software, por favor ponte en contacto co equipo de desenvolvemento en -http://www.libreplan.org/contacto +http://www.libreplan.com/contact/ .. figure:: images/company_view.png diff --git a/doc/src/user/gl/16-ldap-authentication.rst b/doc/src/user/gl/16-ldap-authentication.rst new file mode 100644 index 000000000..d3a636a11 --- /dev/null +++ b/doc/src/user/gl/16-ldap-authentication.rst @@ -0,0 +1,90 @@ +Configuracion LDAP +################## + +.. contents:: + +Esta pantalla permite establecer unha conexión LDAP para delegar autenticación e/ou autorización. + +Está dividida en catro áreas diferentes relacionadas que se explican debaixo: + +Activación +========== + + +Esta área úsase para establecer as propiedades que configuran como *LibrePlan* usa LDAP. + +Se o campo *Habilita autenticación LDAP* está marcado, *LibrePlan* utiliza o +LDAP para autenticar cada vez que o usuario tenta entrar na aplicación. + +O campo *Usar LDAP roles* marcado significa que o mapping entre os roles LDAP +e os roles de LibrePlan está establecido, de maneira que os permisos en LibrePlan dependen +dos roles que o usuario ten no LDAP. + +Configuración +============= + +Esta sección ten os parámentros para o acceso ao LDAP. Os parámetros +*Basee, UserDN e Password* son os parámetros para conectar ao LDAP e buscar aos +usuarios. O usuario configurado debe ter permiso no +LDAP. Na última parte desta sección hai un botón para comprobar que a +conexión co LDAP é posible cos parámetros configurados. É unha boa idea +probar a conexión antes de continuar coa configuración. + +Autenticación +============= + +Nesta sección configúranse a propiedade dos nodos de LDAP onde se atopa +almacenada o login do usuario. A propiedade *UserId* debe ser +enchido co nome da propiedade onde o login está almacenado no +LDAP. + +O checkbox *Almacenar contrasinais na base de datos* cando se atopa +marcado, indica que a contrasinal se almacena tamén na base de datos +LibrePlan. Desta forma, se o LDAP está offline ou non existe conectividad, os +usuarios do LDAP poden autenticarse contra a base de datos de LibrePlan. Se +non está marcado, o usuario de LDAP só poden ser autenticados contro o +LDAP. + + +Autorización +============ + +Esta sección permite definir a estratexia para asociar os roles de LDAP cos +roles de LibrePlan. + +Estratexia de grupo +------------------- + +Cando se usa esta estratexia, implica que o LDAP está a usar unha estratexia de grupo +de rol. Significa que os usuarios no LDAP son nodos que colgan +directamente dunha rama que representa o grupo. Un exemplo diso sería ter +un LDAP cunha rama (grupo) chamada *Admin* e que tivese debaixo dous nodos +(usuarios) chamados *John* e *William*. Neste caso un administrador de LibrePlan +podería asignar ambos usuarios a un rol en LibrePlan. + +O único parámetro neste caso é o *Path de grupo* que representa a ruta en LDAP +para atopar as ramas que representan os grupos. + +Estratexia de propiedade +------------------------ + +Cando un usuario administrador decide usar esta estratexia, implica que cada +usuario é un nodo de LDAP e que no nodo existe unha propiedade que representa +o grupo ou grupos ao que pertence o usuairo. Neste caso, a configuración +necesita dous parámetros: + +* *Propiedade do rol*. Representa a propiedade no nodo do usuario que + contén todos os roles para o mesmo. + +* *Consulta para a procura de roles*. Representa a ruta no LDAP para + atopar os nodos dos usuarios. Neste caso, hai que ter en conta que + a cadea "[USER_IDE]" representa o lugar no que o nome do usuario + proporcionado no formulario de entrada debe ser situado para obter o + nodo apropiado correspondente ao usuario no LDAP. + +No fondo da pantalla desta sección hai unha táboa con todos os roles de LibrePlan +e un campo de texto anexo a cada un deles. Esta área é para a +asociación dos roles. Por exemplo, se un usuario administrador de LibrePlan +decide que rol de LibrePlan *Administración* correspóndese cos roles +*admin* e *administrators* do LDAP no campo de texto hai que configurar: +"admin;administrators". O carácter de separación de roles é ";". diff --git a/doc/src/user/gl/20-acerca-de.rst b/doc/src/user/gl/20-acerca-de.rst index 9ed0c306c..d9d3c273a 100644 --- a/doc/src/user/gl/20-acerca-de.rst +++ b/doc/src/user/gl/20-acerca-de.rst @@ -28,7 +28,7 @@ Escrito por Equipo de LibrePlan ------------------- -* Cristina Alavariño Pérez +* Cristina Alvariño Pérez * Jacobo Aragunde Pérez * Nacho Barrientos Arias * Xavier Castaño García diff --git a/doc/src/user/gl/parts b/doc/src/user/gl/parts index 302f004ad..719ef2438 100644 --- a/doc/src/user/gl/parts +++ b/doc/src/user/gl/parts @@ -23,4 +23,5 @@ 12-formularios-calidad Xavier Castaño (xcastanho@igalia.com) 13-usuarios Xavier Castaño (xcastanho@igalia.com) 14-custos Xavier Castaño (xcastanho@igalia.com) -15-informes Xavier Castaño (xcastanho@igalia.com) \ No newline at end of file +15-informes Xavier Castaño (xcastanho@igalia.com) +16-ldap-authentication Ignacio Diaz Teijido (ignacio.diaz@cafedered.com) e Javier Moran Rua (jmoran@igalia.com) diff --git a/doc/tools/doctool b/doc/tools/doctool index b98db3727..78b5f0e66 100755 --- a/doc/tools/doctool +++ b/doc/tools/doctool @@ -3,6 +3,7 @@ import sys, shlex, subprocess from optparse import OptionParser, OptionGroup from docutils.writers import latex2e +import re try: import locale @@ -42,6 +43,23 @@ OPT.docinfo.add_option("-i", "--info", dest="docinfo", help="Read project information from FILE") +is_index_filename = re.compile(r'^[0-9]{2}-[a-zA-Z].*').match + + +def str_to_numeric_tuple(s): + r = [] + for item in s.split("-"): + try: + r.append(int(item, 10)) + except ValueError: + # Tried to convert a non-integer, bail out + break + return tuple(r) + +def str_tuple_sort(a, b): + return cmp(str_to_numeric_tuple(a), str_to_numeric_tuple(b)) + + def optparser(*groups): parser.add_option_group(OPT.common) [parser.add_option_group(g) for g in groups] @@ -50,7 +68,12 @@ def optparser(*groups): class DupRefsRemover(object): def __init__(self, out): - self.out = out + if hasattr(out, "write"): + self.out = out.write + elif hasattr(out, "handle_line"): + self.out = out.handle_line + else: + raise ValueError("%r has no write/handle_line" % out) self.ref = dict() def handle_line(self, line): @@ -64,9 +87,35 @@ class DupRefsRemover(object): else: # Add reference and print it out self.ref[r[0]] = r[1] - self.out.write(line) + self.out(line) else: - self.out.write(line) + self.out(line) + + +class UnderlineXlate(object): + _XLATE = { + "#": "=", + "=": "-", + "-": "~", + "~": "^", + } + + def __init__(self, out): + if hasattr(out, "write"): + self.out = out.write + elif hasattr(out, "handle_line"): + self.out = out.handle_line + else: + raise ValueError("%r has no write/handle_line" % out) + + def handle_line(self, line): + sline = line.strip() + if len(sline): + if sline[0] in self._XLATE: + sline = sline.replace(sline[0], self._XLATE[sline[0]]) + self.out(sline) + return + self.out(line) @@ -135,10 +184,10 @@ class LaTeXStandaloneTranslator(latex2e.LaTeXTranslator): if self.d_class.document_class == "igaliabk": self.d_class.document_class = "book" - try: - del self.head_prefix[self.head_prefix.index(self.typearea)] - except AttributeError: - pass + try: + del self.head_prefix[self.head_prefix.index(self.typearea)] + except AttributeError: + pass def __get_typearea(self): if self._class == "igaliabk" or self._class.startswith("scr"): @@ -239,13 +288,17 @@ class DocTool(object): print out = DupRefsRemover(sys.stdout) + out_xlate = UnderlineXlate(out) + + args = list(args) + args.sort(str_tuple_sort) for name in args: if not name.endswith(".rst"): continue f = file(name, "rU") - map(out.handle_line, + map(is_index_filename(name) and out.handle_line or out_xlate.handle_line, filter(lambda l: ".. contents::" not in l, f.readlines()) ) @@ -263,9 +316,12 @@ class DocTool(object): f.close() print + args = list(args) + args.sort(str_tuple_sort) + for name in args: # Skip non-RST inputs - if not name.endswith(".rst"): + if not name.endswith(".rst") or not is_index_filename(name): continue f = file(name, "rU") diff --git a/ganttzk/pom.xml b/ganttzk/pom.xml index 831d8583b..ce42da520 100644 --- a/ganttzk/pom.xml +++ b/ganttzk/pom.xml @@ -6,7 +6,7 @@ org.libreplan libreplan - 1.1.3 + 1.2.0 ganttzk jar diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java index a4b7cfde1..4a0b3255f 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java @@ -1933,16 +1933,27 @@ public class GanttDiagramGraph> implements } public boolean hasVisibleIncomingDependencies(V task) { - return isSomeVisible(graph.incomingEdgesOf(task)); + return isSomeVisibleAndNotEndEnd(graph.incomingEdgesOf(task)); + } + + private boolean isSomeVisibleAndNotEndEnd(Set dependencies) { + for (D each : dependencies) { + if (!each.getType().equals(DependencyType.END_END) + && adapter.isVisible(each)) { + return true; + } + } + return false; } public boolean hasVisibleOutcomingDependencies(V task) { - return isSomeVisible(graph.outgoingEdgesOf(task)); + return isSomeVisibleAndNotStartStart(graph.outgoingEdgesOf(task)); } - private boolean isSomeVisible(Set dependencies) { + private boolean isSomeVisibleAndNotStartStart(Set dependencies) { for (D each : dependencies) { - if (adapter.isVisible(each)) { + if (!each.getType().equals(DependencyType.START_START) + && adapter.isVisible(each)) { return true; } } diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul index 7a977d820..9d050bd2a 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul @@ -58,11 +58,11 @@ resourcesLoadPanel = self;
- + splittable="true" autoscroll="false" border="0"> + - + diff --git a/libreplan-business/pom.xml b/libreplan-business/pom.xml index b110fe525..1fce9d967 100644 --- a/libreplan-business/pom.xml +++ b/libreplan-business/pom.xml @@ -5,7 +5,7 @@ org.libreplan libreplan - 1.1.3 + 1.2.0 libreplan-business jar diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/daos/BaseCalendarDAO.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/daos/BaseCalendarDAO.java index 47f120161..33bb44b7c 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/daos/BaseCalendarDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/daos/BaseCalendarDAO.java @@ -22,12 +22,12 @@ package org.libreplan.business.calendars.daos; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.List; import org.apache.commons.lang.StringUtils; import org.hibernate.Criteria; -import org.hibernate.Query; import org.hibernate.criterion.Restrictions; import org.libreplan.business.calendars.entities.BaseCalendar; import org.libreplan.business.calendars.entities.CalendarData; @@ -60,6 +60,7 @@ public class BaseCalendarDAO extends IntegrationEntityDAO public List getBaseCalendars() { List list = list(BaseCalendar.class); removeResourceCalendarInstances(list); + Collections.sort(list); return list; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java index 79c52f34f..4ae8571b1 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java @@ -23,7 +23,6 @@ package org.libreplan.business.calendars.entities; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -58,7 +57,7 @@ import org.libreplan.business.workingday.ResourcesPerDay; * @author Manuel Rego Casasnovas */ public class BaseCalendar extends IntegrationEntity implements ICalendar, - IHumanIdentifiable { + IHumanIdentifiable, Comparable { private static final Capacity DEFAULT_VALUE = Capacity.zero() .overAssignableWithoutLimit(); @@ -83,23 +82,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar, return calendar; } - public static List sortByName(List baseCalendars) { - Collections.sort(baseCalendars, new Comparator() { - - @Override - public int compare(BaseCalendar o1, BaseCalendar o2) { - if (o2.getName() == null) { - return -1; - } - if (o1.getName() == null) { - return 1; - } - return o1.getName().compareTo(o2.getName()); - } - }); - return baseCalendars; - } - private static void resetDefaultCapacities(BaseCalendar calendar) { CalendarData calendarData = calendar.getLastCalendarData(); if (calendarData != null) { @@ -1227,4 +1209,9 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar, return name; } + @Override + public int compareTo(BaseCalendar calendar) { + return this.getName().compareToIgnoreCase(calendar.getName()); + } + } diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarBootstrap.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarBootstrap.java index ef5a2db86..9ae2ca494 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarBootstrap.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarBootstrap.java @@ -47,11 +47,11 @@ public class CalendarBootstrap implements ICalendarBootstrap { @Override @Transactional public void loadRequiredData() { - for (PredefinedCalendarExceptionTypes type : PredefinedCalendarExceptionTypes - .values()) { + if (calendarExceptionTypeDAO.getAll().size() == 0) { + for (PredefinedCalendarExceptionTypes type : PredefinedCalendarExceptionTypes + .values()) { CalendarExceptionType calendarExceptionType = type - .getCalendarExceptionType(); - if (!calendarExceptionTypeDAO.existsByName(calendarExceptionType)) { + .getCalendarExceptionType(); calendarExceptionType .setCode(entitySequenceDAO .getNextEntityCodeWithoutTransaction(EntityNameEnum.CALENDAR_EXCEPTION_TYPE)); diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java index 7eac81c5c..4ff84c63d 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java @@ -291,7 +291,8 @@ public class Configuration extends BaseEntity { } public ProgressType getProgressType() { - return progressType; + return (progressType == null) ? ProgressType.SPREAD_PROGRESS + : progressType; } public void setCompanyLogoURL(String companyLogoURL) { diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHoursBootstrap.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHoursBootstrap.java index 7fd2685e4..61b671624 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHoursBootstrap.java +++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHoursBootstrap.java @@ -45,11 +45,11 @@ public class TypeOfWorkHoursBootstrap implements ITypeOfWorkHoursBootstrap { @Override @Transactional public void loadRequiredData() { - for (PredefinedTypeOfWorkHours predefinedTypeOfWorkHours : PredefinedTypeOfWorkHours - .values()) { - TypeOfWorkHours typeOfWorkHours = predefinedTypeOfWorkHours - .getTypeOfWorkHours(); - if (!typeOfWorkHoursDAO.existsByName(typeOfWorkHours)) { + if (typeOfWorkHoursDAO.findAll().size() == 0) { + for (PredefinedTypeOfWorkHours predefinedTypeOfWorkHours : PredefinedTypeOfWorkHours + .values()) { + TypeOfWorkHours typeOfWorkHours = predefinedTypeOfWorkHours + .getTypeOfWorkHours(); typeOfWorkHours.setCodeAutogenerated(true); typeOfWorkHours .setCode(entitySequenceDAO diff --git a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java index a3a4644ae..a9274516f 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java +++ b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java @@ -36,7 +36,8 @@ import org.libreplan.business.users.entities.User; * * @author Jacobo Aragunde Perez */ -public class ExternalCompany extends BaseEntity implements IHumanIdentifiable{ +public class ExternalCompany extends BaseEntity implements IHumanIdentifiable, + Comparable { private String name; @@ -195,4 +196,9 @@ public class ExternalCompany extends BaseEntity implements IHumanIdentifiable{ return name; } + @Override + public int compareTo(ExternalCompany company) { + return this.getName().compareToIgnoreCase(company.getName()); + } + } \ No newline at end of file diff --git a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelBootstrap.java b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelBootstrap.java index b9cebe14a..616126d3c 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelBootstrap.java +++ b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelBootstrap.java @@ -45,8 +45,8 @@ public class LabelBootstrap implements ILabelBootstrap { @Override @Transactional public void loadRequiredData() { - LabelType priorityType = LabelType.create("Priority"); - if (!labelTypeDAO.existsByName(priorityType)) { + if (labelTypeDAO.getAll().size() == 0) { + LabelType priorityType = LabelType.create("Priority"); priorityType.setCodeAutogenerated(true); priorityType.setCode(entitySequenceDAO .getNextEntityCodeWithoutTransaction(EntityNameEnum.LABEL)); diff --git a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java index 235e0f5db..d4bf06599 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java +++ b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java @@ -394,6 +394,10 @@ public class QualityForm extends BaseEntity implements IHumanIdentifiable{ this.reportAdvance = BooleanUtils.toBoolean(reportAdvance); } + public boolean getReportAdvance() { + return this.reportAdvance; + } + public AdvanceType getAdvanceType() { return advanceType; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/bootstrap/CriterionsBootstrap.java b/libreplan-business/src/main/java/org/libreplan/business/resources/bootstrap/CriterionsBootstrap.java index d4ccb85f8..03fcf00ae 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/bootstrap/CriterionsBootstrap.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/bootstrap/CriterionsBootstrap.java @@ -70,15 +70,16 @@ public class CriterionsBootstrap implements ICriterionsBootstrap { @Override @Transactional public void loadRequiredData() { - Map> typesWithCriterions = getTypesWithCriterions(); - - // Insert predefined criterions - for (Entry> entry : typesWithCriterions - .entrySet()) { - CriterionType criterionType = retrieveOrCreate(entry.getKey()); - // Create predefined criterions for criterionType - for (String criterionName : entry.getValue()) { - ensureCriterionExists(criterionName, criterionType); + if (criterionTypeDAO.findAll().isEmpty()) { + Map> typesWithCriterions = getTypesWithCriterions(); + // Insert predefined criterions + for (Entry> entry : typesWithCriterions + .entrySet()) { + CriterionType criterionType = retrieveOrCreate(entry.getKey()); + // Create predefined criterions for criterionType + for (String criterionName : entry.getValue()) { + ensureCriterionExists(criterionName, criterionType); + } } } } diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportTypeBootstrap.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportTypeBootstrap.java index 991001704..7f366ecb6 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportTypeBootstrap.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportTypeBootstrap.java @@ -45,12 +45,11 @@ public class WorkReportTypeBootstrap implements IWorkReportTypeBootstrap { @Override @Transactional public void loadRequiredData() { - for (PredefinedWorkReportTypes predefinedWorkReportType : PredefinedWorkReportTypes - .values()) { - WorkReportType workReportType = predefinedWorkReportType - .getWorkReportType(); - if (!workReportTypeDAO - .existsOtherWorkReportTypeByName(workReportType)) { + if (workReportTypeDAO.getWorkReportTypes().size() == 0) { + for (PredefinedWorkReportTypes predefinedWorkReportType : PredefinedWorkReportTypes + .values()) { + WorkReportType workReportType = predefinedWorkReportType + .getWorkReportType(); workReportType.setCodeAutogenerated(true); workReportType .setCode(entitySequenceDAO diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/resources/bootstrap/CriterionsBootstrapTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/resources/bootstrap/CriterionsBootstrapTest.java index b9d113e01..fd7262a66 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/resources/bootstrap/CriterionsBootstrapTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/resources/bootstrap/CriterionsBootstrapTest.java @@ -28,12 +28,20 @@ import static org.libreplan.business.test.BusinessGlobalNames.BUSINESS_SPRING_CO import java.util.ArrayList; import java.util.List; +import javax.annotation.Resource; + +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.libreplan.business.IDataBootstrap; +import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.resources.bootstrap.ICriterionsBootstrap; import org.libreplan.business.resources.daos.ICriterionDAO; +import org.libreplan.business.resources.daos.ICriterionTypeDAO; +import org.libreplan.business.resources.daos.IResourceDAO; import org.libreplan.business.resources.entities.CategoryCriteria; import org.libreplan.business.resources.entities.Criterion; +import org.libreplan.business.resources.entities.CriterionType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -45,14 +53,49 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class CriterionsBootstrapTest { + @Resource + private IDataBootstrap configurationBootstrap; + @Autowired private ICriterionsBootstrap criterionsBootstrap; @Autowired private ICriterionDAO criterionDAO; + @Autowired + private IResourceDAO resourceDAO; + + @Autowired + private ICriterionTypeDAO criterionTypeDAO; + private List somePredefinedCriterions; + @Before + public void loadRequiredaData() { + // Load data + configurationBootstrap.loadRequiredData(); + cleanCriteria(); + } + + private void cleanCriteria() { + try { + + List resources = resourceDAO + .findAll(); + for (org.libreplan.business.resources.entities.Resource resource : resources) { + resourceDAO.remove(resource.getId()); + } + + List types = criterionTypeDAO.findAll(); + for (CriterionType type : types) { + criterionTypeDAO.remove(type.getId()); + } + + } catch (InstanceNotFoundException e) { + throw new RuntimeException(e); + } + } + public CriterionsBootstrapTest() { somePredefinedCriterions = getSomePredefinedCriterions(); } diff --git a/libreplan-webapp/pom.xml b/libreplan-webapp/pom.xml index 21d275812..0040b6164 100644 --- a/libreplan-webapp/pom.xml +++ b/libreplan-webapp/pom.xml @@ -4,7 +4,7 @@ org.libreplan libreplan - 1.1.3 + 1.2.0 libreplan-webapp war diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java index 737b7f46a..3b7d0fd19 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java @@ -128,9 +128,10 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { public void save() { try { + baseCalendarModel.generateCalendarCodes(); + Util.reloadBindings(editWindow); ConstraintChecker.isValid(editWindow); validateCalendarExceptionCodes(); - baseCalendarModel.generateCalendarCodes(); baseCalendarModel.confirmSave(); messagesForUser.showMessage(Level.INFO, _( "Base calendar \"{0}\" saved", baseCalendarModel @@ -143,9 +144,10 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { public void saveAndContinue() { try { + baseCalendarModel.generateCalendarCodes(); + Util.reloadBindings(editWindow); ConstraintChecker.isValid(editWindow); validateCalendarExceptionCodes(); - baseCalendarModel.generateCalendarCodes(); baseCalendarModel.confirmSaveAndContinue(); messagesForUser.showMessage(Level.INFO, _( "Base calendar \"{0}\" saved", baseCalendarModel diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java index 6034967d5..1de2afc2d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java @@ -1048,8 +1048,7 @@ public abstract class BaseCalendarEditionController extends } public List getParentCalendars() { - return baseCalendarModel.getSortedBaseCalendars(baseCalendarModel - .getPossibleParentCalendars()); + return baseCalendarModel.getPossibleParentCalendars(); } public List getCalendarExceptions() { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java index d84478cfb..935102e32 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java @@ -102,13 +102,6 @@ public class BaseCalendarModel extends IntegrationEntityModel implements return baseCalendars; } - @Override - @Transactional(readOnly = true) - public List getSortedBaseCalendars( - List baseCalendars) { - return BaseCalendar.sortByName(baseCalendars); - } - /* * Initial conversation steps */ diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/IBaseCalendarModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/IBaseCalendarModel.java index 6efbd524a..2ee470dd4 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/IBaseCalendarModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/IBaseCalendarModel.java @@ -208,8 +208,6 @@ public interface IBaseCalendarModel extends IIntegrationEntityModel { BaseCalendar getCurrentParent(); - List getSortedBaseCalendars(List baseCalendars); - Date getCurrentStartDate(); Date getCurrentExpiringDate(); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java index af9ad7954..183a6743e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java @@ -201,15 +201,21 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { for (CustomMenuItem c : child.children) { if (c.contains(requestPath)) { c.setActive(true); - break; + return; } } - break; + return; } } - break; + return; } } + + if (requestPath.isEmpty()) { + CustomMenuItem item = this.firstLevel.get(0); + item.setActive(true); + item.children.get(0).setActive(true); + } } private OnZKDesktopRegistry getLocator() { @@ -308,7 +314,9 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { if (SecurityUtils.isUserInRole(UserRole.ROLE_ADMINISTRATION)) { topItem(_("Administration / Management"), "/advance/advanceTypes.zul", "", - subItem(_("LibrePlan Configuration"), "/common/configuration.zul","03-calendarios.html#calendario-por-defecto"), + subItem(_("LibrePlan Configuration"), + "/common/configuration.zul", + "16-ldap-authentication.html"), subItem(_("Users"), "/users/users.zul","13-usuarios.html#administraci-n-de-usuarios", subItem(_("Accounts"), "/users/users.zul","13-usuarios.html#administraci-n-de-usuarios"), subItem(_("Profiles"), "/users/profiles.zul","13-usuarios.html#administraci-n-de-perfiles")), @@ -339,7 +347,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { subItem(_("Task Scheduling Status In Project"),"/reports/workingArrangementsPerOrderReport.zul","15-informes.html"), subItem(_("Materials Needs At Date"),"/reports/timeLineMaterialReport.zul","15-informes.html")); - topItem(_("My account"), "", "", + topItem(_("My account"), "/settings/settings.zul", "", subItem(_("Settings"), "/settings/settings.zul", ""), subItem(_("Change Password"), "/settings/changePassword.zul", "")); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java index 99a42b731..3ea7fc69a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java @@ -38,12 +38,7 @@ public class EffortDurationBox extends Textbox { @Override protected Object unmarshall(Object value) { - EffortDuration result = EffortDuration - .parseFromFormattedString((String) value); - if (result == null) { - return EffortDuration.zero(); - } - return result; + return coerceFromString((String) value); } @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/LenientDecimalBox.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/LenientDecimalBox.java index 9dbafdbd0..1f9a8e0e9 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/LenientDecimalBox.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/LenientDecimalBox.java @@ -19,18 +19,17 @@ package org.libreplan.web.common; import java.math.BigDecimal; -import java.text.DecimalFormatSymbols; - -import org.zkoss.util.Locales; import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zul.Decimalbox; /** - * Same behavior as a {@link Decimalbox}, but it always interprets , and - * . as decimals separators. So you can use both freely as decimal - * separators. + * Same behavior as a {@link Decimalbox}, but it always interprets . as + * decimal separator, even when the locale uses a different separator. + * We also reimplement coerceToString to workaround the bug + * http://tracker.zkoss.org/browse/ZK-629. * * @author Óscar González Fernández + * @author Jacobo Aragunde Pérez * */ public class LenientDecimalBox extends Decimalbox { @@ -43,4 +42,8 @@ public class LenientDecimalBox extends Decimalbox { super(value); } + protected String coerceToString(Object value) { + return formatNumber(value, null); + } + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/MatrixParameters.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/MatrixParameters.java index 85e0c978d..65c2e886e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/MatrixParameters.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/MatrixParameters.java @@ -45,11 +45,16 @@ public class MatrixParameters { return extract(request.getRequestURI()); } + /** + * Extracts matrix parameters but skipping "jsessionid" + */ public static Map extract(String string) { Map result = new HashMap(); Matcher matcher = matrixParamPattern.matcher(string); while (matcher.find()) { - result.put(matcher.group(1), matcher.group(2)); + if (!matcher.group(1).equals("jsessionid")) { + result.put(matcher.group(1), matcher.group(2)); + } } return result; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java index f6f6ac545..837baf4f8 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java @@ -192,17 +192,8 @@ public class ManageOrderElementAdvancesController extends } } - private void resetScreenHeight() { - if ((tabboxOrderElement != null) - && (!tabboxOrderElement.getHeight().equals("620px"))) { - tabboxOrderElement.setHeight("620px"); - tabboxOrderElement.invalidate(); - } - } - private void reloadAdvances() { Util.reloadBindings(self); - resetScreenHeight(); setSelectedAdvanceLine(); } @@ -883,7 +874,6 @@ public class ManageOrderElementAdvancesController extends } ((AdvanceAssignment) item.getValue()).setReportGlobalAdvance(spread); Util.reloadBindings(editAdvances); - resetScreenHeight(); setSelectedAdvanceLine(); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java index 3b961c4e2..4d7b8b14c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java @@ -36,12 +36,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.LogFactory; import org.hibernate.validator.InvalidValue; import org.libreplan.business.calendars.entities.BaseCalendar; -import org.libreplan.business.common.Registry; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.externalcompanies.entities.ExternalCompany; -import org.libreplan.business.materials.daos.IMaterialCategoryDAO; -import org.libreplan.business.materials.entities.MaterialCategory; import org.libreplan.business.orders.daos.IOrderDAO; import org.libreplan.business.orders.entities.HoursGroup; import org.libreplan.business.orders.entities.Order; @@ -1440,7 +1437,9 @@ public class OrderCRUDController extends GenericForwardComposer { */ private void checkCreationPermissions() { if (!SecurityUtils.isUserInRole(UserRole.ROLE_CREATE_ORDER)) { - createOrderButton.setDisabled(true); + if (createOrderButton != null) { + createOrderButton.setDisabled(true); + } } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java index c39241884..1d140071d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java @@ -375,6 +375,7 @@ public class OrderElementTreeController extends TreeController { if (readOnly) { textBox.setDisabled(true); } + textBox.setConstraint("no empty:" + _("cannot be empty")); addCell(cssClass, textBox); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java index 07ae06d17..136897c8e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java @@ -26,6 +26,7 @@ import static org.libreplan.web.I18nHelper._; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -659,6 +660,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel { private void loadExternalCompaniesAreClient() { this.externalCompanies = externalCompanyDAO .getExternalCompaniesAreClient(); + Collections.sort(this.externalCompanies); } @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java index be265a076..21bc1ad75 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java @@ -179,7 +179,9 @@ public class CompanyPlanningController implements Composer { item.setValue(progressType); item.setLabel(_(progressType.getValue())); - if (getProgressTypeFromConfiguration().equals(progressType)) { + ProgressType configuredProgressType = getProgressTypeFromConfiguration(); + if ((configuredProgressType != null) + && configuredProgressType.equals(progressType)) { cbProgressTypes.setSelectedItem(item); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java index c9410d06b..3c396e788 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java @@ -24,21 +24,16 @@ package org.libreplan.web.qualityforms; import static org.libreplan.web.I18nHelper._; import java.math.BigDecimal; -import java.util.Iterator; import java.util.List; import org.apache.commons.logging.LogFactory; -import org.hibernate.validator.InvalidValue; import org.libreplan.business.common.exceptions.InstanceNotFoundException; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.qualityforms.entities.QualityForm; import org.libreplan.business.qualityforms.entities.QualityFormItem; import org.libreplan.business.qualityforms.entities.QualityFormType; -import org.libreplan.business.users.entities.Profile; import org.libreplan.web.common.BaseCRUDController; -import org.libreplan.web.common.Level; import org.libreplan.web.common.Util; -import org.libreplan.web.users.ProfileCRUDController; import org.springframework.beans.factory.annotation.Autowired; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.WrongValueException; @@ -47,13 +42,11 @@ import org.zkoss.zul.Checkbox; import org.zkoss.zul.Column; import org.zkoss.zul.Combobox; import org.zkoss.zul.Constraint; -import org.zkoss.zul.Decimalbox; import org.zkoss.zul.Grid; import org.zkoss.zul.ListModelExt; import org.zkoss.zul.Messagebox; import org.zkoss.zul.Row; import org.zkoss.zul.Textbox; -import org.zkoss.zul.impl.InputElement; /** * CRUD Controller for {@link QualityForm} @@ -119,7 +112,8 @@ public class QualityFormCRUDController extends BaseCRUDController { @Override protected void beforeSaving() throws ValidationException { - validate(); + super.beforeSaving(); + validateReportProgress(); } @Override @@ -127,99 +121,6 @@ public class QualityFormCRUDController extends BaseCRUDController { qualityFormModel.confirmSave(); } - /** - * Validates all {@link Textbox} in the form - */ - private void validate() { - Textbox boxName = (Textbox) editWindow - .getFellowIfAny("qualityFormName"); - validate(boxName, boxName.getValue()); - - List rows = gridQualityFormItems.getRows().getChildren(); - for (Row row : rows) { - validate(row); - } - } - - @SuppressWarnings("unchecked") - private void validate(Row row) { - for (Iterator i = row.getChildren().iterator(); i.hasNext();) { - final Component comp = (Component) i.next(); - if (comp instanceof Textbox) { - validate((Textbox) comp, ((Textbox) comp).getValue()); - } - if (comp instanceof Decimalbox) { - validate((Decimalbox) comp, ((Decimalbox) comp).getValue()); - } - } - } - - /** - * Validates {@link Textbox} checking {@link Constraint} - * @param comp - */ - private void validate(InputElement comp, Object value) { - if (comp != null && comp.getConstraint() != null) { - final Constraint constraint = comp.getConstraint(); - constraint.validate(comp, value); - } - } - - - private void showInvalidValues(ValidationException e) { - for (InvalidValue invalidValue : e.getInvalidValues()) { - Object value = invalidValue.getBean(); - if (value instanceof QualityForm) { - validateQualityForm(invalidValue); - } - if (value instanceof QualityFormItem) { - validateQualityFormItem(invalidValue); - } - } - } - - private void validateQualityForm(InvalidValue invalidValue) { - Component component = editWindow.getFellowIfAny("qualityFormName"); - if (component != null) { - throw new WrongValueException(component, invalidValue.getMessage()); - } - } - - @SuppressWarnings("unchecked") - private void validateQualityFormItem(InvalidValue invalidValue) { - Row rowItem = findQualityFormItem(gridQualityFormItems.getRows() - .getChildren(), (QualityFormItem) invalidValue.getBean()); - if (rowItem != null) { - InputElement inputElement = getInputText(rowItem, invalidValue - .getPropertyName()); - if (inputElement != null) { - throw new WrongValueException(rowItem, invalidValue - .getMessage()); - } - } - } - - private Row findQualityFormItem(List rows, QualityFormItem item) { - for (Row row : rows) { - if (item.equals(row.getValue())) { - return row; - } - } - return null; - } - - private InputElement getInputText(Row row, String property) { - if (property != null) { - if (property.equals(QualityFormItem.propertyName)) { - return (InputElement) row.getFirstChild(); - } - if (property.equals(QualityFormItem.propertyPercentage)) { - return (InputElement) row.getChildren().get(2); - } - } - return null; - } - public void createQualityFormItem() { qualityFormModel.addQualityFormItem(); Util.reloadBindings(gridQualityFormItems); @@ -410,16 +311,14 @@ public class QualityFormCRUDController extends BaseCRUDController { predicate = getSelectedName(); } - public void validateReportProgress(Component comp) { - Checkbox checkbox = (Checkbox) comp; - if (checkbox != null) { - if ((checkbox.isChecked()) && (!hasItemWithTotalPercentage())) { - disabledCheckbocReportProgress(checkbox); - messagesForUser - .showMessage( - Level.ERROR, - _("The quality form must have an item with 100% value to report progress")); - } + public void validateReportProgress() { + if ((getQualityForm().getReportAdvance()) + && (!hasItemWithTotalPercentage())) { + Checkbox checkBoxReportProgress = (Checkbox) editWindow + .getFellowIfAny("checkBoxReportProgress"); + throw new WrongValueException( + checkBoxReportProgress, + _("The quality form must have an item with 100% value to report progress")); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormModel.java index 622827bd3..234e3d91e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormModel.java @@ -215,7 +215,7 @@ public class QualityFormModel implements IQualityFormModel { @Override public Boolean isTotalPercentage(QualityFormItem item) { return (item.getPercentage() != null) ? (item.getPercentage() - .equals(totalPercentage)) : false; + .compareTo(totalPercentage) == 0) : false; } @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java index a431c5716..809b4ec65 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java @@ -31,6 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.validator.ClassValidator; @@ -214,6 +215,10 @@ public abstract class TreeController> extends Textbox name = (Textbox) cmp.getFellow("newOrderElementName"); Intbox hours = (Intbox) cmp.getFellow("newOrderElementHours"); + if (StringUtils.isEmpty(name.getValue())) { + throw new WrongValueException(name, _("cannot be empty")); + } + if (hours.getValue() == null) { hours.setValue(0); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java index 91bdf456e..4efc32bdb 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java @@ -246,6 +246,7 @@ public class WorkReportTypeCRUDController extends BaseCRUDController\n" "Language-Team: Spanish <>\n" "Language: es\n" @@ -26,7 +26,7 @@ msgstr "" msgid "The resource cannot be null" msgstr "El recurso no puede ser nulo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:341 msgid "Group path" msgstr "Path del grupo" @@ -86,12 +86,13 @@ msgstr "Crear trabajador virtual" #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61 #: libreplan-webapp/src/main/webapp/materials/materials.zul:86 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:88 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 @@ -149,12 +150,12 @@ msgstr "Parte de trabajo borrado con éxito" msgid "It can not be empty" msgstr "No puede estar vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:145 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:55 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:147 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 #: libreplan-webapp/src/main/webapp/templates/templates.zul:66 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 @@ -201,13 +202,13 @@ msgid "Summary" msgstr "Resumen" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "Formularios de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 msgid "Reports" msgstr "Informes" @@ -241,8 +242,8 @@ msgstr "" msgid "Dedication chart" msgstr "Gráfico de dedicación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:702 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:729 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:689 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:716 msgid "Progress that are reported by quality forms can not be modified" msgstr "" "El progreso notificado por formularios de calidad no pueden ser modificado" @@ -263,7 +264,7 @@ msgstr "No se puede borrar ese material porque está asignado a un projecto." msgid "Remove limiting resource element" msgstr "Borrar elemento de recurso limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 msgid "Resource Usage" @@ -278,7 +279,7 @@ msgid "Unassign" msgstr "Desasignar" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:302 msgid "Companies" msgstr "Empresas" @@ -286,7 +287,7 @@ msgstr "Empresas" msgid "Manual assignment" msgstr "Asignación manual" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:74 msgid "Quality form items list" msgstr "Lista de elementos del formulario de calidad" @@ -308,7 +309,7 @@ msgstr "Crear {0}: {1}" msgid "generic workers allocation" msgstr "asignación genérica de trabajadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:890 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:898 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308 msgid "The project has no scheduled elements" msgstr "El proyecto no tiene elementos planificados" @@ -352,7 +353,7 @@ msgstr "Capacidad de recursos" msgid "changing perspective" msgstr "cambio de perspectiva" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31 msgid "Transfer Projects Between Scenarios" msgstr "Transferir proyectos entre escenarios" @@ -375,11 +376,11 @@ msgid "Project Name" msgstr "Nombre del proyecto" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:938 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:966 msgid "Indent" msgstr "Indentar" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:314 msgid "Save passwords in database" msgstr "Guardar contraseñas en la base de datos" @@ -413,7 +414,7 @@ msgstr "Lista de excepciones" msgid "Locations" msgstr "Ubicaciones" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:78 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77 msgid "New quality form item" msgstr "Nuevo elemento del formulario de calidad" @@ -421,7 +422,7 @@ msgstr "Nuevo elemento del formulario de calidad" msgid "LibrePlan: Labels" msgstr "LibrePlan: Etiquetas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:269 msgid "LDAP connection was successful" msgstr "La conexión con el LDAP se ha realizado con éxito" @@ -429,11 +430,6 @@ msgstr "La conexión con el LDAP se ha realizado con éxito" msgid "Login name" msgstr "Nombre de usuario" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 -msgid "LibrePlan user" -msgstr "Usuario de LibrePlan" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84 msgid "{0} List" msgstr "{0} Lista" @@ -463,7 +459,7 @@ msgstr "" "aplicables a este recurso" #: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:53 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 #: libreplan-webapp/src/main/webapp/templates/templates.zul:65 msgid "Criterion Requirement" msgstr "Criterio requerido" @@ -514,6 +510,10 @@ msgstr "" "no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede " "añadir la asignación genérica" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:334 +msgid "Role search strategy" +msgstr "Estrategia para la búsqueda de roles" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478 msgid "Error on showing warning message removing calendar: " msgstr "Error al mostrar mensaje de advertencia borrando calendario: " @@ -530,11 +530,11 @@ msgstr "el nombre de la categoría de materiales debe ser único. Ya está en us #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46 msgid "Imputed hours" msgstr "Horas imputadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37 msgid "Project Costs Per Resource" msgstr "Costes de proyecto por recurso" @@ -572,11 +572,15 @@ msgstr "" "{0} no es válido, criterionType se solapa con otro criterionSatisfaction del " "mismo criterionType" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +msgid "Group strategy" +msgstr "Estrategia de grupo" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 msgid "Work Report Lines" msgstr "Líneas de parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1546 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1555 msgid "Configure" msgstr "Configurar" @@ -587,7 +591,7 @@ msgstr "Octubre" #: libreplan-webapp/src/main/webapp/settings/settings.zul:58 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:51 msgid "First name" msgstr "Nombre" @@ -602,8 +606,8 @@ msgstr "Campos de texto complementario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar el borrado de {0}. ¿Está seguro?" @@ -612,11 +616,11 @@ msgstr "Confirmar el borrado de {0}. ¿Está seguro?" msgid "Work Reports List" msgstr "Lista de partes de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 msgid "Accounts" msgstr "Cuentas" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:85 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:87 msgid "External code" msgstr "Código externo" @@ -642,7 +646,7 @@ msgstr "Materiales requeridos" msgid "resources per day must be not empty and bigger than zero" msgstr "los recursos por día deben ser no vacíos y mayores que cero" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:341 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:349 msgid "Backwards" msgstr "Atrás" @@ -656,7 +660,7 @@ msgid "Apply filtering to resources satisfying required criteria" msgstr "" "Aplicar filtrado a los recursos que satisfacen los criterios requeridos" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:106 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105 msgid "Up" msgstr "Arriba" @@ -704,6 +708,10 @@ msgstr "" "El valor no es válido, el valor máximo por defecto debe ser mayor que el " "valor de precisión" +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 +msgid "missing worker code in the work report" +msgstr "falta código de trabajador en un parte de trabajo" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 @@ -715,16 +723,12 @@ msgstr "" msgid "End date" msgstr "Fecha de fin" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 -msgid "missing worker code in the work report" -msgstr "falta código de trabajador en un parte de trabajo" - #: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89 msgid "profile name is already being used by another profile" msgstr "el nombre del perfil ya está siendo usado por otro perfil" #: libreplan-webapp/src/main/webapp/settings/settings.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:78 msgid "E-mail" msgstr "Correo electrónico" @@ -738,8 +742,8 @@ msgstr "Este proyecto ya ha sido añadido." msgid "The task code cannot be null" msgstr "El código de la tarea no puede ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:593 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:594 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:327 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 @@ -788,7 +792,7 @@ msgstr "" msgid "Personal data" msgstr "Datos personales" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:720 msgid "Calculated progress can not be removed" msgstr "El progreso calculado no se puede borrar" @@ -812,11 +816,11 @@ msgstr "{0} anotación obligatoria en {1}" msgid "June" msgstr "Junio" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1038 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1066 msgid "Modified" msgstr "Modificado" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 msgid "Add Criterion" msgstr "Añadir criterio" @@ -824,7 +828,7 @@ msgstr "Añadir criterio" msgid "You can not remove the current scenario" msgstr "No se puede borrar el escenario actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:680 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "" "formato de prefijo inválido. No puede estar vacío o contener espacios en " @@ -871,7 +875,7 @@ msgstr "Lista de tareas subcontratadas" msgid "Average of worked hours in finished applications" msgstr "Media de horas trabajadas en las aplicaciones finalizadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:706 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:693 msgid "Calculated progress can not be modified" msgstr "El progreso calculado no se puede modificar" @@ -892,12 +896,12 @@ msgstr "Editar calendario" msgid "Profile" msgstr "Perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 msgid "Materials Needs At Date" msgstr "Necesidades de materiales en fecha" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:277 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:279 msgid "UserDn" msgstr "UserDn" @@ -980,7 +984,7 @@ msgstr "Se perderán los cambios sin guardar. ¿Le gustaría continuar?" msgid "NON_LIMITING" msgstr "NO_LIMITANTE" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297 msgid "Workers" msgstr "Trabajadores" @@ -1020,7 +1024,7 @@ msgstr "nombre del perfil no especificado" msgid "Date Start" msgstr "Fecha de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1275 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 msgid "Value is not valid, the current value must be less than max value" msgstr "" "El valor no es válido, el valor actual debe ser menor que el valor máximo" @@ -1028,7 +1032,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: libreplan-webapp/src/main/webapp/planner/order.zul:108 +#: libreplan-webapp/src/main/webapp/planner/order.zul:105 msgid "Value" msgstr "Valor" @@ -1041,7 +1045,7 @@ msgid "there are no valid periods for this calendar" msgstr "no hay períodos válidos para este calendario" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:93 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:95 msgid "Add role" msgstr "Añadir rol" @@ -1052,8 +1056,8 @@ msgstr "" "La fecha de fin de una excepción debe ser mayor o igual que la fecha de " "inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:443 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:444 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:454 msgid "Repeated Project code {0} in Project {1}" msgstr "Código {0} de proyecto repetdio en proyecto {1}" @@ -1086,11 +1090,11 @@ msgid "Type data" msgstr "Datos del tipo" #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 msgid "Profiles" msgstr "Perfiles" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:256 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 msgid "Host" msgstr "Host" @@ -1152,7 +1156,7 @@ msgstr "Cambiar escenario" msgid "Critical path" msgstr "Camino crítico" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:260 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:262 msgid "" "Deleting this item, it will disable the report progress option. Are you sure?" msgstr "" @@ -1194,11 +1198,11 @@ msgid "Cancel changes and back to scheduling" msgstr "Cancelar cambios y volver a la planificación" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: libreplan-webapp/src/main/webapp/planner/order.zul:109 +#: libreplan-webapp/src/main/webapp/planner/order.zul:106 msgid "Percentage" msgstr "Porcentaje" @@ -1241,12 +1245,12 @@ msgstr "Tipo de excepción" msgid "Profiles List" msgstr "Lista de Perfiles" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:919 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:51 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:914 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 @@ -1258,12 +1262,12 @@ msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" "{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 msgid "Data Types" msgstr "Tipos de datos" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:155 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 msgid "Total hours" msgstr "Total de horas" @@ -1328,13 +1332,13 @@ msgstr "ya asignado" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:131 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:133 #: libreplan-webapp/src/main/webapp/common/configuration.zul:139 -#: libreplan-webapp/src/main/webapp/planner/order.zul:154 +#: libreplan-webapp/src/main/webapp/planner/order.zul:151 msgid "Calendar" msgstr "Calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:307 #: libreplan-webapp/src/main/webapp/common/configuration.zul:119 msgid "Resources" msgstr "Recursos" @@ -1368,11 +1372,15 @@ msgstr "a" msgid "worker's first name not specified" msgstr "nombre del trabajador no especificado" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:337 +msgid "Property strategy" +msgstr "Estrategia de propiedad" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281 msgid "date not specified" msgstr "fecha no especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206 msgid "Projects Planning" @@ -1382,13 +1390,13 @@ msgstr "Planificación de proyectos" msgid "Shrink to fit page width" msgstr "Reducir para ajustar al ancho de página" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:773 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:760 msgid "The max value must be greater than 0" msgstr "El valor máximo debe ser mayor que 0" #: libreplan-webapp/src/main/webapp/settings/settings.zul:63 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:56 msgid "Last name" msgstr "Apellidos" @@ -1413,13 +1421,13 @@ msgstr "SPI" msgid "Progress Type" msgstr "Tipo de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1295 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1304 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "" "La tarea contiene progreso consolidado. No se puede aplicar la función " "sigmoide." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:307 msgid "UserId" msgstr "UserId" @@ -1444,7 +1452,7 @@ msgstr "el código no puede ser nulo o vacío" msgid "Create New Project" msgstr "Crear proyecto nuevo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1430 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1439 msgid "Stretches list" msgstr "Lista de tramos" @@ -1456,7 +1464,7 @@ msgstr "Habilitar módulo de escenarios" msgid "Zoom" msgstr "Zoom" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:829 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:833 #: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 @@ -1475,16 +1483,16 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: libreplan-webapp/src/main/webapp/materials/materials.zul:115 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 #: libreplan-webapp/src/main/webapp/templates/templates.zul:135 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:376 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:384 msgid "Save" msgstr "Guardar" @@ -1497,9 +1505,9 @@ msgstr "Esfuerzo estándar" msgid "Material categories" msgstr "Categorías de materiales" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:576 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:674 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:603 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 msgid "number of digits must be between {0} and {1}" msgstr "el número de dígitos debe estar entre {0} y {1}" @@ -1527,7 +1535,8 @@ msgstr "Problemas conectando con el servicio web subcontratista" msgid "Entity type" msgstr "Tipo de entidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1023 msgid "Unsaved changes will be lost. Are you sure?" msgstr "Se perderán los cambios sin guardar. ¿Está seguro?" @@ -1583,11 +1592,11 @@ msgstr "Expandir/Plegar todo" msgid "Overload due to current project" msgstr "Sobrecarga debido al proyecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:902 msgid "Name: {0}" msgstr "Nombre: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:874 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:902 msgid "Move down" msgstr "Mover abajo" @@ -1619,12 +1628,12 @@ msgstr "Datos generales" msgid "BAC" msgstr "BAC" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:379 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:381 msgid "Calculate Number of Hours" msgstr "Calcular número de horas" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:105 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:104 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 msgid "Assign" @@ -1634,7 +1643,7 @@ msgstr "Asignar" msgid "missing code in a criterion" msgstr "falta código en un criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1273 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281 msgid "Create Template" msgstr "Crear plantilla" @@ -1793,7 +1802,7 @@ msgstr "el nombre no puede ser nulo o vacío" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: libreplan-webapp/src/main/webapp/planner/order.zul:110 +#: libreplan-webapp/src/main/webapp/planner/order.zul:107 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 @@ -1810,7 +1819,7 @@ msgstr "Añadir a partir de plantilla" msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Los recursos asignados para esta tarea serán borrados. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:678 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" @@ -1827,7 +1836,7 @@ msgstr "Filtrar por mes" msgid "The criterion and its type cannot be null" msgstr "El criterio y su tipo no pueden ser nulos" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:421 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:422 msgid "The quality form must have an item with 100% value to report progress" msgstr "" "El formulario de calidad debe tener un ítem con valor 100% para notificar " @@ -1841,6 +1850,10 @@ msgstr "Julio" msgid "The code is not valid. There is another unit type with the same code" msgstr "El código no es válido. Hay otro tipo de unidad con el mismo código" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +msgid "Enable LDAP authentication" +msgstr "Habilitar la autenticación LDAP" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 msgid "( max: {0} )" msgstr "( máx: {0} )" @@ -1861,6 +1874,7 @@ msgstr "No se pueden calcular gráficos para los datos actuales" msgid "Select queue" msgstr "Seleccionar cola" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1499 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173 msgid "project name already being used" msgstr "el nombre de proyecto ya está siendo usado" @@ -1869,7 +1883,7 @@ msgstr "el nombre de proyecto ya está siendo usado" msgid "Work description" msgstr "Descripción del trabajo" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:61 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 msgid "Split assignment" msgstr "Dividir asignación" @@ -1893,7 +1907,7 @@ msgstr "No se puede borrar el escenario por defecto, llamado \"{0}\"" msgid "direct link" msgstr "enlace directo" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:112 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:111 msgid "Down" msgstr "Abajo" @@ -1907,13 +1921,13 @@ msgstr "Abajo" msgid "Label" msgstr "Etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:841 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:869 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" "El valor no es válido, teniendo en cuenta la lista actual de grupos de horas" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:92 msgid "Association with roles" msgstr "Asociación con roles" @@ -1925,8 +1939,8 @@ msgstr "falta el tipo de horas en una línea del parte de trabajo" msgid "Quality forms" msgstr "Formularios de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:466 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:467 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:477 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "Código {0} de grupo de horas repetido en proyecto {1}" @@ -1975,7 +1989,7 @@ msgstr "Pesimista" msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -2013,11 +2027,11 @@ msgstr "Retraso desde el comienzo (en días)" msgid "Resource cannot be null" msgstr "El recurso no puede ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:455 msgid "Total Hours" msgstr "Horas totales" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:374 msgid "LibrePlan Role" msgstr "Rol LibrePlan" @@ -2029,28 +2043,32 @@ msgstr "Crear tipo de progreso" msgid "Confirm cancel" msgstr "Confirmar cancelación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37 msgid "Work And Progress Per Task" msgstr "Trabajo y progreso por tarea" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1523 +msgid "project code already being used" +msgstr "el código del proyecto ya está siendo usado" + #: libreplan-webapp/src/main/webapp/orders/_edition.zul:40 msgid "WBS (tasks)" msgstr "EDT (tareas)" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:843 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:878 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 msgid "Error on showing removing element: " msgstr "Error al mostrar el elemento a borrar: " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:728 msgid "Deleting sequence" msgstr "Borrando secuencia" @@ -2119,11 +2137,15 @@ msgstr "Histórico de asignación" msgid "CutycaptTimeout thread exception" msgstr "Excepción de thread CutycaptTimeout" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "Modelos de partes de trabajo" +#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 +msgid "New" +msgstr "Nuevo" + #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 msgid "Date last progress measurement" msgstr "Fecha de la última medida de progreso" @@ -2148,7 +2170,7 @@ msgstr "" "El calendario no se puede borrar porque aún tiene hijos. Algún otro " "calendario deriva de este." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:907 msgid "Value is not valid, the type must be not empty" msgstr "El valor no es válido, el tipo no debe ser vacío" @@ -2168,21 +2190,16 @@ msgstr "No se permite consolidar progreso." msgid "Create Task" msgstr "Crear tarea" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 -msgid "LDAP Authentication enabled" -msgstr "Autenticación con LDAP activada" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" msgstr "Empresa externa" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:99 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:101 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:131 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 @@ -2202,7 +2219,7 @@ msgstr "Preferencias de usuario" msgid "Start hour" msgstr "Hora de inicio" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:140 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 msgid "Assign materials" msgstr "Asignar materiales" @@ -2221,7 +2238,7 @@ msgstr "los filtros de formato no son válidos" msgid "ID" msgstr "NIF" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:349 msgid "Settings" msgstr "Preferencias" @@ -2263,7 +2280,7 @@ msgstr "Grupo de horas" msgid "Unallocated name" msgstr "Nombre no asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:895 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:923 msgid "Move up" msgstr "Mover arriba" @@ -2276,14 +2293,14 @@ msgid "Subcontract communication date" msgstr "Fecha de comunicación de la subcontratación" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:359 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:365 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 msgid "Scheduling" msgstr "Planificación" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:126 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:128 msgid "Dependencies have priority" msgstr "Las dependencias tienen prioridad" @@ -2315,9 +2332,9 @@ msgstr "Página arriba" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:910 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:159 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 msgid "State" @@ -2327,11 +2344,11 @@ msgstr "Estado" msgid "Must start after" msgstr "Debe empezar después" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1306 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1315 msgid "Confirm change" msgstr "Confirmar cambio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:848 msgid "You don't have permissions to edit this project" msgstr "No tiene permisos para editar este proyecto" @@ -2372,7 +2389,7 @@ msgstr "LibrePlan: Materiales" msgid "New task" msgstr "Nueva tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:191 msgid "The password for a new user cannot be empty" msgstr "La contraseña no puede ser vacía para un usuario nuevo" @@ -2462,7 +2479,7 @@ msgstr "nombre del criterio no especificado" msgid "Value is not valid, the default max value must not be empty " msgstr "El valor no es válido, el valor máximo por defecto no debe ser nulo " -#: libreplan-webapp/src/main/webapp/common/configuration.zul:343 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 msgid "Role property" msgstr "Propiedad del rol" @@ -2487,15 +2504,15 @@ msgstr "Asignación recomendada" msgid "Activation" msgstr "Activación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 msgid "Scenarios" msgstr "Escenarios" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375 msgid "Materials saved" msgstr "Materiales guardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1252 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." @@ -2503,7 +2520,7 @@ msgstr "" "Esta medida de progreso no puede estar en la fecha actual, porque está " "consolidada. Debe seleccionar otra fecha." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37 msgid "Total Worked Hours By Resource In A Month" msgstr "Total horas trabajadas por recurso en un mes" @@ -2520,7 +2537,7 @@ msgstr "Buffer de tareas de entrada" msgid "At least one {0} sequence must be active" msgstr "Al menos una secuencia de {0} debe estar activa" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:130 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 @@ -2543,7 +2560,7 @@ msgstr "Debe seleccionar un escenario de origen" msgid "At least one {0} sequence is needed" msgstr "Se necesita al menos una secuencia de {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37 msgid "Estimated/Planned Hours Per Task" msgstr "Horas por tarea estimadas/planificadas" @@ -2556,7 +2573,11 @@ msgstr "LibrePlan: Categorías de coste" msgid "Assigned" msgstr "Asignado" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:45 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:244 +msgid "Use LDAP roles" +msgstr "Usar roles del LDAP" + +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:44 msgid "Details" msgstr "Detalles" @@ -2593,7 +2614,7 @@ msgstr "Fecha más temprana" msgid "LibrePlan: Work And Progress Per Task" msgstr "LibrePlan: trabajo y progreso por tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 msgid "Change Password" msgstr "Cambiar la contraseña" @@ -2601,14 +2622,15 @@ msgstr "Cambiar la contraseña" msgid "Projects" msgstr "Proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:264 -msgid "Confirm exit dialog" -msgstr "Diálogo para confirmar la salida" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64 msgid "Not found converter for {0}" msgstr "No se encontró un conversor para {0}" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:272 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1024 +msgid "Confirm exit dialog" +msgstr "Diálogo para confirmar la salida" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 msgid "Material assignments" msgstr "Asignaciones de materiales" @@ -2637,7 +2659,7 @@ msgstr "" msgid "Question" msgstr "Pregunta" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." @@ -2696,7 +2718,7 @@ msgstr "Registro de trabajo" msgid "Output format" msgstr "Formato de salida" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:44 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47 msgid "Print" msgstr "Imprimir" @@ -2731,25 +2753,24 @@ msgstr "El esfuerzo no puede ser nulo" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:138 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:157 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:142 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 #: libreplan-webapp/src/main/webapp/templates/templates.zul:139 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:379 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:387 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 -#: libreplan-webapp/src/main/webapp/planner/order.zul:73 -#: libreplan-webapp/src/main/webapp/planner/order.zul:134 -#: libreplan-webapp/src/main/webapp/planner/order.zul:169 +#: libreplan-webapp/src/main/webapp/planner/order.zul:131 +#: libreplan-webapp/src/main/webapp/planner/order.zul:166 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 msgid "Cancel" msgstr "Cancelar" @@ -2778,8 +2799,8 @@ msgstr "Lista de máquinas" msgid "CPI" msgstr "CPI" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:687 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:695 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318 msgid "You don't have read access to this project" msgstr "No tiene acceso de lectura a este proyecto" @@ -2848,11 +2869,11 @@ msgstr "nombre" msgid "Delete selected task" msgstr "Borrar tarea seleccionada" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:126 msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:470 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 msgid "end" msgstr "fin" @@ -2860,7 +2881,7 @@ msgstr "fin" msgid "Cost Category" msgstr "Categoría de coste" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:357 msgid "Role search query" msgstr "Consulta para la búsqueda de roles" @@ -2886,7 +2907,7 @@ msgstr "Editar tarea {0}" msgid "Start date cannot be null" msgstr "La fecha de inicio no puede ser nula" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 msgid "Subcontracting" msgstr "Subcontratación" @@ -2894,7 +2915,7 @@ msgstr "Subcontratación" msgid "references" msgstr "referencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1278 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1264 msgid "Value is not valid, the Precision value must be exact " msgstr "El valor no es válido, el valor de precisión debe ser exacto " @@ -2914,7 +2935,7 @@ msgstr "Valor máximo por defecto" msgid "Add criterion requirement" msgstr "Añadir criterio requerido" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:855 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 msgid "" "You can not remove the project \"{0}\" because of any of its tasks are " "already in use in some work reports and the project just exists in the " @@ -2957,7 +2978,7 @@ msgstr "LibrePlan: Cambiar la contraseña" msgid "please, select a label" msgstr "por favor, seleccione una etiqueta" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:125 msgid "Add profile" msgstr "Añadir perfil" @@ -2979,7 +3000,7 @@ msgstr "falta el código en los datos de versión de un calendario" msgid "Criterion name" msgstr "Nombre del criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:127 msgid "values are not valid, the values must not be null" msgstr "los valores no son válidos, no deben ser nulos" @@ -2997,7 +3018,7 @@ msgstr "Nombre de la tarea" msgid "cost assignment's resource not specified" msgstr "recurso de la asignación de coste no especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:132 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 @@ -3031,7 +3052,7 @@ msgid "the name must be not empty" msgstr "el nombre no puede ser vacío" #: libreplan-webapp/src/main/webapp/materials/materials.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:71 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Disabled" msgstr "Deshabilitado" @@ -3070,8 +3091,8 @@ msgstr "" "intentando crear unha plantilla a partir de una tarea nueva.\n" "Por favor guarde su proyecto antes de continuar." -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1109 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1124 msgid "{0} not supported yet" msgstr "{0} aún no soportado" @@ -3092,7 +3113,7 @@ msgstr "Algunas secuencias para borrar no existen" msgid "Resources Load" msgstr "Carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:241 msgid "Changes have been canceled" msgstr "Cambios cancelados" @@ -3100,7 +3121,7 @@ msgstr "Cambios cancelados" msgid "LibrePlan: Hours Worked Per Worker In A Month" msgstr "LibrePlan: Horas trabajadas por trabajador en un mes" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:297 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 msgid "Authentication" msgstr "Autenticación" @@ -3162,7 +3183,7 @@ msgstr "Propagación" msgid "Select start date" msgstr "Seleccionar fecha de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:877 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 msgid "Removed {0}" msgstr "{0} borrado" @@ -3181,7 +3202,7 @@ msgid "Group name" msgstr "Nombre del grupo" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:100 msgid "Role name" msgstr "Nombre del rol" @@ -3223,11 +3244,11 @@ msgstr "Añadir hito" msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:449 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:450 msgid "init" msgstr "inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1215 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1201 msgid "Add new progress measurement" msgstr "Añadir nueva medida de progreso" @@ -3235,7 +3256,7 @@ msgstr "Añadir nueva medida de progreso" msgid "Select for automatic queuing" msgstr "Seleccione para encolar automáticamente" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 msgid "Scenarios Management" msgstr "Administración de escenarios" @@ -3247,7 +3268,7 @@ msgstr "Proyecto {0} transferido" msgid "Create & Assign" msgstr "Crear y asignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1549 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1558 msgid "Not configurable" msgstr "No configurable" @@ -3255,7 +3276,7 @@ msgstr "No configurable" msgid "Advanced allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/webapp/planner/order.zul:111 +#: libreplan-webapp/src/main/webapp/planner/order.zul:108 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96 msgid "Consolidated" @@ -3290,7 +3311,7 @@ msgstr "LibrePlan: Acceso de usuarios" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:109 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:111 msgid "Customer" msgstr "Cliente" @@ -3305,17 +3326,19 @@ msgstr "Tipo de horas" msgid "criterion type name not specified" msgstr "nombre del tipo de criterio no especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:246 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 msgid "Cannot connect to LDAP server" msgstr "No se puede conectar al servidor de LDAP" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219 msgid "Add Exception" msgstr "Añadir excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:301 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:322 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:303 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:378 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:219 msgid "cannot be empty" msgstr "no puede ser vacío" @@ -3400,8 +3423,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:441 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 @@ -3429,7 +3452,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 #: libreplan-webapp/src/main/webapp/materials/materials.zul:58 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 @@ -3443,7 +3466,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 #: libreplan-webapp/src/main/webapp/templates/templates.zul:80 @@ -3494,11 +3517,11 @@ msgstr "Día de la semana" msgid "Companies List" msgstr "Lista de empresas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1462 msgid "Stretches with Interpolation" msgstr "Tramos con interpolación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37 msgid "Hours Worked Per Resource" msgstr "Horas trabajadas por recurso" @@ -3588,22 +3611,22 @@ msgstr "Asignación: [{0},{1}]" msgid "Virtual Workers Group" msgstr "Grupo de trabajadores virtuales" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:225 msgid "Changes saved" msgstr "Cambios guardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1258 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1266 msgid "See scheduling" msgstr "Ver planificación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:328 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110 msgid "Progress measurements" msgstr "Medidas de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1200 msgid "Add measure" msgstr "Añadir medida" @@ -3632,7 +3655,7 @@ msgstr "Relación" msgid "End" msgstr "Fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1346 msgid "The date is not valid, the date must be not empty" msgstr "La fecha no es válida, no debe ser vacía" @@ -3641,7 +3664,7 @@ msgid "User login name" msgstr "Nombre de usuario" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 msgid "Cost Categories" msgstr "Categorías de coste" @@ -3667,7 +3690,7 @@ msgstr "Lista de usuarios" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:57 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56 msgid "Task quality forms" msgstr "Formularios de calidad de tarea" @@ -3684,7 +3707,7 @@ msgstr "Tipos de progreso" msgid "Cost category" msgstr "Categoría de coste" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:700 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:727 msgid "It can not be deleted. At least one sequence is necessary." msgstr "No se puede borrar. Al menos una secuencia es necesaria." @@ -3734,26 +3757,26 @@ msgstr "Añadir nuevo campo de tipo de etiqueta" msgid "Time finish cannot be null" msgstr "La hora de fin no puede ser nula" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:116 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:118 msgid "Customer reference" msgstr "Referencia de cliente" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:688 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:891 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:927 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:849 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319 msgid "Information" msgstr "Información" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:926 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:934 msgid "Sorry, you do not have permissions to access this project" msgstr "Lo sentimos, no tiene permisos para acceder a este proyecto" @@ -3773,6 +3796,10 @@ msgstr "no se puede pasar mientras el elemento no anterior sea pasado." msgid "New hours group " msgstr "Nuevo grupo de horas " +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +msgid "Please remember that only saved changes will be printed" +msgstr "Por favor recuerda que sólo los cambios guardados serán impresos" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 msgid "Assign element to queue manually" msgstr "Asignar elemento a cola manualmente" @@ -3785,11 +3812,11 @@ msgstr "Editar Plantilla" msgid "Resource: {0} " msgstr "Recurso: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:358 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:360 msgid "percentage cannot be duplicated" msgstr "el porcentaje no puede estar duplicado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 msgid "Work Hours" msgstr "Horas de trabajo" @@ -3843,8 +3870,8 @@ msgstr "Asignaciones de trabajador" #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:305 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:328 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221 msgid "{0} already exists" msgstr "{0} ya existe" @@ -3862,20 +3889,20 @@ msgid "Code " msgstr "Código" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:65 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:66 msgid "Password confirmation" msgstr "Confirmación de contraseña" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 -msgid "Work Report" -msgstr "Parte de trabajo" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 msgid "Indent selected task" msgstr "Indentar tarea seleccionada" +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 +msgid "Work Report" +msgstr "Parte de trabajo" + #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 #: libreplan-webapp/src/main/webapp/common/configuration.zul:135 msgid "Unit Measures" msgstr "Unidades de medida" @@ -3885,11 +3912,11 @@ msgstr "Unidades de medida" msgid "Show progress" msgstr "Mostrar progreso" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:142 msgid "Work" msgstr "Trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:297 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 msgid "" "Error saving the project\n" "{0}" @@ -3911,9 +3938,9 @@ msgstr "LibrePlan: Máquinas" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:299 #: 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:1296 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 msgid "Error" msgstr "Error" @@ -3954,7 +3981,7 @@ msgstr "" "criterionType" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 -#: libreplan-webapp/src/main/webapp/planner/order.zul:83 +#: libreplan-webapp/src/main/webapp/planner/order.zul:80 msgid "Progress consolidation" msgstr "Consolidación de progreso" @@ -3983,7 +4010,7 @@ msgstr "Recurso limitante" msgid "Task Information" msgstr "Información de la tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:140 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:145 msgid "Hours Group at " msgstr "Grupo de horas en " @@ -4006,7 +4033,7 @@ msgstr "un día está vacío" msgid "Budgeted Cost Work Scheduled" msgstr "Coste de trabajo presupuestado planificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 msgid "Changes applied" msgstr "Cambios aplicados" @@ -4038,7 +4065,7 @@ msgstr "Desviación en coste" msgid "criterion type does not allow resource hierarchy" msgstr "el tipo de criterio no permite jerarquía de recursos" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:150 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:152 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 msgid "Total" @@ -4061,8 +4088,8 @@ msgstr "Editar tarea: {0}" msgid "Select destination" msgstr "Seleccionar destino" -#: libreplan-webapp/src/main/webapp/planner/order.zul:92 -#: libreplan-webapp/src/main/webapp/planner/order.zul:98 +#: libreplan-webapp/src/main/webapp/planner/order.zul:89 +#: libreplan-webapp/src/main/webapp/planner/order.zul:95 msgid "Check consolidated progresses" msgstr "Marcar progresos consolidados" @@ -4090,7 +4117,7 @@ msgid "Apply tab changes" msgstr "Aplicar cambios de la pestaña" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:93 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:170 msgid "passwords don't match" msgstr "las contraseñas no conciden" @@ -4118,7 +4145,7 @@ msgstr "nuevo hito" msgid "Value last progress reported" msgstr "Valor último progreso notificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 msgid "Report Progress" msgstr "Notificar progreso" @@ -4126,7 +4153,7 @@ msgstr "Notificar progreso" msgid "Show dependencies" msgstr "Mostrar dependencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Schedule from start to deadline" msgstr "Planificar desde el principio a la fecha límite" @@ -4162,7 +4189,7 @@ msgstr "LibrePlan: Días de excepción" msgid "LibrePlan: Work Hours" msgstr "LibrePlan: Horas de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 msgid "LibrePlan Configuration" msgstr "LibrePlan: Configuración" @@ -4212,7 +4239,7 @@ msgstr "Tipo de excepción" msgid "In the available periods {0} only {1} hours are available." msgstr "En los períodos disponibles {0} solo {1} horas están disponibles." -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:118 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120 msgid "Association with profiles" msgstr "Asociación con perfiles" @@ -4246,11 +4273,11 @@ msgstr "Preferencias de la aplicación" msgid "Average of estimated hours" msgstr "Media de horas estimadas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:270 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:272 msgid "Base" msgstr "Base" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:683 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4270,7 +4297,7 @@ msgstr "Seleccionar origen" msgid "Worker deleted" msgstr "Trabajador borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:760 msgid "Select entity, please" msgstr "Seleccionar entidad, por favor" @@ -4362,7 +4389,7 @@ msgstr "El nombre del campo debe ser único, no nulo y no vacío" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 msgid "Position" msgstr "Posición" @@ -4388,7 +4415,7 @@ msgstr "Recursos limitantes (proyecto)" msgid "A description field of the same name already exists." msgstr "Ya existe un campo de descripción con el mismo nombre." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1177 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1163 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" @@ -4435,7 +4462,7 @@ msgstr "Datos del perfil" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 #: libreplan-webapp/src/main/webapp/common/configuration.zul:35 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:248 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:250 msgid "Configuration" msgstr "Configuración" @@ -4457,11 +4484,11 @@ msgid "Select type" msgstr "Seleccione tipo" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:911 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:906 msgid "Hours invested" msgstr "Horas invertidas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:326 msgid "Authorization" msgstr "Autorización" @@ -4471,7 +4498,7 @@ msgid "" msgstr "" "El nombre no es válido, ya hay otro tipo de progreso con el mismo nombre. " -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 msgid "Project saved" msgstr "Proyecto guardado" @@ -4491,7 +4518,7 @@ msgstr "recurso del criterio satisfecho no especificado" msgid "Derived exception" msgstr "Excepción derivada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 msgid "Machines" msgstr "Máquinas" @@ -4499,7 +4526,7 @@ msgstr "Máquinas" msgid "Unit Measures List" msgstr "Lista de unidades de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:153 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:149 msgid "Couldn't find element: {0}" msgstr "No se pudo encontrar el elemento: {0}" @@ -4512,7 +4539,7 @@ msgstr "Debe seleccionar un escenario de destino" msgid "unit type code not found" msgstr "código de tipo de unidad no encontrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:348 msgid "My account" msgstr "Mi cuenta" @@ -4528,7 +4555,7 @@ msgstr "Vista de la compañía" msgid "Both" msgstr "Ambos" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:758 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:764 msgid "Not editable for containing more that an hours group." msgstr "No editable por contener más de un grupo de horas." @@ -4542,7 +4569,7 @@ msgid "Limiting resource" msgstr "Recurso limitante" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58 -#: libreplan-webapp/src/main/webapp/planner/order.zul:146 +#: libreplan-webapp/src/main/webapp/planner/order.zul:143 msgid "Calendar allocation" msgstr "Asignación de calendario" @@ -4558,7 +4585,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/materials/materials.zul:84 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:120 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 msgid "Category" msgstr "Categoría" @@ -4576,7 +4603,7 @@ msgstr "[genérico todos los trabajadores]" msgid "Category data" msgstr "Datos de categoría" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:103 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:102 msgid "Search" msgstr "Buscar" @@ -4617,11 +4644,11 @@ msgstr "Borrar calendario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1323 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1331 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:251 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 msgid "must be lower than finish date" msgstr "debe ser menor que la fecha de fin" @@ -4651,7 +4678,7 @@ msgstr "Fecha último progreso notificado" msgid "Could not load any resource" msgstr "No se pudo cargar un recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:341 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" msgstr "Trabajo y progreso por proyecto" @@ -4716,8 +4743,8 @@ msgstr "Datos de la empresa" msgid "Unit type code cannot be empty" msgstr "El código del tipo de unidad no puede ser vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:183 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 msgid "Users" msgstr "Usuarios" @@ -4833,11 +4860,11 @@ msgstr "Filtrar por trabajadores" msgid "Load due to current project" msgstr "Carga debido al proyecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1314 msgid "You are going to change the assignment function. Are you sure?" msgstr "Va a cambiar la función de asignación. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 msgid "Exception Days" msgstr "Días de excepción" @@ -4858,13 +4885,13 @@ msgstr "Actualización incompatible: el recurso almacenado no es de tipo: {0}" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 #: libreplan-webapp/src/main/webapp/templates/templates.zul:137 msgid "Save & Continue" msgstr "Guardar y continuar" @@ -4873,7 +4900,7 @@ msgstr "Guardar y continuar" msgid "LibrePlan: Work And Progress Per Project" msgstr "LibrePlan: Trabajo y Progreso por Proyecto" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:90 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:92 msgid "Scheduling mode" msgstr "Modo de planificación" @@ -4913,11 +4940,16 @@ msgstr "ACWP" msgid "The periods available depend on the resource's calendar." msgstr "Los períodos de disponibilidad dependen del calendario del recurso." +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:83 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +msgid "Authentication type" +msgstr "Tipo de autenticación" + #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:55 msgid "START" msgstr "INICIO" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:350 msgid "Schedule from the deadline to start" msgstr "Planificar desde la fecha límite al principio" @@ -4929,8 +4961,9 @@ msgstr "asignación genérica de máquinas" msgid "Non limiting resource assignation" msgstr "Asignación de recursos no limitantes" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:87 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 +#: libreplan-webapp/src/main/webapp/planner/order.zul:70 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 msgid "Back" msgstr "Atrás" @@ -4949,11 +4982,11 @@ msgstr "Administración" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1306 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1314 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:234 msgid "must be greater than start date" msgstr "debe ser mayor que la fecha de inicio" @@ -4978,7 +5011,7 @@ msgstr "horas trabajadas" msgid "Unit measure name" msgstr "Nombre de la unidad de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:144 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:140 msgid "cannot include a progress of the same progress type twice" msgstr "no se puede asignar un progreso del mismo tipo dos veces" @@ -5035,7 +5068,7 @@ msgstr "Total de horas de tarea" msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1063 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1071 msgid "Create project" msgstr "Crear proyecto" @@ -5050,7 +5083,7 @@ msgstr "" "Permitir valores múltiples para este tipo de criterio en el mismo período de " "tiempo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1294 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1280 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "La fecha no es válida, debe ser única para esta asignación de progreso" @@ -5087,11 +5120,11 @@ msgstr "sí" msgid "Root calendar" msgstr "Calendario raíz" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:265 msgid "Port" msgstr "Puerto" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -5130,7 +5163,7 @@ msgstr "Asignación de categoría de coste" msgid "missing code in a hour cost" msgstr "falta código en un coste por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858 msgid "All workers" msgstr "Todos los trabajadores" @@ -5152,12 +5185,14 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1492 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1516 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:738 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:765 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 @@ -5186,7 +5221,6 @@ msgstr "" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:46 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 msgid "cannot be null or empty" @@ -5205,7 +5239,7 @@ msgstr "Código nuevo" msgid "The progress type cannot be modified" msgstr "El tipo de progreso no puede ser modificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:392 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:394 msgid "Calculate Resources per Day" msgstr "Calcular recursos por día" @@ -5219,7 +5253,7 @@ msgstr "Estimación del coste pendiente" #: libreplan-webapp/src/main/webapp/materials/materials.zul:83 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 msgid "Unit type" msgstr "Tipo de unidad" @@ -5240,7 +5274,7 @@ msgstr "Esta máquina ya ha sido borrada por otro usuario" msgid "Calendar data" msgstr "Datos del calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 msgid "Work Reports" msgstr "Partes de trabajo" @@ -5279,8 +5313,8 @@ msgstr "Ya existe otra etiqueta con el mismo nombre" msgid "Customer Reference" msgstr "Referencia de cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:147 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:143 msgid "spread values are not valid, at least one value should be true" msgstr "" "los valores de propagación no son válidos, al menos uno debe ser verdadero" @@ -5313,12 +5347,12 @@ msgstr "" "El calendario por defecto no se puede. Por favor, cambie antes el calendario " "por defecto en la ventana de configuración." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:600 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:903 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 #: libreplan-webapp/src/main/webapp/templates/templates.zul:63 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 msgid "Progress" @@ -5332,7 +5366,7 @@ msgstr "" "Este tipo de criterio no se puede borrar porque tiene asignaciones a " "proyectos o recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1210 msgid "All progress types have already been assigned." msgstr "Todos los tipos de progreso ya han sido asignados." @@ -5344,7 +5378,7 @@ msgstr "Precio por hora" msgid "Project: {0} " msgstr "Proyecto: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 msgid "Calendars" msgstr "Calendarios" @@ -5383,7 +5417,7 @@ msgstr "LibrePlan: Partes de trabajo" msgid "Error on showing delete confirm" msgstr "Error al mostrar la confirmación de borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:623 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 msgid "Sum of all rows" msgstr "Suma de todas las filas" @@ -5434,7 +5468,7 @@ msgstr "Nombre de la unidad de configuración de cada trabajador" msgid "Active" msgstr "Activo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1247 msgid "This progress measurement can not be in " msgstr "Esta medida de progreso no puede estar en " @@ -5442,7 +5476,7 @@ msgstr "Esta medida de progreso no puede estar en " msgid "Inherited labels" msgstr "Etiquetas heredadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1232 msgid "" "This progress can not be changed or removed, because it has got consolidated " "progress. It is needed to remove the consolidation on all its progress." @@ -5452,12 +5486,12 @@ msgstr "" "progreso." #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:917 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:945 msgid "Unindent" msgstr "Desindentar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:935 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1384 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1370 msgid "Value is not valid, the current value must be not empty" msgstr "El valor no es válido, el valor actual no debe ser vacío" @@ -5485,7 +5519,7 @@ msgstr "Precisión" msgid "missing code in a work report line" msgstr "falta código en una línea de parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:928 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:937 msgid "Efforts" msgstr "Esfuerzos" @@ -5493,7 +5527,7 @@ msgstr "Esfuerzos" msgid "Show all reported hours" msgstr "Mostrar todas las horas notificadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 msgid "Projects List" @@ -5512,7 +5546,7 @@ msgstr "Lista de proyectos" #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:80 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:82 msgid "Generate code" msgstr "Generar código" @@ -5524,14 +5558,10 @@ msgstr "Estado de planificación" msgid "This template can not be removed because it has applications." msgstr "Esta plantilla no se puede borrar porque tiene aplicaciones." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:513 msgid "The code sequence is already in use and it can not be updated." msgstr "El código de secuencia ya está en uso y no se puede actualizar." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:332 -msgid "Import LDAP roles" -msgstr "Importar roles del LDAP" - #: libreplan-webapp/src/main/webapp/settings/settings.zul:43 msgid "Personal Data" msgstr "Datos personales" @@ -5548,7 +5578,7 @@ msgstr "LibrePlan: Horas Trabajadas Por Recurso" msgid "Number of iterations should be between 1 and " msgstr "El número de iteraciones debería estar entre 1 y " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:142 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:149 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" "Los escenarios deben estar habilitados ya que existen más elementos que " @@ -5568,7 +5598,7 @@ msgstr "Tarea {0} : El grupo de tareas tiene un tipo incompatible con {1}" msgid "Profiles authorization" msgstr "Autorización de perfiles" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Virtual Workers Groups" msgstr "Grupos de trabajadores virtuales" @@ -5632,9 +5662,9 @@ msgid "All projects" msgstr "Todos los proyectos" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:284 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:286 msgid "Password" msgstr "Contraseña" @@ -5643,7 +5673,7 @@ msgstr "Contraseña" msgid "Observations" msgstr "Observaciones" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:942 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:950 msgid "Edit project" msgstr "Editar proyecto" @@ -5682,7 +5712,7 @@ msgstr "Color" msgid "Current password is incorrect" msgstr "La contraseña actual es incorrecta" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366 msgid "Cannot insert material in general view. Please, select a category" msgstr "" "No se puede insertar material en la vista general. Por favor, seleccione una " @@ -5705,9 +5735,8 @@ msgstr "Borrar {0} \"{1}\". ¿Está seguro?" #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 -#: libreplan-webapp/src/main/webapp/planner/order.zul:70 -#: libreplan-webapp/src/main/webapp/planner/order.zul:131 -#: libreplan-webapp/src/main/webapp/planner/order.zul:166 +#: libreplan-webapp/src/main/webapp/planner/order.zul:128 +#: libreplan-webapp/src/main/webapp/planner/order.zul:163 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/main.zul:66 @@ -5715,14 +5744,14 @@ msgid "Accept" msgstr "Aceptar" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:266 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:273 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:280 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:308 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:346 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:261 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:268 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:275 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:282 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:310 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:345 #: libreplan-webapp/src/main/webapp/common/configuration.zul:353 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:361 msgid "Example: {0}" msgstr "Ejemplo: {0}" @@ -5746,7 +5775,7 @@ msgstr "Calculado" msgid "Completed: {0}% " msgstr "Completado: {0}% " -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1181 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1167 msgid "Calculated progress measurement can not be removed" msgstr "Las medidas de progreso calculadas no se pueden borrar" @@ -5849,9 +5878,9 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:77 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 @@ -5874,7 +5903,7 @@ msgstr "Mostrar las asignaciones de recursos" msgid "Assignation type" msgstr "Tipo de asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:369 msgid "Calculate Workable Days" msgstr "Calcular días laborables" @@ -5904,7 +5933,7 @@ msgstr "Actualizar excepción" msgid "Operation cannot be done" msgstr "No se puede efectuar la operación" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:138 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 msgid "Budget" msgstr "Presupuesto" @@ -6001,7 +6030,7 @@ msgstr "Carga" #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:120 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:122 #: libreplan-webapp/src/main/webapp/templates/templates.zul:101 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 @@ -6022,11 +6051,11 @@ msgid "already exists an allocation for criteria {0}" msgstr "ya existe una asignación para los criterios {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 msgid "Project Templates" msgstr "Plantillas de proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Forward" msgstr "Adelante" @@ -6044,7 +6073,7 @@ msgstr "Número de aplicaciones finalizadas" msgid "Unnasigned" msgstr "No asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:178 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 @@ -6071,7 +6100,7 @@ msgstr "El porcentaje de duración debería estar entre 0 y 100" msgid "Multiple values per resource" msgstr "Múltiples valores por recurso" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:62 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 msgid "Split" msgstr "Dividir" @@ -6094,7 +6123,7 @@ msgstr "Compatible con navegadores Chrome, Firefox, Safari y Epiphany" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:94 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:96 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 msgid "Starting date" msgstr "Fecha de inicio" @@ -6107,7 +6136,7 @@ msgstr "Añadir materiales" msgid "Load 100%" msgstr "Carga 100%" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:943 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Function" msgstr "Función" @@ -6117,7 +6146,7 @@ msgstr "Función" msgid "date in future" msgstr "fecha en el futuro" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:851 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:855 msgid "New project version" msgstr "Nueva versión de proyecto" @@ -6134,8 +6163,8 @@ msgstr "Formato" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1226 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:483 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1234 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 #: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78 @@ -6165,7 +6194,7 @@ msgstr "Editar" msgid "Init date" msgstr "Fecha de inicio" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:104 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:106 msgid "Responsible" msgstr "Responsable" @@ -6173,7 +6202,7 @@ msgstr "Responsable" msgid "New password" msgstr "Nueva contraseña" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:352 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:354 msgid "percentage must be in range (0,100]" msgstr "el porcentaje debe pertenecer al rango (0,100]" @@ -6213,7 +6242,7 @@ msgstr "Árbol {0} aplanado satisfactoriamente" #: libreplan-webapp/src/main/webapp/materials/materials.zul:82 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 msgid "Unit price" msgstr "Precio de la unidad" @@ -6301,8 +6330,8 @@ msgstr "Noviembre" msgid "Enable/Disable" msgstr "Habilitar/Deshabilitar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1282 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1304 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1268 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1290 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6345,7 +6374,7 @@ msgstr "Criterio" msgid "unl" msgstr "ili" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:290 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 msgid "Test LDAP connection" msgstr "Probar la conexión con el LDAP" @@ -6363,11 +6392,11 @@ msgstr "falta el código en una etiqueta" msgid "Actual Cost Work Performed" msgstr "Coste de trabajo realizado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:172 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:177 msgid "Create project from Template" msgstr "Crear proyecto a partir de plantilla" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:417 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:418 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6385,7 +6414,7 @@ msgstr "debe seleccionar un tipo de autorización" msgid "Must start after (days since beginning project)" msgstr "Debe empezar después de (días desde el inicio del proyecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:850 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:854 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6398,7 +6427,6 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72 #: libreplan-webapp/src/main/webapp/materials/materials.zul:45 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 @@ -6440,7 +6468,7 @@ msgstr "Debe seleccionar el tipo de excepción" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:99 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:101 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 msgid "Deadline" msgstr "Fecha límite" @@ -6449,7 +6477,7 @@ msgstr "Fecha límite" msgid "Tasks" msgstr "Tareas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 msgid "Subcontracted Tasks" msgstr "Tareas subcontratadas" @@ -6480,7 +6508,7 @@ msgstr "Tipo de etiqueta" msgid "Advanced Allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 msgid "Administration / Management" msgstr "Administración / Gestión" @@ -6492,7 +6520,7 @@ msgstr "Número de iteraciones" msgid "Template Tree" msgstr "Árbol de plantillas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:447 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:449 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 msgid "Alpha" msgstr "Alfa" @@ -6550,7 +6578,7 @@ msgstr "Tipo de formulario de calidad" msgid "work report has not this label type assigned" msgstr "el parte de trabajo no tiene asignado este tipo de etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1192 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1201 msgid "Limiting assignment" msgstr "Asignación limitante" @@ -6570,7 +6598,7 @@ msgstr " horas" msgid "The name of the criterion is empty." msgstr "El nombre del criterio está vacío." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 msgid "Limiting Resources Planning" @@ -6594,7 +6622,7 @@ msgstr "La fecha de inicio no puede ser nula" msgid "All project tasks" msgstr "Todas las tareas del proyecto" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:367 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:375 msgid "LDAP Roles (separated by ;)" msgstr "Roles del LDAP (separados por ;)" @@ -6629,7 +6657,7 @@ msgstr "Ayuda sobre la identificación (abre una ventana nueva)" msgid "The length must be greater than 0, and not null." msgstr "La longitud debe ser mayor que cero y no nula." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:54 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 msgid "Not a valid effort duration" msgstr "No es una duración de esfuerzo válida" @@ -6663,13 +6691,13 @@ msgstr "No se pudo encontrar el criterio {0}" msgid "Apply filtering to tasks satisfying required criteria" msgstr "Aplicar filtrado a las tareas que satisfacen los criterios requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:345 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37 msgid "Task Scheduling Status In Project" msgstr "Estado de planificación de tareas en un proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:261 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" @@ -6730,22 +6758,22 @@ msgstr "Etiquetas sin herencia" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:272 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1242 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1250 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1207 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1193 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:646 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:955 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:961 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:983 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:989 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 @@ -6760,20 +6788,20 @@ msgstr "Etiquetas sin herencia" #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/materials/materials.zul:104 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:117 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:59 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:57 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 @@ -6833,6 +6861,10 @@ msgstr "Inglés" msgid "Russian" msgstr "Ruso" +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:39 +msgid "Portuguese" +msgstr "Portugués" + #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 msgid "unlimited" msgstr "ilimitado" diff --git a/libreplan-webapp/src/main/resources/i18n/gl.po b/libreplan-webapp/src/main/resources/i18n/gl.po index 31a7c0b82..9ee03057c 100644 --- a/libreplan-webapp/src/main/resources/i18n/gl.po +++ b/libreplan-webapp/src/main/resources/i18n/gl.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-11 09:11+0100\n" -"PO-Revision-Date: 2011-11-11 09:25+0100\n" +"POT-Creation-Date: 2011-11-25 11:40+0100\n" +"PO-Revision-Date: 2011-11-25 11:47+0100\n" "Last-Translator: Manuel Rego Casasnovas \n" "Language-Team: Galician <>\n" "Language: gl\n" @@ -25,7 +25,7 @@ msgstr "" msgid "The resource cannot be null" msgstr "O recurso non pode ser nulo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:341 msgid "Group path" msgstr "Path do grupo" @@ -85,12 +85,13 @@ msgstr "Crear traballador virtual" #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61 #: libreplan-webapp/src/main/webapp/materials/materials.zul:86 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:88 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 @@ -148,12 +149,12 @@ msgstr "Parte de traballo borrado con éxito" msgid "It can not be empty" msgstr "Non pode estar baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:145 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:55 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:147 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 #: libreplan-webapp/src/main/webapp/templates/templates.zul:66 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 @@ -200,13 +201,13 @@ msgid "Summary" msgstr "Resumo" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "Formularios de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 msgid "Reports" msgstr "Informes" @@ -238,8 +239,8 @@ msgstr "A data do tramo debe ser maior ou igual cá data de inicio da tarefa: " msgid "Dedication chart" msgstr "Gráfico de dedicación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:702 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:729 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:689 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:716 msgid "Progress that are reported by quality forms can not be modified" msgstr "" "O progreso notificado por formularios de calidade non se pode modificar" @@ -260,7 +261,7 @@ msgstr "Non se pode borrar ese material porque está asignado a un proxecto." msgid "Remove limiting resource element" msgstr "Borrar elemento de recurso limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 msgid "Resource Usage" @@ -275,7 +276,7 @@ msgid "Unassign" msgstr "Desasignar" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:302 msgid "Companies" msgstr "Empresas" @@ -283,7 +284,7 @@ msgstr "Empresas" msgid "Manual assignment" msgstr "Asignación manual" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:74 msgid "Quality form items list" msgstr "Lista de elementos do formulario de calidade" @@ -304,7 +305,7 @@ msgstr "Crear {0}: {1}" msgid "generic workers allocation" msgstr "Asignación xenérica de traballadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:890 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:898 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308 msgid "The project has no scheduled elements" msgstr "O proxecto no ten elementos planificados" @@ -348,7 +349,7 @@ msgstr "Capacidade de recursos" msgid "changing perspective" msgstr "cambio de perspectiva" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31 msgid "Transfer Projects Between Scenarios" msgstr "Transferir proxectos entre escenarios" @@ -371,11 +372,11 @@ msgid "Project Name" msgstr "Nome do proxecto" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:938 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:966 msgid "Indent" msgstr "Indentar" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:314 msgid "Save passwords in database" msgstr "Gardar contrasinais na base de datos" @@ -409,7 +410,7 @@ msgstr "Lista de excepcións" msgid "Locations" msgstr "Ubicacións" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:78 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77 msgid "New quality form item" msgstr "Novo elemento de formulario de calidade" @@ -417,7 +418,7 @@ msgstr "Novo elemento de formulario de calidade" msgid "LibrePlan: Labels" msgstr "LibrePlan: Etiquetas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:269 msgid "LDAP connection was successful" msgstr "A conexión co LDAP foi realizada con éxito" @@ -425,11 +426,6 @@ msgstr "A conexión co LDAP foi realizada con éxito" msgid "Login name" msgstr "Nome de usuario" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 -msgid "LibrePlan user" -msgstr "Usuario de LibrePlan" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84 msgid "{0} List" msgstr "{0} Lista" @@ -459,7 +455,7 @@ msgstr "" "aplicables a este recurso" #: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:53 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 #: libreplan-webapp/src/main/webapp/templates/templates.zul:65 msgid "Criterion Requirement" msgstr "Criterio requirido" @@ -510,6 +506,10 @@ msgstr "" "non hai recursos cos criterios solicitados: {0}. Por tanto, non se pode " "engadir a asignación xenérica" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:334 +msgid "Role search strategy" +msgstr "Estratexia para a búsqueda de roles" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478 msgid "Error on showing warning message removing calendar: " msgstr "Erro ao mostrar mensaxe de advertencia borrando un calendario: " @@ -525,11 +525,11 @@ msgstr "o nome da categoría de materiais debe ser único. Xa está en uso" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46 msgid "Imputed hours" msgstr "Horas imputadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37 msgid "Project Costs Per Resource" msgstr "Custos do proxecto por recurso" @@ -567,11 +567,15 @@ msgstr "" "{0} non é válido, criterionType solápase con outro criterionSatisfaction do " "mesmo criterionType" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +msgid "Group strategy" +msgstr "Estratexia de grupo" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 msgid "Work Report Lines" msgstr "Liñas do parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1546 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1555 msgid "Configure" msgstr "Configurar" @@ -582,7 +586,7 @@ msgstr "Outubro" #: libreplan-webapp/src/main/webapp/settings/settings.zul:58 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:51 msgid "First name" msgstr "Nome" @@ -597,8 +601,8 @@ msgstr "Campos de texto complementario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar o borrado de {0}. ¿Está seguro?" @@ -607,11 +611,11 @@ msgstr "Confirmar o borrado de {0}. ¿Está seguro?" msgid "Work Reports List" msgstr "Lista de partes de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 msgid "Accounts" msgstr "Contas" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:85 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:87 msgid "External code" msgstr "Código externo" @@ -637,7 +641,7 @@ msgstr "Materiales requiridos" msgid "resources per day must be not empty and bigger than zero" msgstr "os recursos por día deben ser non baleiros e maiores que cero" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:341 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:349 msgid "Backwards" msgstr "Atrás" @@ -650,7 +654,7 @@ msgstr "Versión" msgid "Apply filtering to resources satisfying required criteria" msgstr "Aplicar filtrado aos recursos que satisfán os criterios requeridos" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:106 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105 msgid "Up" msgstr "Arriba" @@ -698,6 +702,10 @@ msgstr "" "O valor non é válido, o valor máximo por defecto debe ser maior có valor de " "precisión " +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 +msgid "missing worker code in the work report" +msgstr "falta código de traballador nun parte de traballo" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 @@ -709,16 +717,12 @@ msgstr "" msgid "End date" msgstr "Data de fin" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 -msgid "missing worker code in the work report" -msgstr "falta código de traballador nun parte de traballo" - #: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89 msgid "profile name is already being used by another profile" msgstr "o nome do perfil xa está a ser usado por outro perfil" #: libreplan-webapp/src/main/webapp/settings/settings.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:78 msgid "E-mail" msgstr "Correo electrónico" @@ -732,8 +736,8 @@ msgstr "Este proxecto xa fora engadido." msgid "The task code cannot be null" msgstr "O código da tarefa non pode ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:593 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:594 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:327 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 @@ -781,7 +785,7 @@ msgstr "A versión do proxecto é a mesma nos escenarios de orixe e destino" msgid "Personal data" msgstr "Datos persoais" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:720 msgid "Calculated progress can not be removed" msgstr "O progreso calculado non se pode borrar" @@ -805,11 +809,11 @@ msgstr "{0} anotación obrigatoria en {1}" msgid "June" msgstr "Xuño" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1038 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1066 msgid "Modified" msgstr "Modificado" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 msgid "Add Criterion" msgstr "Engadir criterio" @@ -817,7 +821,7 @@ msgstr "Engadir criterio" msgid "You can not remove the current scenario" msgstr "Non se pode borrar o escenario actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:680 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "" "formato de prefixo inválido. Non pode estar baleiro ou conter espazos en " @@ -864,7 +868,7 @@ msgstr "Lista de tarefas subcontratadas" msgid "Average of worked hours in finished applications" msgstr "Media de horas traballadas nas aplicacións finalizadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:706 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:693 msgid "Calculated progress can not be modified" msgstr "O progreso calculado non se pode modificar" @@ -885,12 +889,12 @@ msgstr "Editar calendario" msgid "Profile" msgstr "Perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 msgid "Materials Needs At Date" msgstr "Necesidades de materiais en data" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:277 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:279 msgid "UserDn" msgstr "UserDn" @@ -973,7 +977,7 @@ msgstr "Perderánse os cambios sen gardar. Gustaríalle continuar?" msgid "NON_LIMITING" msgstr "NON_LIMITANTE" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297 msgid "Workers" msgstr "Traballadores" @@ -1014,14 +1018,14 @@ msgstr "nome do perfil non especificado" msgid "Date Start" msgstr "Data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1275 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 msgid "Value is not valid, the current value must be less than max value" msgstr "O valor non é válido, o valor actual debe ser menor que o valor máximo" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: libreplan-webapp/src/main/webapp/planner/order.zul:108 +#: libreplan-webapp/src/main/webapp/planner/order.zul:105 msgid "Value" msgstr "Valor" @@ -1034,7 +1038,7 @@ msgid "there are no valid periods for this calendar" msgstr "non hai períodos válidos para este calendario" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:93 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:95 msgid "Add role" msgstr "Engadir rol" @@ -1044,8 +1048,8 @@ msgid "Exception end date should be greater or equals than start date" msgstr "" "A data de fin dunha excepción debe ser maior ou igual cá data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:443 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:444 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:454 msgid "Repeated Project code {0} in Project {1}" msgstr "Código {0} de proxecto repetedio no proxecto {1}" @@ -1078,11 +1082,11 @@ msgid "Type data" msgstr "Datos do tipo" #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 msgid "Profiles" msgstr "Perfís" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:256 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 msgid "Host" msgstr "Host" @@ -1144,7 +1148,7 @@ msgstr "Cambiar escenario" msgid "Critical path" msgstr "Camiño crítico" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:260 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:262 msgid "" "Deleting this item, it will disable the report progress option. Are you sure?" msgstr "" @@ -1186,11 +1190,11 @@ msgid "Cancel changes and back to scheduling" msgstr "Cancelar cambios e volver á planificación" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: libreplan-webapp/src/main/webapp/planner/order.zul:109 +#: libreplan-webapp/src/main/webapp/planner/order.zul:106 msgid "Percentage" msgstr "Porcentaxe" @@ -1233,12 +1237,12 @@ msgstr "Tipo de excepción" msgid "Profiles List" msgstr "Listado de perfís" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:919 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:51 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:914 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 @@ -1249,12 +1253,12 @@ msgstr "Etiquetas" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "{0} da categoría {1} e {2} da categoría {3} teñen o mesmo código" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 msgid "Data Types" msgstr "Tipos de datos" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:155 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 msgid "Total hours" msgstr "Total de horas" @@ -1319,13 +1323,13 @@ msgstr "xa asignado" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:131 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:133 #: libreplan-webapp/src/main/webapp/common/configuration.zul:139 -#: libreplan-webapp/src/main/webapp/planner/order.zul:154 +#: libreplan-webapp/src/main/webapp/planner/order.zul:151 msgid "Calendar" msgstr "Calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:307 #: libreplan-webapp/src/main/webapp/common/configuration.zul:119 msgid "Resources" msgstr "Recursos" @@ -1359,11 +1363,15 @@ msgstr "a" msgid "worker's first name not specified" msgstr "nome do traballador non especificado" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:337 +msgid "Property strategy" +msgstr "Stratexia de propiedade" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281 msgid "date not specified" msgstr "data non especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206 msgid "Projects Planning" @@ -1373,13 +1381,13 @@ msgstr "Planificación de proxectos" msgid "Shrink to fit page width" msgstr "Reducir para axustar ao ancho de páxina" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:773 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:760 msgid "The max value must be greater than 0" msgstr "O valor máximo debe ser maior que 0" #: libreplan-webapp/src/main/webapp/settings/settings.zul:63 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:56 msgid "Last name" msgstr "Apelidos" @@ -1404,12 +1412,12 @@ msgstr "SPI" msgid "Progress Type" msgstr "Tipo de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1295 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1304 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "" "A tarefa contén progreso consolidado. Non se pode aplicar a función sigmoide." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:307 msgid "UserId" msgstr "UserId" @@ -1434,7 +1442,7 @@ msgstr "o código non pode ser nulo ou baleiro" msgid "Create New Project" msgstr "Crear proxecto novo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1430 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1439 msgid "Stretches list" msgstr "Lista de tramos" @@ -1446,7 +1454,7 @@ msgstr "Habilitar módulo de escenarios" msgid "Zoom" msgstr "Zoom" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:829 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:833 #: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 @@ -1465,16 +1473,16 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: libreplan-webapp/src/main/webapp/materials/materials.zul:115 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 #: libreplan-webapp/src/main/webapp/templates/templates.zul:135 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:376 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:384 msgid "Save" msgstr "Gardar" @@ -1487,9 +1495,9 @@ msgstr "Esforzo estándar" msgid "Material categories" msgstr "Categorías de materiais" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:576 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:674 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:603 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 msgid "number of digits must be between {0} and {1}" msgstr "o número de díxitos debe estar entre {0} e {1}" @@ -1517,7 +1525,8 @@ msgstr "Problemas conectando co servizo web subcontratista" msgid "Entity type" msgstr "Tipo de entidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1023 msgid "Unsaved changes will be lost. Are you sure?" msgstr "Perderánse os cambios sen gardar. Está seguro?" @@ -1573,11 +1582,11 @@ msgstr "Expandir/Pregar todo" msgid "Overload due to current project" msgstr "Sobrecarga debido ao proxecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:902 msgid "Name: {0}" msgstr "Nome: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:874 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:902 msgid "Move down" msgstr "Mover abaixo" @@ -1609,12 +1618,12 @@ msgstr "Datos xerais" msgid "BAC" msgstr "BAC" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:379 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:381 msgid "Calculate Number of Hours" msgstr "Calcular número de horas" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:105 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:104 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 msgid "Assign" @@ -1624,7 +1633,7 @@ msgstr "Asignar" msgid "missing code in a criterion" msgstr "falta código nun criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1273 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281 msgid "Create Template" msgstr "Crear modelo" @@ -1783,7 +1792,7 @@ msgstr "o nome non pode ser nulo ou baleiro" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: libreplan-webapp/src/main/webapp/planner/order.zul:110 +#: libreplan-webapp/src/main/webapp/planner/order.zul:107 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 @@ -1800,7 +1809,7 @@ msgstr "Engadir a partir de modelo" msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Os recursos asignados para esta tarefa serán borrados. Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:678 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" @@ -1817,7 +1826,7 @@ msgstr "Filtrar por mes" msgid "The criterion and its type cannot be null" msgstr "O criterio e o seu tipo non poden ser nulos" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:421 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:422 msgid "The quality form must have an item with 100% value to report progress" msgstr "" "O formulario de calidaed debe ter un ítem con valor 100% para notificar " @@ -1831,6 +1840,10 @@ msgstr "Xullo" msgid "The code is not valid. There is another unit type with the same code" msgstr "O código non é válido. Hai outro tipo de unidade co mesmo código" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +msgid "Enable LDAP authentication" +msgstr "Habilitar a autenticación LDAP" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 msgid "( max: {0} )" msgstr "( máx: {0} )" @@ -1851,6 +1864,7 @@ msgstr "Non se poden calcular gráficos para os datos actuais" msgid "Select queue" msgstr "Seleccionar cola" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1499 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173 msgid "project name already being used" msgstr "o nome de proxecto xa está sendo usado" @@ -1859,7 +1873,7 @@ msgstr "o nome de proxecto xa está sendo usado" msgid "Work description" msgstr "Descrición do traballo" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:61 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 msgid "Split assignment" msgstr "Dividir asignación" @@ -1883,7 +1897,7 @@ msgstr "Non se pode borrar o escenario por defecto, chamado \"{0}\"" msgid "direct link" msgstr "enlace directo" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:112 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:111 msgid "Down" msgstr "Abaixo" @@ -1897,12 +1911,12 @@ msgstr "Abaixo" msgid "Label" msgstr "Etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:841 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:869 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "O valor non é válido, tendo en conta a lista actual de HoursGroup" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:92 msgid "Association with roles" msgstr "Asociación con roles" @@ -1914,8 +1928,8 @@ msgstr "falta tipo de horas de traballo nunha liña do parte" msgid "Quality forms" msgstr "Formularios de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:466 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:467 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:477 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "Código {0} de groupo de horas repetido no proxecto {1}" @@ -1964,7 +1978,7 @@ msgstr "Pesimista" msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -2002,11 +2016,11 @@ msgstr "Retraso desde o comezo (en días)" msgid "Resource cannot be null" msgstr "O recurso non pode ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:455 msgid "Total Hours" msgstr "Horas totais" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:374 msgid "LibrePlan Role" msgstr "Rol LibrePlan" @@ -2018,28 +2032,32 @@ msgstr "Crear novo tipo de progreso" msgid "Confirm cancel" msgstr "Confirmar cancelación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37 msgid "Work And Progress Per Task" msgstr "Traballo e progreso por tarefa" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1523 +msgid "project code already being used" +msgstr "o código do proxecto xa está sendo usado" + #: libreplan-webapp/src/main/webapp/orders/_edition.zul:40 msgid "WBS (tasks)" msgstr "EDT (tarefas)" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:843 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:878 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 msgid "Error on showing removing element: " msgstr "Erro ao mostrar o elemento a borrar: " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:728 msgid "Deleting sequence" msgstr "Borrando secuencia" @@ -2108,11 +2126,15 @@ msgstr "Histórico de asignacións" msgid "CutycaptTimeout thread exception" msgstr "Excepción no thread CutycaptTimeout" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "Modelos de partes de traballo" +#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 +msgid "New" +msgstr "Novo" + #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 msgid "Date last progress measurement" msgstr "Data da última medida de progreso" @@ -2137,7 +2159,7 @@ msgstr "" "O calendario non se pudo borrar porque aínda ten fillos. Algún outro " "calendario deriva deste." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:907 msgid "Value is not valid, the type must be not empty" msgstr "O valor non é válido, o tipo non pode estar baleiro" @@ -2157,21 +2179,16 @@ msgstr "Non se pode borrar progreso consolidado." msgid "Create Task" msgstr "Crear tarefa" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 -msgid "LDAP Authentication enabled" -msgstr "Autenticación co LDAP activada" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" msgstr "Empresa externa" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:99 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:101 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:131 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 @@ -2191,7 +2208,7 @@ msgstr "Preferencias de usuario" msgid "Start hour" msgstr "Hora de inicio" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:140 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 msgid "Assign materials" msgstr "Asignar materiais" @@ -2210,7 +2227,7 @@ msgstr "o formato dos filtros non é válido" msgid "ID" msgstr "NIF" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:349 msgid "Settings" msgstr "Preferencias" @@ -2252,7 +2269,7 @@ msgstr "Grupo de horas" msgid "Unallocated name" msgstr "Nome no asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:895 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:923 msgid "Move up" msgstr "Mover arriba" @@ -2265,14 +2282,14 @@ msgid "Subcontract communication date" msgstr "Data de comunicación da subcontratación" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:359 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:365 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 msgid "Scheduling" msgstr "Planificación" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:126 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:128 msgid "Dependencies have priority" msgstr "As dependencias teñen prioridade" @@ -2304,9 +2321,9 @@ msgstr "Páxina arriba" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:910 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:159 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 msgid "State" @@ -2316,11 +2333,11 @@ msgstr "Estado" msgid "Must start after" msgstr "Debe empezar despois" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1306 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1315 msgid "Confirm change" msgstr "Confirmar cambio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:848 msgid "You don't have permissions to edit this project" msgstr "Non ten permisos para editar este proxecto" @@ -2361,7 +2378,7 @@ msgstr "LibrePlan: Materiais" msgid "New task" msgstr "Nova tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:191 msgid "The password for a new user cannot be empty" msgstr "O contrasinal non pode ser baleiro para un usuario novo" @@ -2451,7 +2468,7 @@ msgid "Value is not valid, the default max value must not be empty " msgstr "" "O valor non é válido, o valor máximo por defecto non debe estar baleiro " -#: libreplan-webapp/src/main/webapp/common/configuration.zul:343 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 msgid "Role property" msgstr "Propiedade do rol" @@ -2476,15 +2493,15 @@ msgstr "Asignación recomendada" msgid "Activation" msgstr "Activación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 msgid "Scenarios" msgstr "Escenarios" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375 msgid "Materials saved" msgstr "Materiais gardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1252 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." @@ -2492,7 +2509,7 @@ msgstr "" "Esta medida de progreso non pode estar na data actual, porque está " "consolidada. Débese seleccionar outra data." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37 msgid "Total Worked Hours By Resource In A Month" msgstr "Total horas traballadas por recurso nun mes" @@ -2509,7 +2526,7 @@ msgstr "Buffer de tarefas de entrada" msgid "At least one {0} sequence must be active" msgstr "Polo menos unha secuencia de {0} debe estar activa" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:130 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 @@ -2532,7 +2549,7 @@ msgstr "Debe seleccionar un escenario de orixe" msgid "At least one {0} sequence is needed" msgstr "Necesítase polo menos unha secuencia de {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37 msgid "Estimated/Planned Hours Per Task" msgstr "Horas estimadas/planificadas por tarefa" @@ -2545,7 +2562,11 @@ msgstr "LibrePlan: Categorías de custo" msgid "Assigned" msgstr "Asignado" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:45 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:244 +msgid "Use LDAP roles" +msgstr "Utilizar roles do LDAP" + +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:44 msgid "Details" msgstr "Detalles" @@ -2582,7 +2603,7 @@ msgstr "Data máis cedo" msgid "LibrePlan: Work And Progress Per Task" msgstr "LibrePlan: Traballo e progreso por tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 msgid "Change Password" msgstr "Cambiar o contrasinal" @@ -2590,14 +2611,15 @@ msgstr "Cambiar o contrasinal" msgid "Projects" msgstr "Proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:264 -msgid "Confirm exit dialog" -msgstr "Diálogo para confirmar a salida" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64 msgid "Not found converter for {0}" msgstr "Non se atopou un conversor para {0}" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:272 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1024 +msgid "Confirm exit dialog" +msgstr "Diálogo para confirmar a salida" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 msgid "Material assignments" msgstr "Asignacións de materiais" @@ -2626,7 +2648,7 @@ msgstr "" msgid "Question" msgstr "Pregunta" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." @@ -2685,7 +2707,7 @@ msgstr "Rexistro de traballo" msgid "Output format" msgstr "Formato de saída" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:44 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47 msgid "Print" msgstr "Imprimir" @@ -2720,25 +2742,24 @@ msgstr "O esforzo non pode ser nulo" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:138 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:157 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:142 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 #: libreplan-webapp/src/main/webapp/templates/templates.zul:139 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:379 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:387 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 -#: libreplan-webapp/src/main/webapp/planner/order.zul:73 -#: libreplan-webapp/src/main/webapp/planner/order.zul:134 -#: libreplan-webapp/src/main/webapp/planner/order.zul:169 +#: libreplan-webapp/src/main/webapp/planner/order.zul:131 +#: libreplan-webapp/src/main/webapp/planner/order.zul:166 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 msgid "Cancel" msgstr "Cancelar" @@ -2767,8 +2788,8 @@ msgstr "Lista de máquinas" msgid "CPI" msgstr "CPI" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:687 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:695 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318 msgid "You don't have read access to this project" msgstr "Non ten acceso de lectura a este proxecto" @@ -2836,11 +2857,11 @@ msgstr "nome" msgid "Delete selected task" msgstr "Borrar tarefa seleccionada" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:126 msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:470 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 msgid "end" msgstr "fin" @@ -2848,7 +2869,7 @@ msgstr "fin" msgid "Cost Category" msgstr "Categoría de custo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:357 msgid "Role search query" msgstr "Consulta para a búsqueda de roles" @@ -2874,7 +2895,7 @@ msgstr "Editar tarefa: {0}" msgid "Start date cannot be null" msgstr "A data de inicio non pode ser nula" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 msgid "Subcontracting" msgstr "Subcontratación" @@ -2882,7 +2903,7 @@ msgstr "Subcontratación" msgid "references" msgstr "referencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1278 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1264 msgid "Value is not valid, the Precision value must be exact " msgstr "O valor non é válido, o valor de precisión debe ser exacto " @@ -2902,7 +2923,7 @@ msgstr "Valor máximo por defecto" msgid "Add criterion requirement" msgstr "Engadir criterio requirido" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:855 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 msgid "" "You can not remove the project \"{0}\" because of any of its tasks are " "already in use in some work reports and the project just exists in the " @@ -2944,7 +2965,7 @@ msgstr "LibrePlan: Cambiar o contrasinal" msgid "please, select a label" msgstr "por favor, seleccione unha etiqueta" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:125 msgid "Add profile" msgstr "Engadir perfil" @@ -2966,7 +2987,7 @@ msgstr "falta código nos datos de versión dun calendario" msgid "Criterion name" msgstr "Nome do criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:127 msgid "values are not valid, the values must not be null" msgstr "os valores non son válidos, non deben ser nulos" @@ -2984,7 +3005,7 @@ msgstr "Nome da tarefa" msgid "cost assignment's resource not specified" msgstr "recurso da asignación de custo non especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:132 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 @@ -3018,7 +3039,7 @@ msgid "the name must be not empty" msgstr "o nome non pode ser baleiro" #: libreplan-webapp/src/main/webapp/materials/materials.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:71 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Disabled" msgstr "Deshabilitado" @@ -3057,8 +3078,8 @@ msgstr "" "tentando crear un modelo a partir dunha tarefa nova.\n" "Por favor garde o seu proxecto antes de continuar." -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1109 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1124 msgid "{0} not supported yet" msgstr "{0} aínda non soportado" @@ -3079,7 +3100,7 @@ msgstr "Algunhas secuencias para borrar non existen" msgid "Resources Load" msgstr "Carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:241 msgid "Changes have been canceled" msgstr "Cambios cancelados" @@ -3087,7 +3108,7 @@ msgstr "Cambios cancelados" msgid "LibrePlan: Hours Worked Per Worker In A Month" msgstr "LibrePlan: Horas traballadas por traballador nun mes" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:297 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 msgid "Authentication" msgstr "Autenticación" @@ -3149,7 +3170,7 @@ msgstr "Propagación" msgid "Select start date" msgstr "Seleccionar data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:877 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 msgid "Removed {0}" msgstr "{0} borrado" @@ -3168,7 +3189,7 @@ msgid "Group name" msgstr "Nome do grupo" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:100 msgid "Role name" msgstr "Nome do rol" @@ -3210,11 +3231,11 @@ msgstr "Engadir fito" msgid "Assign selected items" msgstr "Asignar elementos seleccionados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:449 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:450 msgid "init" msgstr "inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1215 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1201 msgid "Add new progress measurement" msgstr "Engadir nova medida de progreso" @@ -3222,7 +3243,7 @@ msgstr "Engadir nova medida de progreso" msgid "Select for automatic queuing" msgstr "Seleccione para encolar automáticamente" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 msgid "Scenarios Management" msgstr "Administración de escenarios" @@ -3234,7 +3255,7 @@ msgstr "Proxecto {0} transferido" msgid "Create & Assign" msgstr "Crear e asignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1549 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1558 msgid "Not configurable" msgstr "Non configurable" @@ -3242,7 +3263,7 @@ msgstr "Non configurable" msgid "Advanced allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/webapp/planner/order.zul:111 +#: libreplan-webapp/src/main/webapp/planner/order.zul:108 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96 msgid "Consolidated" @@ -3277,7 +3298,7 @@ msgstr "LibrePlan: Acceso de usuarios" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:109 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:111 msgid "Customer" msgstr "Cliente" @@ -3292,17 +3313,19 @@ msgstr "Tipo de horas" msgid "criterion type name not specified" msgstr "nome do tipo de criterio non especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:246 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 msgid "Cannot connect to LDAP server" msgstr "Non se pode conectar ao servidor de LDAP" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219 msgid "Add Exception" msgstr "Engadir excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:301 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:322 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:303 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:378 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:219 msgid "cannot be empty" msgstr "non pode ser baleiro" @@ -3387,8 +3410,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:441 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 @@ -3416,7 +3439,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 #: libreplan-webapp/src/main/webapp/materials/materials.zul:58 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 @@ -3430,7 +3453,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 #: libreplan-webapp/src/main/webapp/templates/templates.zul:80 @@ -3481,11 +3504,11 @@ msgstr "Día da semana" msgid "Companies List" msgstr "Lista de empresas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1462 msgid "Stretches with Interpolation" msgstr "Tramos con interpolación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37 msgid "Hours Worked Per Resource" msgstr "Horas traballadas por recurso" @@ -3575,22 +3598,22 @@ msgstr "Asignación: [{0},{1}]" msgid "Virtual Workers Group" msgstr "Grupo de traballadores virtuais" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:225 msgid "Changes saved" msgstr "Cambios gardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1258 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1266 msgid "See scheduling" msgstr "Ver planificación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:328 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110 msgid "Progress measurements" msgstr "Medidas de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1200 msgid "Add measure" msgstr "Engadir medida" @@ -3619,7 +3642,7 @@ msgstr "Relación" msgid "End" msgstr "Fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1346 msgid "The date is not valid, the date must be not empty" msgstr "A data non é válida, non debe ser baleira" @@ -3628,7 +3651,7 @@ msgid "User login name" msgstr "Nome de usuario" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 msgid "Cost Categories" msgstr "Categorías de custo" @@ -3654,7 +3677,7 @@ msgstr "Lista de usuarios" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:57 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56 msgid "Task quality forms" msgstr "Formularios de calidade de tarefa" @@ -3671,7 +3694,7 @@ msgstr "Tipos de progreso" msgid "Cost category" msgstr "Categoría de custo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:700 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:727 msgid "It can not be deleted. At least one sequence is necessary." msgstr "Non se pode borrar. Polo menos unha secuencia é necesaria." @@ -3721,26 +3744,26 @@ msgstr "Engadir novo campo de tipo de etiqueta" msgid "Time finish cannot be null" msgstr "A hora de fin non pode ser nula" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:116 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:118 msgid "Customer reference" msgstr "Referencia del cliente" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:688 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:891 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:927 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:849 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319 msgid "Information" msgstr "Información" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:926 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:934 msgid "Sorry, you do not have permissions to access this project" msgstr "Sentímolo, non ten permisos para acceder a este proxecto" @@ -3760,6 +3783,10 @@ msgstr "non se pode pasar mentres o elemento anterior non sexa pasado." msgid "New hours group " msgstr "novo grupo de horas " +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +msgid "Please remember that only saved changes will be printed" +msgstr "Por favor lembra que só os cambios gardados serán impresos" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 msgid "Assign element to queue manually" msgstr "Asignar elemento á cola manualmente" @@ -3772,11 +3799,11 @@ msgstr "Editar modelo" msgid "Resource: {0} " msgstr "Recurso: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:358 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:360 msgid "percentage cannot be duplicated" msgstr "a porcentaxe non pode estar duplicada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 msgid "Work Hours" msgstr "Horas de traballo" @@ -3830,8 +3857,8 @@ msgstr "Asignacións de traballador" #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:305 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:328 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221 msgid "{0} already exists" msgstr "{0} xa existe" @@ -3849,20 +3876,20 @@ msgid "Code " msgstr "Código" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:65 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:66 msgid "Password confirmation" msgstr "Confirmación de contrasinal" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 -msgid "Work Report" -msgstr "Parte de traballo" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 msgid "Indent selected task" msgstr "Indentar tarefa seleccionada" +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 +msgid "Work Report" +msgstr "Parte de traballo" + #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 #: libreplan-webapp/src/main/webapp/common/configuration.zul:135 msgid "Unit Measures" msgstr "Unidades de medida" @@ -3872,11 +3899,11 @@ msgstr "Unidades de medida" msgid "Show progress" msgstr "Mostrar progreso" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:142 msgid "Work" msgstr "Traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:297 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 msgid "" "Error saving the project\n" "{0}" @@ -3898,9 +3925,9 @@ msgstr "LibrePlan: Máquinas" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:299 #: 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:1296 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 msgid "Error" msgstr "Erro" @@ -3941,7 +3968,7 @@ msgstr "" "criterionType" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 -#: libreplan-webapp/src/main/webapp/planner/order.zul:83 +#: libreplan-webapp/src/main/webapp/planner/order.zul:80 msgid "Progress consolidation" msgstr "Consolidación de progreso" @@ -3970,7 +3997,7 @@ msgstr "Recursos limitantes" msgid "Task Information" msgstr "Información da tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:140 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:145 msgid "Hours Group at " msgstr "Grupo de horas en " @@ -3993,7 +4020,7 @@ msgstr "un día está baleiro" msgid "Budgeted Cost Work Scheduled" msgstr "Custo de traballo presupostado planificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 msgid "Changes applied" msgstr "Cambios aplicados" @@ -4025,7 +4052,7 @@ msgstr "Desviación en custo" msgid "criterion type does not allow resource hierarchy" msgstr "o tipo de criterio non permite xerarquía de recursos" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:150 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:152 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 msgid "Total" @@ -4048,8 +4075,8 @@ msgstr "Editar tarefa: {0}" msgid "Select destination" msgstr "Seleccionar destino" -#: libreplan-webapp/src/main/webapp/planner/order.zul:92 -#: libreplan-webapp/src/main/webapp/planner/order.zul:98 +#: libreplan-webapp/src/main/webapp/planner/order.zul:89 +#: libreplan-webapp/src/main/webapp/planner/order.zul:95 msgid "Check consolidated progresses" msgstr "Marcar progresos consolidados" @@ -4077,7 +4104,7 @@ msgid "Apply tab changes" msgstr "Aplicar cambios da pestana" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:93 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:170 msgid "passwords don't match" msgstr "os contrasinais non coinciden" @@ -4105,7 +4132,7 @@ msgstr "novo fito" msgid "Value last progress reported" msgstr "Valor último progreso notificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 msgid "Report Progress" msgstr "Notificar progreso" @@ -4113,7 +4140,7 @@ msgstr "Notificar progreso" msgid "Show dependencies" msgstr "Mostrar dependencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Schedule from start to deadline" msgstr "Planificar dende o principio á data límite" @@ -4149,7 +4176,7 @@ msgstr "LibrePlan: Días de excepción" msgid "LibrePlan: Work Hours" msgstr "LibrePlan: Horas de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 msgid "LibrePlan Configuration" msgstr "LibrePlan: Configuración" @@ -4199,7 +4226,7 @@ msgstr "Tipo de excepción" msgid "In the available periods {0} only {1} hours are available." msgstr "Nos períodos dispoñibles {0} só hai dispoñibles {1} horas." -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:118 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120 msgid "Association with profiles" msgstr "Asociación con perfís" @@ -4233,11 +4260,11 @@ msgstr "Preferencias da aplicación" msgid "Average of estimated hours" msgstr "Media de horas estimadas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:270 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:272 msgid "Base" msgstr "Base" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:683 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4257,7 +4284,7 @@ msgstr "Seleccionar orixe" msgid "Worker deleted" msgstr "Traballador borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:760 msgid "Select entity, please" msgstr "Seleccionar entidade, por favor" @@ -4348,7 +4375,7 @@ msgstr "O nome do campo debe ser único, non nulo e non baleiro" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 msgid "Position" msgstr "Posición" @@ -4374,7 +4401,7 @@ msgstr "Recursos limitantes (proxecto)" msgid "A description field of the same name already exists." msgstr "Xa existe un campo de descrición co mesmo nome." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1177 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1163 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" @@ -4421,7 +4448,7 @@ msgstr "Datos do perfil" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 #: libreplan-webapp/src/main/webapp/common/configuration.zul:35 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:248 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:250 msgid "Configuration" msgstr "Configuración" @@ -4443,11 +4470,11 @@ msgid "Select type" msgstr "Seleccione tipo" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:911 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:906 msgid "Hours invested" msgstr "Horas invertidas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:326 msgid "Authorization" msgstr "Autorización" @@ -4456,7 +4483,7 @@ msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "O nome non é válido, xa hai outro tipo de progreso co mesmo nome. " -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 msgid "Project saved" msgstr "Proxecto gardado" @@ -4476,7 +4503,7 @@ msgstr "recurso do criterio satisfeito non especificado" msgid "Derived exception" msgstr "Excepción derivada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 msgid "Machines" msgstr "Máquinas" @@ -4484,7 +4511,7 @@ msgstr "Máquinas" msgid "Unit Measures List" msgstr "Lista de unidades de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:153 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:149 msgid "Couldn't find element: {0}" msgstr "Non se puido atopar o elemento: {0}" @@ -4497,7 +4524,7 @@ msgstr "Debe seleccionar un escenario de destino" msgid "unit type code not found" msgstr "código de tipo de unidade non atopado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:348 msgid "My account" msgstr "A miña conta" @@ -4513,7 +4540,7 @@ msgstr "Vista da compañía" msgid "Both" msgstr "Ambos" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:758 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:764 msgid "Not editable for containing more that an hours group." msgstr "Non editable por conter máis dun grupo de horas." @@ -4527,7 +4554,7 @@ msgid "Limiting resource" msgstr "Recurso limitante" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58 -#: libreplan-webapp/src/main/webapp/planner/order.zul:146 +#: libreplan-webapp/src/main/webapp/planner/order.zul:143 msgid "Calendar allocation" msgstr "Asignación de calendario" @@ -4543,7 +4570,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/materials/materials.zul:84 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:120 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 msgid "Category" msgstr "Categoría" @@ -4561,7 +4588,7 @@ msgstr "[xenérico todos os traballadores]" msgid "Category data" msgstr "Datos de categoría" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:103 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:102 msgid "Search" msgstr "Buscar" @@ -4602,11 +4629,11 @@ msgstr "Borrar calendario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1323 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1331 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:251 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 msgid "must be lower than finish date" msgstr "debe ser anterior á data de fin" @@ -4636,7 +4663,7 @@ msgstr "Data último progreso notificado" msgid "Could not load any resource" msgstr "Non se puido cargar un recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:341 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" msgstr "Traballo e progreso por proxecto" @@ -4701,8 +4728,8 @@ msgstr "Datos da empresa" msgid "Unit type code cannot be empty" msgstr "O código de tipo de unidade non pode ser baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:183 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 msgid "Users" msgstr "Usuarios" @@ -4817,11 +4844,11 @@ msgstr "Filtrar por traballadores" msgid "Load due to current project" msgstr "Carga debido ao proxecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1314 msgid "You are going to change the assignment function. Are you sure?" msgstr "Vai cambiar a función de asignación. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 msgid "Exception Days" msgstr "Días de excepción" @@ -4842,13 +4869,13 @@ msgstr "Actualización incompatible: i recurso almacenado non é de tipo: {0}" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 #: libreplan-webapp/src/main/webapp/templates/templates.zul:137 msgid "Save & Continue" msgstr "Gardar e continuar" @@ -4857,7 +4884,7 @@ msgstr "Gardar e continuar" msgid "LibrePlan: Work And Progress Per Project" msgstr "LibrePlan: Traballo e progreso por proxecto" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:90 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:92 msgid "Scheduling mode" msgstr "Modo de planificación" @@ -4897,11 +4924,16 @@ msgstr "ACWP" msgid "The periods available depend on the resource's calendar." msgstr "Os períodos dispoñibles dependen do calendario do recurso." +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:83 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +msgid "Authentication type" +msgstr "Tipo de autenticación" + #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:55 msgid "START" msgstr "INICIO" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:350 msgid "Schedule from the deadline to start" msgstr "Planificar dende a data límite ao principio" @@ -4913,8 +4945,9 @@ msgstr "asignación xenérica de máquinas" msgid "Non limiting resource assignation" msgstr "Asignación de recursos non limitantes" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:87 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 +#: libreplan-webapp/src/main/webapp/planner/order.zul:70 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 msgid "Back" msgstr "Atrás" @@ -4933,11 +4966,11 @@ msgstr "Administración" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1306 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1314 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:234 msgid "must be greater than start date" msgstr "debe ser maior que a data de inicio" @@ -4962,7 +4995,7 @@ msgstr "horas traballadas" msgid "Unit measure name" msgstr "Nome da unidade de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:144 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:140 msgid "cannot include a progress of the same progress type twice" msgstr "non se pode asignar un progreso do mesmo tipo dúas veces" @@ -5019,7 +5052,7 @@ msgstr "Total de horas de tarefa" msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1063 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1071 msgid "Create project" msgstr "Crear proxecto" @@ -5033,7 +5066,7 @@ msgid "" msgstr "" "Permitir múltiples valores deste tipo de criterio no mesmo período de tempo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1294 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1280 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "A data non é válida, debe ser única para esta asignación de progreso" @@ -5070,11 +5103,11 @@ msgstr "si" msgid "Root calendar" msgstr "Calendario raíz" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:265 msgid "Port" msgstr "Porto" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -5113,7 +5146,7 @@ msgstr "Asignación de categoría de custo" msgid "missing code in a hour cost" msgstr "falta código nun custo por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858 msgid "All workers" msgstr "Todos os traballadores" @@ -5134,12 +5167,14 @@ msgstr "Seleccione conxunto de criterios requeridos e pulse o botón de filtrar" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1492 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1516 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:738 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:765 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 @@ -5168,7 +5203,6 @@ msgstr "Seleccione conxunto de criterios requeridos e pulse o botón de filtrar" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:46 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 msgid "cannot be null or empty" @@ -5187,7 +5221,7 @@ msgstr "Novo código" msgid "The progress type cannot be modified" msgstr "O tipo de progreso non pode ser modificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:392 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:394 msgid "Calculate Resources per Day" msgstr "Calcular recursos por día" @@ -5201,7 +5235,7 @@ msgstr "Estimación do custo pendente" #: libreplan-webapp/src/main/webapp/materials/materials.zul:83 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 msgid "Unit type" msgstr "Tipo de unidade" @@ -5222,7 +5256,7 @@ msgstr "Esta máquina xa foi borrada por outro usuario" msgid "Calendar data" msgstr "Datos do calendario" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 msgid "Work Reports" msgstr "Partes de traballo" @@ -5261,8 +5295,8 @@ msgstr "Xa existe outra etiqueta co mesmo nome" msgid "Customer Reference" msgstr "Referencia do cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:147 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:143 msgid "spread values are not valid, at least one value should be true" msgstr "" "os valores de propagación non son válidos, alo menos un debe ser verdadeiro" @@ -5295,12 +5329,12 @@ msgstr "" "O calendario por defecto non se pode borrar. Por favor, cambie antes o " "calendario por defecto na ventá de configuración." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:600 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:903 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 #: libreplan-webapp/src/main/webapp/templates/templates.zul:63 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 msgid "Progress" @@ -5314,7 +5348,7 @@ msgstr "" "Este tipo de criterio non se pode borrar porque ten asignacións a proxectos " "ou recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1210 msgid "All progress types have already been assigned." msgstr "Xa se asignaron todos os tipos de progreso." @@ -5326,7 +5360,7 @@ msgstr "Prezo por hora" msgid "Project: {0} " msgstr "Proxecto: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 msgid "Calendars" msgstr "Calendarios" @@ -5365,7 +5399,7 @@ msgstr "LibrePlan: Partes de traballo" msgid "Error on showing delete confirm" msgstr "Erro ao mostrar a confirmación de borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:623 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 msgid "Sum of all rows" msgstr "Suma de todas as filas" @@ -5416,7 +5450,7 @@ msgstr "Nome da unidade de configuración de cada traballador" msgid "Active" msgstr "Activo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1247 msgid "This progress measurement can not be in " msgstr "Esta medida de progreso non pode estar en " @@ -5424,7 +5458,7 @@ msgstr "Esta medida de progreso non pode estar en " msgid "Inherited labels" msgstr "Etiquetas herdadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1232 msgid "" "This progress can not be changed or removed, because it has got consolidated " "progress. It is needed to remove the consolidation on all its progress." @@ -5434,12 +5468,12 @@ msgstr "" "progreso." #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:917 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:945 msgid "Unindent" msgstr "Desindentar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:935 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1384 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1370 msgid "Value is not valid, the current value must be not empty" msgstr "O valor non é válido, o valor actual non debe estar baleiro" @@ -5467,7 +5501,7 @@ msgstr "Precisión" msgid "missing code in a work report line" msgstr "falta código nunha liña de parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:928 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:937 msgid "Efforts" msgstr "Esforzos" @@ -5475,7 +5509,7 @@ msgstr "Esforzos" msgid "Show all reported hours" msgstr "Mostrar todas as horas notificadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 msgid "Projects List" @@ -5494,7 +5528,7 @@ msgstr "Listado de proxectos" #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:80 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:82 msgid "Generate code" msgstr "Xerar código" @@ -5506,14 +5540,10 @@ msgstr "Estado de planificación" msgid "This template can not be removed because it has applications." msgstr "Este modelo non pode borrarse porque ten aplicacións." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:513 msgid "The code sequence is already in use and it can not be updated." msgstr "O código da secuencia xa está en uso e non se pode actualizar." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:332 -msgid "Import LDAP roles" -msgstr "Importar roles do LDAP" - #: libreplan-webapp/src/main/webapp/settings/settings.zul:43 msgid "Personal Data" msgstr "Datos persoais" @@ -5530,7 +5560,7 @@ msgstr "LibrePlan: Horas traballadas por recurso" msgid "Number of iterations should be between 1 and " msgstr "O número de iteracións debe estar entre 1 e " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:142 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:149 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" "Os escenarios deben estar habilitados xa que existen máis elementos que " @@ -5550,7 +5580,7 @@ msgstr "Tarefa {0} : O grupo de tarefas ten un tipo incompatible con {1}" msgid "Profiles authorization" msgstr "Autorización de perfís" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Virtual Workers Groups" msgstr "Grupos de traballadores virtuais" @@ -5614,9 +5644,9 @@ msgid "All projects" msgstr "Todos os proxectos" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:284 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:286 msgid "Password" msgstr "Contrasinal" @@ -5625,7 +5655,7 @@ msgstr "Contrasinal" msgid "Observations" msgstr "Observacións" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:942 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:950 msgid "Edit project" msgstr "Editar proxecto" @@ -5664,7 +5694,7 @@ msgstr "Cor" msgid "Current password is incorrect" msgstr "O contrasinal actual é incorrecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366 msgid "Cannot insert material in general view. Please, select a category" msgstr "" "Non se pode insertar material na vista xeral. Por favor, seleccione unha " @@ -5687,9 +5717,8 @@ msgstr "Borrar {0} \"{1}\". ¿Está seguro?" #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 -#: libreplan-webapp/src/main/webapp/planner/order.zul:70 -#: libreplan-webapp/src/main/webapp/planner/order.zul:131 -#: libreplan-webapp/src/main/webapp/planner/order.zul:166 +#: libreplan-webapp/src/main/webapp/planner/order.zul:128 +#: libreplan-webapp/src/main/webapp/planner/order.zul:163 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/main.zul:66 @@ -5697,14 +5726,14 @@ msgid "Accept" msgstr "Aceptar" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:266 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:273 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:280 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:308 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:346 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:261 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:268 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:275 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:282 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:310 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:345 #: libreplan-webapp/src/main/webapp/common/configuration.zul:353 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:361 msgid "Example: {0}" msgstr "Exemplo: {0}" @@ -5728,7 +5757,7 @@ msgstr "Calculado" msgid "Completed: {0}% " msgstr "Completado: {0}% " -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1181 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1167 msgid "Calculated progress measurement can not be removed" msgstr "As medidas de progreso calculadas non se poden borrar" @@ -5831,9 +5860,9 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:77 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 @@ -5856,7 +5885,7 @@ msgstr "Mostrar asignacións de recursos" msgid "Assignation type" msgstr "Tipo de asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:369 msgid "Calculate Workable Days" msgstr "Calcular días laborais" @@ -5886,7 +5915,7 @@ msgstr "Actualizar excepción" msgid "Operation cannot be done" msgstr "Non se pode realizar a operación" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:138 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 msgid "Budget" msgstr "Presuposto" @@ -5983,7 +6012,7 @@ msgstr "Carga" #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:120 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:122 #: libreplan-webapp/src/main/webapp/templates/templates.zul:101 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 @@ -6004,11 +6033,11 @@ msgid "already exists an allocation for criteria {0}" msgstr "xa existe unha asignación para os criterios {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 msgid "Project Templates" msgstr "Modelos de proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Forward" msgstr "Adiante" @@ -6026,7 +6055,7 @@ msgstr "Número de aplicacións finalizadas" msgid "Unnasigned" msgstr "Non asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:178 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 @@ -6053,7 +6082,7 @@ msgstr "A porcentaxe de duración debería estar entre 0 e 100" msgid "Multiple values per resource" msgstr "Múltiples valores por recurso" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:62 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 msgid "Split" msgstr "Dividir" @@ -6076,7 +6105,7 @@ msgstr "Compatible cos navegadores Chrome, Firefox, Safari e Epiphany" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:94 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:96 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 msgid "Starting date" msgstr "Data de inicio" @@ -6089,7 +6118,7 @@ msgstr "Engadir materiais" msgid "Load 100%" msgstr "Carga 100%" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:943 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Function" msgstr "Función" @@ -6099,7 +6128,7 @@ msgstr "Función" msgid "date in future" msgstr "data no futuro" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:851 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:855 msgid "New project version" msgstr "Nova versión de proxecto" @@ -6116,8 +6145,8 @@ msgstr "Formato" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1226 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:483 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1234 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 #: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78 @@ -6147,7 +6176,7 @@ msgstr "Editar" msgid "Init date" msgstr "Data de inicio" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:104 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:106 msgid "Responsible" msgstr "Responsable" @@ -6155,7 +6184,7 @@ msgstr "Responsable" msgid "New password" msgstr "Novo contrasinal" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:352 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:354 msgid "percentage must be in range (0,100]" msgstr "a porcentaxe debe estar no rango (0,100]" @@ -6195,7 +6224,7 @@ msgstr "Árobre {0} aplanada satisfatoriamente" #: libreplan-webapp/src/main/webapp/materials/materials.zul:82 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 msgid "Unit price" msgstr "Prezo da unidade" @@ -6283,8 +6312,8 @@ msgstr "Novembro" msgid "Enable/Disable" msgstr "Habilitar/Deshabilitar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1282 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1304 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1268 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1290 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6326,7 +6355,7 @@ msgstr "Criterio" msgid "unl" msgstr "ili" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:290 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 msgid "Test LDAP connection" msgstr "Probar a conexión co LDAP" @@ -6344,11 +6373,11 @@ msgstr "falta o código nunha etiqueta" msgid "Actual Cost Work Performed" msgstr "Custo de traballo realizado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:172 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:177 msgid "Create project from Template" msgstr "Crear proxecto a partir de modelo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:417 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:418 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6366,7 +6395,7 @@ msgstr "Debe seleccionar un tipo de autorización" msgid "Must start after (days since beginning project)" msgstr "Debe empezar despois de (días desde o inicio do proxecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:850 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:854 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6379,7 +6408,6 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72 #: libreplan-webapp/src/main/webapp/materials/materials.zul:45 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 @@ -6421,7 +6449,7 @@ msgstr "Debe seleccionar o tipo de excepción" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:99 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:101 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 msgid "Deadline" msgstr "data límite" @@ -6430,7 +6458,7 @@ msgstr "data límite" msgid "Tasks" msgstr "Tarefas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 msgid "Subcontracted Tasks" msgstr "Tarefas subcontratadas" @@ -6461,7 +6489,7 @@ msgstr "Tipo de etiqueta" msgid "Advanced Allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 msgid "Administration / Management" msgstr "Administración / Xestión" @@ -6473,7 +6501,7 @@ msgstr "Número de iteracións" msgid "Template Tree" msgstr "Árbore de modelos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:447 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:449 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 msgid "Alpha" msgstr "Alfa" @@ -6531,7 +6559,7 @@ msgstr "Tipo de formulario de calidade" msgid "work report has not this label type assigned" msgstr "o parte de traballo non ten este tipo de etiqueta asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1192 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1201 msgid "Limiting assignment" msgstr "Asignación limitante" @@ -6551,7 +6579,7 @@ msgstr " horas" msgid "The name of the criterion is empty." msgstr "O nome do criterio está baleiro." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 msgid "Limiting Resources Planning" @@ -6575,7 +6603,7 @@ msgstr "A data de inicio non pode ser nula" msgid "All project tasks" msgstr "Todas as tarefas do proxecto" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:367 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:375 msgid "LDAP Roles (separated by ;)" msgstr "Roles do LDAP (separados por ;)" @@ -6610,7 +6638,7 @@ msgstr "Axuda sobre a identificación (abre unha ventana nova)" msgid "The length must be greater than 0, and not null." msgstr "A lonxitude debe ser maior que cero e non nula." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:54 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 msgid "Not a valid effort duration" msgstr "Non é unha duración de esforzo válida" @@ -6644,13 +6672,13 @@ msgstr "Non se puido atopar o criterio {0}" msgid "Apply filtering to tasks satisfying required criteria" msgstr "Aplicar filtrado ás tarefas que satisfán os criterios requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:345 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37 msgid "Task Scheduling Status In Project" msgstr "Estado de planificación de tarefas en proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:261 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" @@ -6711,22 +6739,22 @@ msgstr "Etiquetas sen herdanza" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:272 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1242 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1250 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1207 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1193 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:646 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:955 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:961 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:983 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:989 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 @@ -6741,20 +6769,20 @@ msgstr "Etiquetas sen herdanza" #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/materials/materials.zul:104 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:117 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:59 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:57 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 @@ -6814,6 +6842,10 @@ msgstr "Inglés" msgid "Russian" msgstr "Ruso" +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:39 +msgid "Portuguese" +msgstr "Portugués" + #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 msgid "unlimited" msgstr "ilimitado" diff --git a/libreplan-webapp/src/main/resources/i18n/keys.pot b/libreplan-webapp/src/main/resources/i18n/keys.pot index 5a8cb2855..98253c0a8 100644 --- a/libreplan-webapp/src/main/resources/i18n/keys.pot +++ b/libreplan-webapp/src/main/resources/i18n/keys.pot @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-11 09:11+0100\n" +"POT-Creation-Date: 2011-11-25 11:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgstr "" msgid "The resource cannot be null" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:341 msgid "Group path" msgstr "" @@ -85,12 +85,13 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61 #: libreplan-webapp/src/main/webapp/materials/materials.zul:86 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:88 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 @@ -148,12 +149,12 @@ msgstr "" msgid "It can not be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:145 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:55 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:147 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 #: libreplan-webapp/src/main/webapp/templates/templates.zul:66 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 @@ -200,13 +201,13 @@ msgid "Summary" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 msgid "Reports" msgstr "" @@ -236,8 +237,8 @@ msgstr "" msgid "Dedication chart" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:702 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:729 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:689 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:716 msgid "Progress that are reported by quality forms can not be modified" msgstr "" @@ -257,7 +258,7 @@ msgstr "" msgid "Remove limiting resource element" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 msgid "Resource Usage" @@ -272,7 +273,7 @@ msgid "Unassign" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:302 msgid "Companies" msgstr "" @@ -280,7 +281,7 @@ msgstr "" msgid "Manual assignment" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:74 msgid "Quality form items list" msgstr "" @@ -300,7 +301,7 @@ msgstr "" msgid "generic workers allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:890 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:898 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308 msgid "The project has no scheduled elements" msgstr "" @@ -344,7 +345,7 @@ msgstr "" msgid "changing perspective" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31 msgid "Transfer Projects Between Scenarios" msgstr "" @@ -365,11 +366,11 @@ msgid "Project Name" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:938 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:966 msgid "Indent" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:314 msgid "Save passwords in database" msgstr "" @@ -403,7 +404,7 @@ msgstr "" msgid "Locations" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:78 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77 msgid "New quality form item" msgstr "" @@ -411,7 +412,7 @@ msgstr "" msgid "LibrePlan: Labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:269 msgid "LDAP connection was successful" msgstr "" @@ -419,11 +420,6 @@ msgstr "" msgid "Login name" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 -msgid "LibrePlan user" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84 msgid "{0} List" msgstr "" @@ -451,7 +447,7 @@ msgid "" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:53 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 #: libreplan-webapp/src/main/webapp/templates/templates.zul:65 msgid "Criterion Requirement" msgstr "" @@ -500,6 +496,10 @@ msgid "" "can't be added" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:334 +msgid "Role search strategy" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478 msgid "Error on showing warning message removing calendar: " msgstr "" @@ -514,11 +514,11 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46 msgid "Imputed hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37 msgid "Project Costs Per Resource" msgstr "" @@ -554,11 +554,15 @@ msgid "" "criterionSatisfaction from the same criterionType" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +msgid "Group strategy" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 msgid "Work Report Lines" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1546 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1555 msgid "Configure" msgstr "" @@ -569,7 +573,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/settings/settings.zul:58 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:51 msgid "First name" msgstr "" @@ -584,8 +588,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 msgid "Confirm deleting {0}. Are you sure?" msgstr "" @@ -594,11 +598,11 @@ msgstr "" msgid "Work Reports List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 msgid "Accounts" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:85 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:87 msgid "External code" msgstr "" @@ -624,7 +628,7 @@ msgstr "" msgid "resources per day must be not empty and bigger than zero" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:341 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:349 msgid "Backwards" msgstr "" @@ -637,7 +641,7 @@ msgstr "" msgid "Apply filtering to resources satisfying required criteria" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:106 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105 msgid "Up" msgstr "" @@ -679,6 +683,10 @@ msgid "" "value " msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 +msgid "missing worker code in the work report" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 @@ -690,16 +698,12 @@ msgstr "" msgid "End date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 -msgid "missing worker code in the work report" -msgstr "" - #: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89 msgid "profile name is already being used by another profile" msgstr "" #: libreplan-webapp/src/main/webapp/settings/settings.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:78 msgid "E-mail" msgstr "" @@ -713,8 +717,8 @@ msgstr "" msgid "The task code cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:593 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:594 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:327 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 @@ -761,7 +765,7 @@ msgstr "" msgid "Personal data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:720 msgid "Calculated progress can not be removed" msgstr "" @@ -785,11 +789,11 @@ msgstr "" msgid "June" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1038 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1066 msgid "Modified" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 msgid "Add Criterion" msgstr "" @@ -797,7 +801,7 @@ msgstr "" msgid "You can not remove the current scenario" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:680 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "" @@ -842,7 +846,7 @@ msgstr "" msgid "Average of worked hours in finished applications" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:706 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:693 msgid "Calculated progress can not be modified" msgstr "" @@ -863,12 +867,12 @@ msgstr "" msgid "Profile" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 msgid "Materials Needs At Date" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:277 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:279 msgid "UserDn" msgstr "" @@ -947,7 +951,7 @@ msgstr "" msgid "NON_LIMITING" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297 msgid "Workers" msgstr "" @@ -987,14 +991,14 @@ msgstr "" msgid "Date Start" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1275 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 msgid "Value is not valid, the current value must be less than max value" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: libreplan-webapp/src/main/webapp/planner/order.zul:108 +#: libreplan-webapp/src/main/webapp/planner/order.zul:105 msgid "Value" msgstr "" @@ -1007,7 +1011,7 @@ msgid "there are no valid periods for this calendar" msgstr "" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:93 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:95 msgid "Add role" msgstr "" @@ -1016,8 +1020,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:443 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:444 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:454 msgid "Repeated Project code {0} in Project {1}" msgstr "" @@ -1048,11 +1052,11 @@ msgid "Type data" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 msgid "Profiles" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:256 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 msgid "Host" msgstr "" @@ -1112,7 +1116,7 @@ msgstr "" msgid "Critical path" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:260 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:262 msgid "" "Deleting this item, it will disable the report progress option. Are you sure?" msgstr "" @@ -1152,11 +1156,11 @@ msgid "Cancel changes and back to scheduling" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: libreplan-webapp/src/main/webapp/planner/order.zul:109 +#: libreplan-webapp/src/main/webapp/planner/order.zul:106 msgid "Percentage" msgstr "" @@ -1199,12 +1203,12 @@ msgstr "" msgid "Profiles List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:919 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:51 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:914 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 @@ -1215,12 +1219,12 @@ 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/common/CustomMenuController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 msgid "Data Types" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:155 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 msgid "Total hours" msgstr "" @@ -1285,13 +1289,13 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:131 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:133 #: libreplan-webapp/src/main/webapp/common/configuration.zul:139 -#: libreplan-webapp/src/main/webapp/planner/order.zul:154 +#: libreplan-webapp/src/main/webapp/planner/order.zul:151 msgid "Calendar" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:307 #: libreplan-webapp/src/main/webapp/common/configuration.zul:119 msgid "Resources" msgstr "" @@ -1325,11 +1329,15 @@ msgstr "" msgid "worker's first name not specified" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:337 +msgid "Property strategy" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281 msgid "date not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206 msgid "Projects Planning" @@ -1339,13 +1347,13 @@ msgstr "" msgid "Shrink to fit page width" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:773 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:760 msgid "The max value must be greater than 0" msgstr "" #: libreplan-webapp/src/main/webapp/settings/settings.zul:63 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:56 msgid "Last name" msgstr "" @@ -1370,11 +1378,11 @@ msgstr "" msgid "Progress Type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1295 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1304 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:307 msgid "UserId" msgstr "" @@ -1397,7 +1405,7 @@ msgstr "" msgid "Create New Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1430 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1439 msgid "Stretches list" msgstr "" @@ -1409,7 +1417,7 @@ msgstr "" msgid "Zoom" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:829 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:833 #: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 @@ -1428,16 +1436,16 @@ msgstr "" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 #: libreplan-webapp/src/main/webapp/materials/materials.zul:115 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 #: libreplan-webapp/src/main/webapp/templates/templates.zul:135 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:376 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:384 msgid "Save" msgstr "" @@ -1450,9 +1458,9 @@ msgstr "" msgid "Material categories" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:576 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:674 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:603 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 msgid "number of digits must be between {0} and {1}" msgstr "" @@ -1480,7 +1488,8 @@ msgstr "" msgid "Entity type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1023 msgid "Unsaved changes will be lost. Are you sure?" msgstr "" @@ -1534,11 +1543,11 @@ msgstr "" msgid "Overload due to current project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:902 msgid "Name: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:874 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:902 msgid "Move down" msgstr "" @@ -1570,12 +1579,12 @@ msgstr "" msgid "BAC" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:379 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:381 msgid "Calculate Number of Hours" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:105 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:104 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 msgid "Assign" @@ -1585,7 +1594,7 @@ msgstr "" msgid "missing code in a criterion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1273 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281 msgid "Create Template" msgstr "" @@ -1741,7 +1750,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: libreplan-webapp/src/main/webapp/planner/order.zul:110 +#: libreplan-webapp/src/main/webapp/planner/order.zul:107 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 @@ -1758,7 +1767,7 @@ msgstr "" msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:678 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" @@ -1773,7 +1782,7 @@ msgstr "" msgid "The criterion and its type cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:421 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:422 msgid "The quality form must have an item with 100% value to report progress" msgstr "" @@ -1785,6 +1794,10 @@ msgstr "" msgid "The code is not valid. There is another unit type with the same code" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +msgid "Enable LDAP authentication" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 msgid "( max: {0} )" msgstr "" @@ -1805,6 +1818,7 @@ msgstr "" msgid "Select queue" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1499 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173 msgid "project name already being used" msgstr "" @@ -1813,7 +1827,7 @@ msgstr "" msgid "Work description" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:61 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 msgid "Split assignment" msgstr "" @@ -1837,7 +1851,7 @@ msgstr "" msgid "direct link" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:112 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:111 msgid "Down" msgstr "" @@ -1851,12 +1865,12 @@ msgstr "" msgid "Label" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:841 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:869 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:92 msgid "Association with roles" msgstr "" @@ -1868,8 +1882,8 @@ msgstr "" msgid "Quality forms" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:466 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:467 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:477 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "" @@ -1918,7 +1932,7 @@ msgstr "" msgid "Limiting resource assignation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -1954,11 +1968,11 @@ msgstr "" msgid "Resource cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:455 msgid "Total Hours" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:374 msgid "LibrePlan Role" msgstr "" @@ -1970,28 +1984,32 @@ msgstr "" msgid "Confirm cancel" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37 msgid "Work And Progress Per Task" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1523 +msgid "project code already being used" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_edition.zul:40 msgid "WBS (tasks)" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:843 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:878 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 msgid "Error on showing removing element: " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:728 msgid "Deleting sequence" msgstr "" @@ -2060,11 +2078,15 @@ msgstr "" msgid "CutycaptTimeout thread exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "" +#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 +msgid "New" +msgstr "" + #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 msgid "Date last progress measurement" msgstr "" @@ -2087,7 +2109,7 @@ msgid "" "calendar is derived from this one." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:907 msgid "Value is not valid, the type must be not empty" msgstr "" @@ -2107,21 +2129,16 @@ msgstr "" msgid "Create Task" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 -msgid "LDAP Authentication enabled" -msgstr "" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" msgstr "" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:99 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:101 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:131 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 @@ -2141,7 +2158,7 @@ msgstr "" msgid "Start hour" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:140 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 msgid "Assign materials" msgstr "" @@ -2160,7 +2177,7 @@ msgstr "" msgid "ID" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:349 msgid "Settings" msgstr "" @@ -2200,7 +2217,7 @@ msgstr "" msgid "Unallocated name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:895 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:923 msgid "Move up" msgstr "" @@ -2213,14 +2230,14 @@ msgid "Subcontract communication date" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:359 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:365 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 msgid "Scheduling" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:126 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:128 msgid "Dependencies have priority" msgstr "" @@ -2252,9 +2269,9 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:910 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:159 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 msgid "State" @@ -2264,11 +2281,11 @@ msgstr "" msgid "Must start after" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1306 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1315 msgid "Confirm change" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:848 msgid "You don't have permissions to edit this project" msgstr "" @@ -2307,7 +2324,7 @@ msgstr "" msgid "New task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:191 msgid "The password for a new user cannot be empty" msgstr "" @@ -2394,7 +2411,7 @@ msgstr "" msgid "Value is not valid, the default max value must not be empty " msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:343 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 msgid "Role property" msgstr "" @@ -2419,21 +2436,21 @@ msgstr "" msgid "Activation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 msgid "Scenarios" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375 msgid "Materials saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1252 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37 msgid "Total Worked Hours By Resource In A Month" msgstr "" @@ -2450,7 +2467,7 @@ msgstr "" msgid "At least one {0} sequence must be active" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:130 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 @@ -2473,7 +2490,7 @@ msgstr "" msgid "At least one {0} sequence is needed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37 msgid "Estimated/Planned Hours Per Task" msgstr "" @@ -2486,7 +2503,11 @@ msgstr "" msgid "Assigned" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:45 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:244 +msgid "Use LDAP roles" +msgstr "" + +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:44 msgid "Details" msgstr "" @@ -2523,7 +2544,7 @@ msgstr "" msgid "LibrePlan: Work And Progress Per Task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 msgid "Change Password" msgstr "" @@ -2531,14 +2552,15 @@ msgstr "" msgid "Projects" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:264 -msgid "Confirm exit dialog" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64 msgid "Not found converter for {0}" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:272 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1024 +msgid "Confirm exit dialog" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 msgid "Material assignments" msgstr "" @@ -2565,7 +2587,7 @@ msgstr "" msgid "Question" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." @@ -2618,7 +2640,7 @@ msgstr "" msgid "Output format" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:44 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47 msgid "Print" msgstr "" @@ -2653,25 +2675,24 @@ msgstr "" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:138 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:157 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:142 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 #: libreplan-webapp/src/main/webapp/templates/templates.zul:139 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:379 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:387 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 -#: libreplan-webapp/src/main/webapp/planner/order.zul:73 -#: libreplan-webapp/src/main/webapp/planner/order.zul:134 -#: libreplan-webapp/src/main/webapp/planner/order.zul:169 +#: libreplan-webapp/src/main/webapp/planner/order.zul:131 +#: libreplan-webapp/src/main/webapp/planner/order.zul:166 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 msgid "Cancel" msgstr "" @@ -2700,8 +2721,8 @@ msgstr "" msgid "CPI" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:687 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:695 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318 msgid "You don't have read access to this project" msgstr "" @@ -2766,11 +2787,11 @@ msgstr "" msgid "Delete selected task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:126 msgid "{0} (max: {1})" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:470 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 msgid "end" msgstr "" @@ -2778,7 +2799,7 @@ msgstr "" msgid "Cost Category" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:357 msgid "Role search query" msgstr "" @@ -2804,7 +2825,7 @@ msgstr "" msgid "Start date cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 msgid "Subcontracting" msgstr "" @@ -2812,7 +2833,7 @@ msgstr "" msgid "references" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1278 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1264 msgid "Value is not valid, the Precision value must be exact " msgstr "" @@ -2832,7 +2853,7 @@ msgstr "" msgid "Add criterion requirement" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:855 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 msgid "" "You can not remove the project \"{0}\" because of any of its tasks are " "already in use in some work reports and the project just exists in the " @@ -2872,7 +2893,7 @@ msgstr "" msgid "please, select a label" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:125 msgid "Add profile" msgstr "" @@ -2894,7 +2915,7 @@ msgstr "" msgid "Criterion name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:127 msgid "values are not valid, the values must not be null" msgstr "" @@ -2912,7 +2933,7 @@ msgstr "" msgid "cost assignment's resource not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:132 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 @@ -2946,7 +2967,7 @@ msgid "the name must be not empty" msgstr "" #: libreplan-webapp/src/main/webapp/materials/materials.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:71 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Disabled" msgstr "" @@ -2982,8 +3003,8 @@ msgid "" "Please save your project before proceeding." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1109 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1124 msgid "{0} not supported yet" msgstr "" @@ -3004,7 +3025,7 @@ msgstr "" msgid "Resources Load" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:241 msgid "Changes have been canceled" msgstr "" @@ -3012,7 +3033,7 @@ msgstr "" msgid "LibrePlan: Hours Worked Per Worker In A Month" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:297 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 msgid "Authentication" msgstr "" @@ -3074,7 +3095,7 @@ msgstr "" msgid "Select start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:877 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 msgid "Removed {0}" msgstr "" @@ -3092,7 +3113,7 @@ msgid "Group name" msgstr "" #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:100 msgid "Role name" msgstr "" @@ -3134,11 +3155,11 @@ msgstr "" msgid "Assign selected items" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:449 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:450 msgid "init" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1215 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1201 msgid "Add new progress measurement" msgstr "" @@ -3146,7 +3167,7 @@ msgstr "" msgid "Select for automatic queuing" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 msgid "Scenarios Management" msgstr "" @@ -3158,7 +3179,7 @@ msgstr "" msgid "Create & Assign" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1549 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1558 msgid "Not configurable" msgstr "" @@ -3166,7 +3187,7 @@ msgstr "" msgid "Advanced allocation" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/order.zul:111 +#: libreplan-webapp/src/main/webapp/planner/order.zul:108 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96 msgid "Consolidated" @@ -3201,7 +3222,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:109 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:111 msgid "Customer" msgstr "" @@ -3216,17 +3237,19 @@ msgstr "" msgid "criterion type name not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:246 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 msgid "Cannot connect to LDAP server" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219 msgid "Add Exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:301 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:322 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:303 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:378 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:219 msgid "cannot be empty" msgstr "" @@ -3307,8 +3330,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:441 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 @@ -3336,7 +3359,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 #: libreplan-webapp/src/main/webapp/materials/materials.zul:58 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 @@ -3350,7 +3373,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 #: libreplan-webapp/src/main/webapp/templates/templates.zul:80 @@ -3401,11 +3424,11 @@ msgstr "" msgid "Companies List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1453 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1462 msgid "Stretches with Interpolation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37 msgid "Hours Worked Per Resource" msgstr "" @@ -3492,22 +3515,22 @@ msgstr "" msgid "Virtual Workers Group" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:225 msgid "Changes saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1258 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1266 msgid "See scheduling" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:328 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110 msgid "Progress measurements" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1200 msgid "Add measure" msgstr "" @@ -3536,7 +3559,7 @@ msgstr "" msgid "End" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1346 msgid "The date is not valid, the date must be not empty" msgstr "" @@ -3545,7 +3568,7 @@ msgid "User login name" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 msgid "Cost Categories" msgstr "" @@ -3571,7 +3594,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:57 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56 msgid "Task quality forms" msgstr "" @@ -3588,7 +3611,7 @@ msgstr "" msgid "Cost category" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:700 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:727 msgid "It can not be deleted. At least one sequence is necessary." msgstr "" @@ -3638,26 +3661,26 @@ msgstr "" msgid "Time finish cannot be null" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:116 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:118 msgid "Customer reference" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:688 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:891 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:927 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:849 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319 msgid "Information" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:926 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:934 msgid "Sorry, you do not have permissions to access this project" msgstr "" @@ -3677,6 +3700,10 @@ msgstr "" msgid "New hours group " msgstr "" +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +msgid "Please remember that only saved changes will be printed" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 msgid "Assign element to queue manually" msgstr "" @@ -3689,11 +3716,11 @@ msgstr "" msgid "Resource: {0} " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:358 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:360 msgid "percentage cannot be duplicated" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 msgid "Work Hours" msgstr "" @@ -3747,8 +3774,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:305 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:328 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221 msgid "{0} already exists" msgstr "" @@ -3766,20 +3793,20 @@ msgid "Code " msgstr "" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:65 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:66 msgid "Password confirmation" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 -msgid "Work Report" -msgstr "" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 msgid "Indent selected task" msgstr "" +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 +msgid "Work Report" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 #: libreplan-webapp/src/main/webapp/common/configuration.zul:135 msgid "Unit Measures" msgstr "" @@ -3789,11 +3816,11 @@ msgstr "" msgid "Show progress" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:142 msgid "Work" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:297 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 msgid "" "Error saving the project\n" "{0}" @@ -3811,9 +3838,9 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:299 #: 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:1296 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 msgid "Error" msgstr "" @@ -3850,7 +3877,7 @@ msgid "" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 -#: libreplan-webapp/src/main/webapp/planner/order.zul:83 +#: libreplan-webapp/src/main/webapp/planner/order.zul:80 msgid "Progress consolidation" msgstr "" @@ -3879,7 +3906,7 @@ msgstr "" msgid "Task Information" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:140 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:145 msgid "Hours Group at " msgstr "" @@ -3900,7 +3927,7 @@ msgstr "" msgid "Budgeted Cost Work Scheduled" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 msgid "Changes applied" msgstr "" @@ -3932,7 +3959,7 @@ msgstr "" msgid "criterion type does not allow resource hierarchy" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:150 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:152 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 msgid "Total" @@ -3955,8 +3982,8 @@ msgstr "" msgid "Select destination" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/order.zul:92 -#: libreplan-webapp/src/main/webapp/planner/order.zul:98 +#: libreplan-webapp/src/main/webapp/planner/order.zul:89 +#: libreplan-webapp/src/main/webapp/planner/order.zul:95 msgid "Check consolidated progresses" msgstr "" @@ -3984,7 +4011,7 @@ msgid "Apply tab changes" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:93 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:170 msgid "passwords don't match" msgstr "" @@ -4012,7 +4039,7 @@ msgstr "" msgid "Value last progress reported" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 msgid "Report Progress" msgstr "" @@ -4020,7 +4047,7 @@ msgstr "" msgid "Show dependencies" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Schedule from start to deadline" msgstr "" @@ -4056,7 +4083,7 @@ msgstr "" msgid "LibrePlan: Work Hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 msgid "LibrePlan Configuration" msgstr "" @@ -4103,7 +4130,7 @@ msgstr "" msgid "In the available periods {0} only {1} hours are available." msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:118 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120 msgid "Association with profiles" msgstr "" @@ -4137,11 +4164,11 @@ msgstr "" msgid "Average of estimated hours" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:270 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:272 msgid "Base" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:683 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" @@ -4159,7 +4186,7 @@ msgstr "" msgid "Worker deleted" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:760 msgid "Select entity, please" msgstr "" @@ -4250,7 +4277,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 msgid "Position" msgstr "" @@ -4276,7 +4303,7 @@ msgstr "" msgid "A description field of the same name already exists." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1177 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1163 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" @@ -4321,7 +4348,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 #: libreplan-webapp/src/main/webapp/common/configuration.zul:35 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:248 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:250 msgid "Configuration" msgstr "" @@ -4343,11 +4370,11 @@ msgid "Select type" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:911 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:906 msgid "Hours invested" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:326 msgid "Authorization" msgstr "" @@ -4356,7 +4383,7 @@ msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 msgid "Project saved" msgstr "" @@ -4376,7 +4403,7 @@ msgstr "" msgid "Derived exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 msgid "Machines" msgstr "" @@ -4384,7 +4411,7 @@ msgstr "" msgid "Unit Measures List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:153 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:149 msgid "Couldn't find element: {0}" msgstr "" @@ -4397,7 +4424,7 @@ msgstr "" msgid "unit type code not found" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:348 msgid "My account" msgstr "" @@ -4413,7 +4440,7 @@ msgstr "" msgid "Both" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:758 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:764 msgid "Not editable for containing more that an hours group." msgstr "" @@ -4427,7 +4454,7 @@ msgid "Limiting resource" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58 -#: libreplan-webapp/src/main/webapp/planner/order.zul:146 +#: libreplan-webapp/src/main/webapp/planner/order.zul:143 msgid "Calendar allocation" msgstr "" @@ -4441,7 +4468,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/materials/materials.zul:84 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:120 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 msgid "Category" msgstr "" @@ -4459,7 +4486,7 @@ msgstr "" msgid "Category data" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:103 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:102 msgid "Search" msgstr "" @@ -4500,11 +4527,11 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1323 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1331 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:251 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 msgid "must be lower than finish date" msgstr "" @@ -4534,7 +4561,7 @@ msgstr "" msgid "Could not load any resource" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:341 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" msgstr "" @@ -4596,8 +4623,8 @@ msgstr "" msgid "Unit type code cannot be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:183 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 msgid "Users" msgstr "" @@ -4707,11 +4734,11 @@ msgstr "" msgid "Load due to current project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1314 msgid "You are going to change the assignment function. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 msgid "Exception Days" msgstr "" @@ -4732,13 +4759,13 @@ msgstr "" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 #: libreplan-webapp/src/main/webapp/templates/templates.zul:137 msgid "Save & Continue" msgstr "" @@ -4747,7 +4774,7 @@ msgstr "" msgid "LibrePlan: Work And Progress Per Project" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:90 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:92 msgid "Scheduling mode" msgstr "" @@ -4787,11 +4814,16 @@ msgstr "" msgid "The periods available depend on the resource's calendar." msgstr "" +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:83 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +msgid "Authentication type" +msgstr "" + #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:55 msgid "START" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:350 msgid "Schedule from the deadline to start" msgstr "" @@ -4803,8 +4835,9 @@ msgstr "" msgid "Non limiting resource assignation" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:87 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 +#: libreplan-webapp/src/main/webapp/planner/order.zul:70 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 msgid "Back" msgstr "" @@ -4823,11 +4856,11 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1306 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1314 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:234 msgid "must be greater than start date" msgstr "" @@ -4852,7 +4885,7 @@ msgstr "" msgid "Unit measure name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:144 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:140 msgid "cannot include a progress of the same progress type twice" msgstr "" @@ -4909,7 +4942,7 @@ msgstr "" msgid "Removed calendar \"{0}\"" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1063 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1071 msgid "Create project" msgstr "" @@ -4922,7 +4955,7 @@ msgid "" "Allow multiple values of this type of criterion in the same period of time" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1294 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1280 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "" @@ -4955,11 +4988,11 @@ msgstr "" msgid "Root calendar" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:265 msgid "Port" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -4996,7 +5029,7 @@ msgstr "" msgid "missing code in a hour cost" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858 msgid "All workers" msgstr "" @@ -5017,12 +5050,14 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1492 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1516 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:738 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:765 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 @@ -5051,7 +5086,6 @@ msgstr "" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:46 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 msgid "cannot be null or empty" @@ -5070,7 +5104,7 @@ msgstr "" msgid "The progress type cannot be modified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:392 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:394 msgid "Calculate Resources per Day" msgstr "" @@ -5084,7 +5118,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/materials/materials.zul:83 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 msgid "Unit type" msgstr "" @@ -5105,7 +5139,7 @@ msgstr "" msgid "Calendar data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 msgid "Work Reports" msgstr "" @@ -5144,8 +5178,8 @@ msgstr "" msgid "Customer Reference" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:147 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:143 msgid "spread values are not valid, at least one value should be true" msgstr "" @@ -5175,12 +5209,12 @@ msgid "" "the Configuration window before." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:600 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:903 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 #: libreplan-webapp/src/main/webapp/templates/templates.zul:63 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 msgid "Progress" @@ -5192,7 +5226,7 @@ msgid "" "or resources" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1210 msgid "All progress types have already been assigned." msgstr "" @@ -5204,7 +5238,7 @@ msgstr "" msgid "Project: {0} " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 msgid "Calendars" msgstr "" @@ -5241,7 +5275,7 @@ msgstr "" msgid "Error on showing delete confirm" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:623 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 msgid "Sum of all rows" msgstr "" @@ -5290,7 +5324,7 @@ msgstr "" msgid "Active" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1247 msgid "This progress measurement can not be in " msgstr "" @@ -5298,19 +5332,19 @@ msgstr "" msgid "Inherited labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1232 msgid "" "This progress can not be changed or removed, because it has got consolidated " "progress. It is needed to remove the consolidation on all its progress." msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:917 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:945 msgid "Unindent" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:935 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1384 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1370 msgid "Value is not valid, the current value must be not empty" msgstr "" @@ -5338,7 +5372,7 @@ msgstr "" msgid "missing code in a work report line" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:928 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:937 msgid "Efforts" msgstr "" @@ -5346,7 +5380,7 @@ msgstr "" msgid "Show all reported hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 msgid "Projects List" @@ -5365,7 +5399,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:80 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:82 msgid "Generate code" msgstr "" @@ -5377,14 +5411,10 @@ msgstr "" msgid "This template can not be removed because it has applications." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:513 msgid "The code sequence is already in use and it can not be updated." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:332 -msgid "Import LDAP roles" -msgstr "" - #: libreplan-webapp/src/main/webapp/settings/settings.zul:43 msgid "Personal Data" msgstr "" @@ -5401,7 +5431,7 @@ msgstr "" msgid "Number of iterations should be between 1 and " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:142 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:149 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" @@ -5419,7 +5449,7 @@ msgstr "" msgid "Profiles authorization" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Virtual Workers Groups" msgstr "" @@ -5481,9 +5511,9 @@ msgid "All projects" msgstr "" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:284 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:286 msgid "Password" msgstr "" @@ -5492,7 +5522,7 @@ msgstr "" msgid "Observations" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:942 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:950 msgid "Edit project" msgstr "" @@ -5531,7 +5561,7 @@ msgstr "" msgid "Current password is incorrect" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366 msgid "Cannot insert material in general view. Please, select a category" msgstr "" @@ -5552,9 +5582,8 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 -#: libreplan-webapp/src/main/webapp/planner/order.zul:70 -#: libreplan-webapp/src/main/webapp/planner/order.zul:131 -#: libreplan-webapp/src/main/webapp/planner/order.zul:166 +#: libreplan-webapp/src/main/webapp/planner/order.zul:128 +#: libreplan-webapp/src/main/webapp/planner/order.zul:163 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/main.zul:66 @@ -5562,14 +5591,14 @@ msgid "Accept" msgstr "" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:266 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:273 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:280 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:308 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:346 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:261 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:268 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:275 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:282 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:310 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:345 #: libreplan-webapp/src/main/webapp/common/configuration.zul:353 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:361 msgid "Example: {0}" msgstr "" @@ -5591,7 +5620,7 @@ msgstr "" msgid "Completed: {0}% " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1181 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1167 msgid "Calculated progress measurement can not be removed" msgstr "" @@ -5692,9 +5721,9 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:77 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 @@ -5717,7 +5746,7 @@ msgstr "" msgid "Assignation type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:367 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:369 msgid "Calculate Workable Days" msgstr "" @@ -5745,7 +5774,7 @@ msgstr "" msgid "Operation cannot be done" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:138 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 msgid "Budget" msgstr "" @@ -5840,7 +5869,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:120 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:122 #: libreplan-webapp/src/main/webapp/templates/templates.zul:101 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 @@ -5861,11 +5890,11 @@ msgid "already exists an allocation for criteria {0}" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 msgid "Project Templates" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Forward" msgstr "" @@ -5883,7 +5912,7 @@ msgstr "" msgid "Unnasigned" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:178 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 @@ -5910,7 +5939,7 @@ msgstr "" msgid "Multiple values per resource" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:62 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 msgid "Split" msgstr "" @@ -5933,7 +5962,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:94 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:96 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 msgid "Starting date" msgstr "" @@ -5946,7 +5975,7 @@ msgstr "" msgid "Load 100%" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:943 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Function" msgstr "" @@ -5956,7 +5985,7 @@ msgstr "" msgid "date in future" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:851 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:855 msgid "New project version" msgstr "" @@ -5973,8 +6002,8 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1226 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:483 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1234 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 #: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78 @@ -6004,7 +6033,7 @@ msgstr "" msgid "Init date" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:104 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:106 msgid "Responsible" msgstr "" @@ -6012,7 +6041,7 @@ msgstr "" msgid "New password" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:352 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:354 msgid "percentage must be in range (0,100]" msgstr "" @@ -6048,7 +6077,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/materials/materials.zul:82 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 msgid "Unit price" msgstr "" @@ -6134,8 +6163,8 @@ msgstr "" msgid "Enable/Disable" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1282 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1304 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1268 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1290 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6176,7 +6205,7 @@ msgstr "" msgid "unl" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:290 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 msgid "Test LDAP connection" msgstr "" @@ -6194,11 +6223,11 @@ msgstr "" msgid "Actual Cost Work Performed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:172 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:177 msgid "Create project from Template" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:417 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:418 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6213,7 +6242,7 @@ msgstr "" msgid "Must start after (days since beginning project)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:850 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:854 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6224,7 +6253,6 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72 #: libreplan-webapp/src/main/webapp/materials/materials.zul:45 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 @@ -6266,7 +6294,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:99 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:101 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 msgid "Deadline" msgstr "" @@ -6275,7 +6303,7 @@ msgstr "" msgid "Tasks" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 msgid "Subcontracted Tasks" msgstr "" @@ -6306,7 +6334,7 @@ msgstr "" msgid "Advanced Allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 msgid "Administration / Management" msgstr "" @@ -6318,7 +6346,7 @@ msgstr "" msgid "Template Tree" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:447 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:449 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 msgid "Alpha" msgstr "" @@ -6376,7 +6404,7 @@ msgstr "" msgid "work report has not this label type assigned" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1192 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1201 msgid "Limiting assignment" msgstr "" @@ -6396,7 +6424,7 @@ msgstr "" msgid "The name of the criterion is empty." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 msgid "Limiting Resources Planning" @@ -6420,7 +6448,7 @@ msgstr "" msgid "All project tasks" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:367 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:375 msgid "LDAP Roles (separated by ;)" msgstr "" @@ -6455,7 +6483,7 @@ msgstr "" msgid "The length must be greater than 0, and not null." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:54 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 msgid "Not a valid effort duration" msgstr "" @@ -6489,13 +6517,13 @@ msgstr "" msgid "Apply filtering to tasks satisfying required criteria" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:345 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37 msgid "Task Scheduling Status In Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:261 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" @@ -6556,22 +6584,22 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:272 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1242 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1250 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1207 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1193 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:646 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:955 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:961 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:983 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:989 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 @@ -6586,20 +6614,20 @@ msgstr "" #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/materials/materials.zul:104 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:117 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:59 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:57 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 @@ -6659,6 +6687,10 @@ msgstr "" msgid "Russian" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:39 +msgid "Portuguese" +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 msgid "unlimited" msgstr "" diff --git a/libreplan-webapp/src/main/resources/web/js/webcommon/LenientDecimalBox.js b/libreplan-webapp/src/main/resources/web/js/webcommon/LenientDecimalBox.js index 2fc932af5..c2312426a 100644 --- a/libreplan-webapp/src/main/resources/web/js/webcommon/LenientDecimalBox.js +++ b/libreplan-webapp/src/main/resources/web/js/webcommon/LenientDecimalBox.js @@ -6,8 +6,9 @@ webcommon.LenientDecimalBox = zk.$extends(zul.inp.Decimalbox,{ if(!b) { return null; } - //replace decimal comma with dot - b = b.replace(',','.'); + //to allow using . as decimal separator, independently of the locale + //we replace . with the actual decimal separator of the current locale + b = b.replace('.', zk.DECIMAL); //process normally return this.$supers('coerceFromString_', arguments); } diff --git a/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css b/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css index f8534d3e8..4c9fa6040 100644 --- a/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css +++ b/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css @@ -100,6 +100,11 @@ body .advancedallocationlayout .icono .z-button-cm { border-right:0; } + +.perspectives-column .global-commands { + margin-bottom: 0; +} + .toolbar-box { border:0; } @@ -1008,7 +1013,8 @@ span.perspective, span.perspective-active { display: none; } -.taskdetailsContainer { +.taskdetailsContainer, +.resourceloaddetailsContainer { border-left:0; border-top:0; } @@ -1138,6 +1144,10 @@ span.perspective, span.perspective-active { border-bottom:1px solid #9ECAD8; } +.orderslayout-area > .z-center-body { + height: auto !important; +} + .orderelements-tab { overflow-x: auto; } diff --git a/libreplan-webapp/src/main/webapp/common/layout/template.zul b/libreplan-webapp/src/main/webapp/common/layout/template.zul index e737e91c2..4ac6728b2 100644 --- a/libreplan-webapp/src/main/webapp/common/layout/template.zul +++ b/libreplan-webapp/src/main/webapp/common/layout/template.zul @@ -112,13 +112,13 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
- - + +