From 4918307f0c09d7dce53c9cdd3c805752c7103128 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 16 Dec 2010 22:02:28 +0100 Subject: [PATCH] Renamed "order" to "project" and "order element" to "task" in all the strings. FEA: ItEr65S06BugFixing --- .../entities/CriterionRequirementHandler.java | 2 +- .../business/orders/entities/HoursGroup.java | 4 ++-- .../orders/entities/OrderElement.java | 10 ++++----- .../orders/entities/OrderLineGroup.java | 4 ++-- .../orders/entities/OrderStatusEnum.java | 2 +- .../templates/entities/OrderTemplate.java | 4 ++-- .../business/users/entities/UserRole.java | 6 ++--- .../web/common/TemplateModel.java | 4 ++-- .../finders/OrderBandboxFinder.java | 4 ++-- .../finders/OrderElementBandboxFinder.java | 4 ++-- .../web/limitingresources/QueueComponent.java | 2 +- .../web/materials/MaterialsController.java | 2 +- ...kQualityFormsToOrderElementController.java | 2 +- .../web/orders/OrderCRUDController.java | 22 +++++++++---------- .../web/orders/OrderElementController.java | 2 +- .../orders/OrderElementTreeController.java | 10 ++++----- .../web/orders/OrderElementTreeModel.java | 2 +- .../navalplanner/web/orders/OrderModel.java | 6 ++--- .../web/orders/OrdersTreeComponent.java | 2 +- .../planner/company/CompanyPlanningModel.java | 4 ++-- .../web/planner/order/SaveCommand.java | 4 ++-- .../tabs/LimitingResourcesTabCreator.java | 2 +- .../web/planner/tabs/PlanningTabCreator.java | 2 +- ...pletedEstimatedHoursPerTaskController.java | 2 +- .../OrderCostsPerResourceController.java | 4 ++-- .../reports/OrderCostsPerResourceModel.java | 4 ++-- .../SchedulingProgressPerOrderController.java | 4 ++-- .../TimeLineRequiredMaterialController.java | 4 ++-- ...WorkingArrangementsPerOrderController.java | 4 ++-- .../WorkingProgressPerTaskController.java | 2 +- .../resourceload/ResourceLoadController.java | 4 ++-- .../web/resourceload/ResourceLoadModel.java | 6 ++--- .../scenarios/TransferOrdersController.java | 2 +- .../web/scenarios/TransferOrdersModel.java | 6 ++--- .../navalplanner/web/tree/TreeComponent.java | 4 ++-- .../web/users/OrderAuthorizationModel.java | 2 +- .../workreports/WorkReportCRUDController.java | 8 +++---- .../ws/common/impl/OrderElementConverter.java | 14 ++++++------ .../impl/SubcontractServiceREST.java | 10 ++++----- .../workreports/impl/WorkReportConverter.java | 8 +++---- .../src/main/webapp/common/configuration.zul | 2 +- .../limitingResourcesLayout.zul | 2 +- .../main/webapp/orders/_editOrderElement.zul | 2 +- .../src/main/webapp/orders/_list.zul | 4 ++-- ..._listOrderElementCriterionRequirements.zul | 4 ++-- .../webapp/orders/_listOrderElementHours.zul | 2 +- .../webapp/orders/_orderElementDetails.zul | 2 +- .../webapp/orders/_orderElementTreeFilter.zul | 2 +- .../src/main/webapp/orders/_orderFilter.zul | 4 ++-- .../src/main/webapp/orders/_ordersTab.zul | 6 ++--- .../orders/components/_orderElementTree.zul | 18 +++++++-------- .../webapp/planner/_legendLoadChartOrder.zul | 6 ++--- .../_tabPanelLimitingResourceAllocation.zul | 2 +- ..._tabPanelNonLimitingResourceAllocation.zul | 2 +- .../completedEstimatedHoursPerTask.zul | 4 ++-- .../webapp/reports/orderCostsPerResource.zul | 2 +- .../schedulingProgressPerOrderReport.zul | 2 +- .../webapp/reports/timeLineMaterialReport.zul | 2 +- .../workingArrangementsPerOrderReport.zul | 4 ++-- .../reports/workingProgressPerTaskReport.zul | 4 ++-- .../src/main/webapp/scenarios/_edition.zul | 4 ++-- .../webapp/subcontract/reportAdvances.zul | 2 +- .../webapp/subcontract/subcontractedTasks.zul | 2 +- .../webapp/templates/_editTemplateWindow.zul | 2 +- .../templates/_historicalAssignment.zul | 8 +++---- .../workreports/_editWorkReportType.zul | 4 ++-- .../main/webapp/workreports/workReport.zul | 2 +- .../webapp/workreports/workReportQuery.zul | 6 ++--- 68 files changed, 150 insertions(+), 150 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java index d0fdf58d1..36aadaed5 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java @@ -536,7 +536,7 @@ public abstract class CriterionRequirementHandler implements } else { final Criterion criterion = newRequirement.getCriterion(); throw new IllegalStateException(_( - " The {0} already exist into other order element", + " The {0} already exist into other task", criterion.getName())); } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java index 7637bcfca..ddc8c10a4 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java @@ -417,7 +417,7 @@ public class HoursGroup extends IntegrationEntity implements Cloneable, repeatedHoursGroup = ((OrderLineGroup) order).findRepeatedHoursGroupCode(); if (repeatedHoursGroup != null) { throw new ValidationException(_( - "Repeated Hours Group code {0} in Order {1}", + "Repeated Hours Group code {0} in Project {1}", repeatedHoursGroup.getCode(), repeatedHoursGroup .getParentOrderLine().getName())); } @@ -427,7 +427,7 @@ public class HoursGroup extends IntegrationEntity implements Cloneable, .findRepeatedHoursGroupCodeInDB(order.getHoursGroups()); if (repeatedHoursGroup != null) { throw new ValidationException(_( - "Repeated Hours Group code {0} in Order {1}", + "Repeated Hours Group code {0} in Project {1}", repeatedHoursGroup.getCode(), repeatedHoursGroup .getParentOrderLine().getName())); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java index 8adeb48f8..5ffeb592f 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java @@ -650,7 +650,7 @@ public abstract class OrderElement extends IntegrationEntity implements for (DirectAdvanceAssignment directAdvanceAssignment : directAdvanceAssignments) { if (directAdvanceAssignment.getReportGlobalAdvance()) { throw new DuplicateValueTrueReportGlobalAdvanceException( - _("Cannot spread two advances in the same order element"), + _("Cannot spread two advances in the same task"), this, OrderElement.class); } } @@ -674,7 +674,7 @@ public abstract class OrderElement extends IntegrationEntity implements if (AdvanceType.equivalentInDB(directAdvanceAssignment .getAdvanceType(), newAdvanceAssignment.getAdvanceType())) { throw new DuplicateAdvanceAssignmentForOrderElementException( - _("Duplicate Advance Assignment For Order Element"), + _("Duplicate Advance Assignment For Task"), this, OrderElement.class); } @@ -701,7 +701,7 @@ public abstract class OrderElement extends IntegrationEntity implements if (AdvanceType.equivalentInDB(directAdvanceAssignment .getAdvanceType(), newAdvanceAssignment.getAdvanceType())) { throw new DuplicateAdvanceAssignmentForOrderElementException( - _("Duplicate Advance Assignment For Order Element"), + _("Duplicate Advance Assignment For Task"), this, OrderElement.class); } @@ -1305,7 +1305,7 @@ public abstract class OrderElement extends IntegrationEntity implements repeatedOrder = ((OrderLineGroup) order).findRepeatedOrderCode(); if (repeatedOrder != null) { throw new ValidationException(_( - "Repeated Order code {0} in Order {1}", + "Repeated Project code {0} in Project {1}", repeatedOrder.getCode(), repeatedOrder.getName())); } } @@ -1315,7 +1315,7 @@ public abstract class OrderElement extends IntegrationEntity implements .findRepeatedOrderCodeInDB(order); if (repeatedOrder != null) { throw new ValidationException(_( - "Repeated Order code {0} in Order {1}", + "Repeated Project code {0} in Project {1}", repeatedOrder.getCode(), repeatedOrder.getName())); } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java index 593190cbc..e0238cfdc 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java @@ -896,7 +896,7 @@ public class OrderLineGroup extends OrderElement implements for (AdvanceAssignment advanceAssignment : advanceAssignments) { if (advanceAssignment.getReportGlobalAdvance()) { throw new DuplicateValueTrueReportGlobalAdvanceException( - _("Cannot spread two advances in the same order element"), + _("Cannot spread two advances in the same task"), this, OrderElement.class); } } @@ -1055,4 +1055,4 @@ public class OrderLineGroup extends OrderElement implements return result; } -} \ No newline at end of file +} diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java index 7abc945ac..d92b15484 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java @@ -31,7 +31,7 @@ public enum OrderStatusEnum { OFFERED(_("OFFERED")), ACCEPTED(_("ACCEPTED")), STARTED(_("STARTED")), FINISHED( _("FINISHED")), CANCELLED(_("CANCELLED")), SUBCONTRACTED_PENDING_ORDER( - _("SUBCONTRACTED PENDING ORDER")), STORED(_("STORED")); + _("SUBCONTRACTED PENDING PROJECT")), STORED(_("STORED")); private String description; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java index 35c454910..7b37a7fde 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java @@ -44,7 +44,7 @@ public class OrderTemplate extends OrderLineGroupTemplate { return create(beingBuilt, order); } - @NotNull(message = "order calendar not specified") + @NotNull(message = "project calendar not specified") private BaseCalendar calendar; @Override @@ -69,7 +69,7 @@ public class OrderTemplate extends OrderLineGroupTemplate { @Override public String getType() { - return _("Order"); + return _("Project"); } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java index df8db4faa..bec54061a 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java @@ -32,9 +32,9 @@ public enum UserRole { ROLE_ADMINISTRATION(_("Administration")), ROLE_WS_READER(_("Web service reader")), ROLE_WS_WRITER(_("Web service writer")), - ROLE_READ_ALL_ORDERS(_("All orders read allowed")), - ROLE_EDIT_ALL_ORDERS(_("All orders edition allowed")), - ROLE_CREATE_ORDER(_("Order creation allowed")); + ROLE_READ_ALL_ORDERS(_("All projects read allowed")), + ROLE_EDIT_ALL_ORDERS(_("All projects edition allowed")), + ROLE_CREATE_ORDER(_("Project creation allowed")); private final String displayName; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java index 09872762e..bacd1b7b6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java @@ -336,11 +336,11 @@ public class TemplateModel implements ITemplateModel { } private IDesktopUpdate showStart(final int ordersNumber) { - return sendMessage(_("Reassigning {0} orders", ordersNumber)); + return sendMessage(_("Reassigning {0} projects", ordersNumber)); } private IDesktopUpdate showProgress(int remaining) { - return sendMessage(_("{0} orders reassignation remaining", remaining)); + return sendMessage(_("{0} projects reassignation remaining", remaining)); } private IDesktopUpdate sendMessage(final String message) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java index 60738461f..ac5264f03 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java @@ -43,7 +43,7 @@ public class OrderBandboxFinder extends BandboxFinder implements IBandboxFinder @Autowired private IOrderDAO orderDAO; - private final String headers[] = { _("Order"), _("Order code") }; + private final String headers[] = { _("Project"), _("Project code") }; @Override @Transactional(readOnly = true) @@ -95,4 +95,4 @@ public class OrderBandboxFinder extends BandboxFinder implements IBandboxFinder }; -} \ No newline at end of file +} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java index 036856e9e..3086036ca 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java @@ -45,8 +45,8 @@ public class OrderElementBandboxFinder extends BandboxFinder implements IBandbox @Autowired private IOrderElementDAO orderElementDAO; - private final String headers[] = { _("Order"), _("Order code"), - _("Order element"), _("Order element code") }; + private final String headers[] = { _("Project"), _("Project code"), + _("Task"), _("Task code") }; @Override @Transactional(readOnly = true) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java index 564c79234..53d4ff694 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java @@ -203,7 +203,7 @@ public class QueueComponent extends XulElement implements final OrderElement order = getRootOrder(task); StringBuilder result = new StringBuilder(); - result.append(_("Order: {0} ", order.getName())); + result.append(_("Project: {0} ", order.getName())); result.append(_("Task: {0} ", task.getName())); result.append(_("Completed: {0}% ", element.getAdvancePercentage().multiply(new BigDecimal(100)))); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java index 067101a48..e6cd3fc43 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java @@ -516,7 +516,7 @@ public class MaterialsController extends } else { messagesForUser.showMessage(Level.ERROR, - _("Cannot delete that material because it is assigned to an order.")); + _("Cannot delete that material because it is assigned to a project.")); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java index 50407eb97..c63907c9e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java @@ -301,7 +301,7 @@ public class AssignedTaskQualityFormsToOrderElementController extends messages .showMessage( Level.ERROR, - _("Another order element in the same branch is already reporting advance for this quality form")); + _("Another task in the same branch is already reporting advance for this quality form")); tmpCheckbox.setChecked(false); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java index 32b367e38..765012f5c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java @@ -121,7 +121,7 @@ public class OrderCRUDController extends GenericForwardComposer { String orderElementName; if (invalidValue.getBean() instanceof Order) { - orderElementName = _("Order"); + orderElementName = _("Project"); } else { orderElementName = ((OrderElement) invalidValue .getBean()).getName(); @@ -179,7 +179,7 @@ public class OrderCRUDController extends GenericForwardComposer { showCreateButtons(false); orderModel.prepareCreationFrom(template); prepareEditWindow(); - showEditWindow(_("Create order from Template")); + showEditWindow(_("Create project from Template")); } @Resource @@ -647,7 +647,7 @@ public class OrderCRUDController extends GenericForwardComposer { } else { try { - Messagebox.show(_("You don't have read access to this order"), + Messagebox.show(_("You don't have read access to this project"), _("Information"), Messagebox.OK, Messagebox.INFORMATION); goToList(); } catch (InterruptedException e) { @@ -719,7 +719,7 @@ public class OrderCRUDController extends GenericForwardComposer { saveOrderAuthorizations(); try { - Messagebox.show(_("Order saved"), _("Information"), + Messagebox.show(_("Project saved"), _("Information"), Messagebox.OK, Messagebox.INFORMATION); } catch (InterruptedException e) { throw new RuntimeException(e); @@ -842,7 +842,7 @@ public class OrderCRUDController extends GenericForwardComposer { } else { try { - Messagebox.show(_("You don't have permissions to edit this order"), + Messagebox.show(_("You don't have permissions to edit this project"), _("Information"), Messagebox.OK, Messagebox.INFORMATION); } catch (InterruptedException e) { throw new RuntimeException(e); @@ -857,7 +857,7 @@ public class OrderCRUDController extends GenericForwardComposer { .showMessage( Level.ERROR, _( - "You can not remove the order \"{0}\" because of any of its order elements are already in use in some work reports and the order just exists in the current scenario", + "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 current scenario", order.getName())); } else { orderModel.remove(order); @@ -875,7 +875,7 @@ public class OrderCRUDController extends GenericForwardComposer { showCreateButtons(false); } else { try { - Messagebox.show(_("The order has no scheduled elements"), + Messagebox.show(_("The project has no scheduled elements"), _("Information"), Messagebox.OK, Messagebox.INFORMATION); } catch (InterruptedException e) { throw new RuntimeException(e); @@ -884,7 +884,7 @@ public class OrderCRUDController extends GenericForwardComposer { } else { try { - Messagebox.show(_("You don't have read access to this order"), + Messagebox.show(_("You don't have read access to this project"), _("Information"), Messagebox.OK, Messagebox.INFORMATION); } catch (InterruptedException e) { throw new RuntimeException(e); @@ -907,7 +907,7 @@ public class OrderCRUDController extends GenericForwardComposer { public void initEdit(Order order) { if (!orderModel.userCanRead(order, SecurityUtils.getSessionUserLoginName())) { try { - Messagebox.show(_("Sorry, you do not have permissions to access this order"), + Messagebox.show(_("Sorry, you do not have permissions to access this project"), _("Information"), Messagebox.OK, Messagebox.INFORMATION); } catch (InterruptedException e) { throw new RuntimeException(e); @@ -922,7 +922,7 @@ public class OrderCRUDController extends GenericForwardComposer { } prepareEditWindow(); - showEditWindow(_("Edit order")); + showEditWindow(_("Edit project")); } private void resetTabControllers() { @@ -1030,7 +1030,7 @@ public class OrderCRUDController extends GenericForwardComposer { showOrderElementFilter(); hideCreateButtons(); prepareEditWindow(); - showEditWindow(_("Create order")); + showEditWindow(_("Create project")); } public ProjectDetailsController getCreationPopup() { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java index a5ce514ad..dad354c60 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java @@ -116,7 +116,7 @@ public class OrderElementController extends GenericForwardComposer { && (!StringUtils.isBlank(getOrderElement().getName()))) { name = ": " + getOrderElement().getName(); } - return _("Edit order element {0}", name); + return _("Edit task {0}", name); } public void setupManageOrderElementAdvancesController() diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java index 1bece0461..a9778f55f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java @@ -203,7 +203,7 @@ public class OrderElementTreeController extends TreeController { private void showSelectAnElementMessageBox() { try { - Messagebox.show(_("Choose an order element " + Messagebox.show(_("Choose a task " + "to operate on it")); } catch (InterruptedException e) { throw new RuntimeException(e); @@ -252,8 +252,8 @@ public class OrderElementTreeController extends TreeController { try { Messagebox .show( - _("Templates can only be created from already existent order elements.\n" - + "Newly order elements cannot be used."), + _("Templates can only be created from already existent tasks.\n" + + "Newly tasks cannot be used."), _("Operation cannot be done"), Messagebox.OK, Messagebox.INFORMATION); } catch (InterruptedException e) { @@ -265,7 +265,7 @@ public class OrderElementTreeController extends TreeController { final String codeOrderElement) { try { Messagebox.show(_("the " + dateboxName - + "datebox of the order element " + codeOrderElement + + "datebox of the task " + codeOrderElement + " could not be created.\n"), _("Operation cannot be done"), Messagebox.OK, Messagebox.INFORMATION); @@ -1033,7 +1033,7 @@ public class OrderElementTreeController extends TreeController { .showMessage( Level.ERROR, _( - "You can not remove the order element \"{0}\" because of this or any of its children are already in use in some work reports", + "You can not remove the task \"{0}\" because of this or any of its children are already in use in some work reports", element.getName())); } else { super.remove(element); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java index 3ae41e24d..5a40a6dd3 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java @@ -69,7 +69,7 @@ public class OrderElementTreeModel extends EntitiesTree { protected OrderElement createNewElement() { OrderElement newOrderElement = OrderLine .createOrderLineWithUnfixedPercentage(0); - newOrderElement.setName(_("New order element")); + newOrderElement.setName(_("New task")); return newOrderElement; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java index 922caa6d0..a587ed448 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java @@ -559,8 +559,8 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel { try { int status = Messagebox .show( - _("Confirm creating a new order version for this scenario and derived. Are you sure?"), - _("New order version"), Messagebox.OK + _("Confirm creating a new project version for this scenario and derived. Are you sure?"), + _("New project version"), Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION); return (Messagebox.OK == status); } catch (InterruptedException e) { @@ -631,7 +631,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel { } } catch (InstanceNotFoundException e) { throw new ValidationException(_("" - + "It not could remove the order element " + + "It not could remove the task " + orderElement.getName())); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java index 5146dda94..17cf764e2 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java @@ -67,7 +67,7 @@ public class OrdersTreeComponent extends TreeComponent { columns.add(codeColumn); columns.add(nameAndDescriptionColumn); columns.add(new OrdersTreeColumn(_("Hours"), "hours", - _("Total order element hours")) { + _("Total task hours")) { @Override protected void doCell(OrderElementTreeitemRenderer treeRenderer, diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java index 407c32f8d..de375443a 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java @@ -226,7 +226,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { @Override public String getName() { - return _("Create new order"); + return _("Create new project"); } @Override @@ -247,7 +247,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { @Override public String getName() { - return _("Create new order from template"); + return _("Create new project from template"); } @Override diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java index ea47e6470..658ff8383 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java @@ -538,8 +538,8 @@ public class SaveCommand implements ISaveCommand { private boolean userAcceptsCreateANewOrderVersion() { try { int status = Messagebox - .show(_("Confirm creating a new order version for this scenario and derived. Are you sure?"), - _("New order version"), Messagebox.OK + .show(_("Confirm creating a new project version for this scenario and derived. Are you sure?"), + _("New project version"), Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION); return (Messagebox.OK == status); } catch (InterruptedException e) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java index 9468c8287..4f2a06cb0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java @@ -42,7 +42,7 @@ import org.zkoss.zul.Label; public class LimitingResourcesTabCreator { /* Unnecesary */ - private static String ORDER_LIMITING_RESOURCES_VIEW = _("Limiting resources (order)"); + private static String ORDER_LIMITING_RESOURCES_VIEW = _("Limiting resources (project)"); public static ITab create(Mode mode, LimitingResourcesController LimitingResourcesController, diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java index 76ed03b88..b3a209c26 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java @@ -306,7 +306,7 @@ public class PlanningTabCreator { breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); breadcrumbs.appendChild(new Label(PLANNIFICATION)); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); - breadcrumbs.appendChild(new Label(_("Order Scheduling"))); + breadcrumbs.appendChild(new Label(_("Project Scheduling"))); if (mode.isOf(ModeType.ORDER)) { Label nameLabel = new Label(order.getName()); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java index 3e87575f2..d24e6bcc3 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java @@ -112,7 +112,7 @@ public class CompletedEstimatedHoursPerTaskController extends NavalplannerReport final Order order = getSelectedOrder(); if (order == null) { throw new WrongValueException(bandboxSelectOrder, - _("Please, select an order")); + _("Please, select a project")); } super.showReport(jasperreport); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java index 4d20a73b0..e4d387d31 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java @@ -132,12 +132,12 @@ public class OrderCostsPerResourceController extends GenericForwardComposer { public void onSelectOrder() { Order order = (Order) bdOrders.getSelectedElement(); if (order == null) { - throw new WrongValueException(bdOrders, _("please, select a order")); + throw new WrongValueException(bdOrders, _("please, select a project")); } boolean result = orderCostsPerResourceModel.addSelectedOrder(order); if (!result) { throw new WrongValueException(bdOrders, - _("This order has already been added.")); + _("This project has already been added.")); } else { Util.reloadBindings(lbOrders); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java index 944c3c24b..107cbf320 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java @@ -115,7 +115,7 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel { if (orders.isEmpty()) { Order order = Order.create(); - order.setName(_("All orders")); + order.setName(_("All projects")); workingHoursPerWorkerList.add(createEmptyDTO(order, emptyWorker, wrl)); } else { @@ -172,7 +172,7 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel { private WorkReportLine createEmptyWorkReportLine(Worker worker) { OrderLine leaf = OrderLine.create(); - leaf.setCode(_("All order tasks")); + leaf.setCode(_("All project tasks")); TypeOfWorkHours w = TypeOfWorkHours.create(); w.setDefaultPrice(new BigDecimal(0)); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java index fa8da09cc..a6fa2969d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java @@ -97,13 +97,13 @@ public class SchedulingProgressPerOrderController extends NavalplannerReportCont public void onSelectOrder() { Order order = (Order) bdOrders.getSelectedElement(); if (order == null) { - throw new WrongValueException(bdOrders, _("please, select a order")); + throw new WrongValueException(bdOrders, _("please, select a project")); } boolean result = schedulingProgressPerOrderModel .addSelectedOrder(order); if (!result) { throw new WrongValueException(bdOrders, - _("This order has already been added.")); + _("This project has already been added.")); } else { Util.reloadBindings(lbOrders); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java index b39b892f0..bce0357a7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java @@ -102,13 +102,13 @@ public class TimeLineRequiredMaterialController extends public void onSelectOrder() { Order order = (Order) bdOrders.getSelectedElement(); if (order == null) { - throw new WrongValueException(bdOrders, _("please, select a order")); + throw new WrongValueException(bdOrders, _("please, select a project")); } boolean result = timeLineRequiredMaterialModel .addSelectedOrder(order); if (!result) { throw new WrongValueException(bdOrders, - _("This order has already been added.")); + _("This project has already been added.")); } else { Util.reloadBindings(lbOrders); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java index 2c88137d9..d4e566aff 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java @@ -133,7 +133,7 @@ public class WorkingArrangementsPerOrderController extends NavalplannerReportCon public void showReport(ExtendedJasperreport jasperreport) { if (getSelectedOrder() == null) { - throw new WrongValueException(bdOrder, _("Please, select an order")); + throw new WrongValueException(bdOrder, _("Please, select a project")); } super.showReport(jasperreport); } @@ -212,4 +212,4 @@ public class WorkingArrangementsPerOrderController extends NavalplannerReportCon Util.reloadBindings(lbCriterions); } -} \ No newline at end of file +} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java index b6f46dcba..112db9a56 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java @@ -108,7 +108,7 @@ public class WorkingProgressPerTaskController extends NavalplannerReportControll final Order order = getSelectedOrder(); if (order == null) { throw new WrongValueException(bandboxSelectOrder, - _("Please, select an order")); + _("Please, select a project")); } super.showReport(jasperreport); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java index 1737bb3dd..6dc66abd7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java @@ -484,7 +484,7 @@ public class ResourceLoadController implements Composer { task); } else { try { - Messagebox.show(_("The order has no scheduled elements"), + Messagebox.show(_("The project has no scheduled elements"), _("Information"), Messagebox.OK, Messagebox.INFORMATION); } catch (InterruptedException e) { @@ -494,7 +494,7 @@ public class ResourceLoadController implements Composer { } else { try { Messagebox - .show(_("You don't have read access to this order"), + .show(_("You don't have read access to this project"), _("Information"), Messagebox.OK, Messagebox.INFORMATION); } catch (InterruptedException e) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java index f0bc9347d..e1604bec6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java @@ -455,7 +455,7 @@ public class ResourceLoadModel implements IResourceLoadModel { } LoadTimeLine group = new LoadTimeLine(buildTimeLine(criterion, - "Other orders", "global-generic", allocations, + "Other projects", "global-generic", allocations, getCurrentTimeLineRole(null)), buildTimeLinesGroupForOrder( criterion, byOrder)); @@ -624,7 +624,7 @@ public class ResourceLoadModel implements IResourceLoadModel { } TimeLineRole role = getCurrentTimeLineRole(null); LoadTimeLine group = new LoadTimeLine(buildTimeLine(resource, - _("Other orders"), resourceAllocations, "resource", role), + _("Other projects"), resourceAllocations, "resource", role), buildTimeLinesGroupForOrder(resource, byOrder)); return group; } @@ -1104,4 +1104,4 @@ class PeriodsBuilder { return result; } -} \ No newline at end of file +} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java index 3075521e1..3b2849567 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java @@ -162,7 +162,7 @@ public class TransferOrdersController extends GenericForwardComposer { transferOrdersModel.transfer(order); Util.reloadBindings(destinationScenarioOrders); messagesForUser.showMessage(Level.INFO, - _("Order {0} transfered", order + _("Project {0} transfered", order .getName())); } catch (ValidationException e) { messagesForUser.showInvalidValues(e); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java index a819f279a..b66ec426b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java @@ -157,7 +157,7 @@ public class TransferOrdersModel implements ITransferOrdersModel { .getOrderVersionFor(sourceScenario); if (sourceOrderVersion == null) { throw new RuntimeException( - "OrderVersion must not be null for source scenario"); + "Project version must not be null for source scenario"); } OrderVersion destinationOrderVersion = order @@ -166,7 +166,7 @@ public class TransferOrdersModel implements ITransferOrdersModel { && (sourceOrderVersion.getId().equals(destinationOrderVersion .getId()))) { throw new ValidationException( - _("Order version is the same in source and destination scenarios")); + _("Project version is the same in source and destination scenarios")); } order.useSchedulingDataFor(sourceOrderVersion); @@ -195,4 +195,4 @@ public class TransferOrdersModel implements ITransferOrdersModel { } } -} \ No newline at end of file +} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java index b88a850c2..8d02547c3 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java @@ -108,7 +108,7 @@ public abstract class TreeComponent extends HtmlMacroComponent { protected final Column schedulingStateColumn = new Column( _("Scheduling state"), "scheduling_state", - _("Complete, Partially or Not Scheduled. (Drag and drop to move order elements)")) { + _("Complete, Partially or Not Scheduled. (Drag and drop to move tasks)")) { @Override public > void doCell( @@ -158,6 +158,6 @@ public abstract class TreeComponent extends HtmlMacroComponent { } public String getRemoveElementLabel() { - return _("Delete order element"); + return _("Delete task"); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java index 1d741a153..c07ef36f7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java @@ -123,7 +123,7 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel { replaceOrder(newOrder); } }catch (InstanceNotFoundException e) { - InvalidValue invalidValue = new InvalidValue(_("Order does not exist"), + InvalidValue invalidValue = new InvalidValue(_("Project does not exist"), OrderAuthorization.class, "order", order, null); throw new ValidationException(invalidValue); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java index 9c6d184e0..ddd2aecc4 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java @@ -307,7 +307,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements if (!getWorkReport() .checkConstraintOrderElementMustBeNotNullIfIsSharedByLines()) { showInvalidMessage(bandboxSelectOrderElementInHead, - _("Order Element code cannot be null")); + _("Task code cannot be null")); return false; } return true; @@ -360,7 +360,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements } else if (workReportLine.getOrderElement() == null) { BandboxSearch bandboxOrder = getTextboxOrder(row); if (bandboxOrder != null) { - String message = _("The order element code cannot be null"); + String message = _("The task code cannot be null"); bandboxOrder.clear(); showInvalidMessage(bandboxOrder, message); } @@ -748,7 +748,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements if (!getWorkReport().getWorkReportType() .getOrderElementIsSharedInLines()) { NewDataSortableColumn columnCode = new NewDataSortableColumn(); - columnCode.setLabel(_("Order Code")); + columnCode.setLabel(_("Project Code")); columnCode.setSclass("order-code-column"); columns.appendChild(columnCode); } @@ -1598,7 +1598,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements return workReportModel.findOrderElement(orderElement.getCode()); } catch (InstanceNotFoundException e) { throw new WrongValueException(bandboxFilterOrderElement, - _("OrderElement not found")); + _("Task not found")); } } return null; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java index c7be01466..5089e0373 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java @@ -554,7 +554,7 @@ public final class OrderElementConverter { if (orderElementDTO instanceof OrderLineDTO) { if (!(orderElement instanceof OrderLine)) { throw new ValidationException(_( - "Order element {0} : OrderLineGroup is incompatible type with {1}" + "Task {0} : Task group is incompatible type with {1}" + orderElement.getCode(), orderElement .getClass().getName())); } @@ -577,7 +577,7 @@ public final class OrderElementConverter { if (orderElementDTO instanceof OrderDTO) { if (!(orderElement instanceof Order)) { throw new ValidationException(_( - "Order element {0} : Order is incompatible type with {1}" + "Task {0} : Project is incompatible type with {1}" + orderElement.getCode(), orderElement .getClass().getName())); @@ -610,7 +610,7 @@ public final class OrderElementConverter { } else { // orderElementDTO instanceof OrderLineGroupDTO if (!(orderElement instanceof OrderLineGroup)) { throw new ValidationException(_( - "Order element {0} : OrderLineGroup is incompatible type with {1}" + "Task {0} : Task group is incompatible type with {1}" + orderElement.getCode(), orderElement .getClass().getName())); } @@ -623,7 +623,7 @@ public final class OrderElementConverter { } else { if (checkConstraintUniqueOrderCode(orderElementDTO)) { throw new ValidationException( - _("Order element {0} : Duplicate code in DB" + _("Task {0} : Duplicate code in DB" + orderElementDTO.code)); } if (checkConstraintUniqueHoursGroupCode(orderElementDTO)) { @@ -815,11 +815,11 @@ public final class OrderElementConverter { .addSubcontractorAdvanceAssignment(); } catch (DuplicateValueTrueReportGlobalAdvanceException e) { throw new ValidationException( - _("Duplicate value true report global Advance for order element " + _("Duplicate value true report global Advance for task" + orderElement.getCode())); } catch (DuplicateAdvanceAssignmentForOrderElementException e) { throw new ValidationException( - _("Duplicate advance assignment for order element " + _("Duplicate advance assignment for task " + orderElement.getCode())); } } @@ -842,4 +842,4 @@ public final class OrderElementConverter { .getValue()); } -} \ No newline at end of file +} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java index 0502ea9bf..8f66d6e54 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java @@ -151,7 +151,7 @@ public class SubcontractServiceREST implements ISubcontractService { final OrderElementDTO orderElementDTO = subcontractedTask.orderElementDTO; if (orderElementDTO == null) { throw new ViolationError(subcontractedTask.subcontractedCode, - "order element not specified"); + "task not specified"); } try { adHocTransactionService @@ -199,7 +199,7 @@ public class SubcontractServiceREST implements ISubcontractService { String code = entitySequenceDAO.getNextEntityCode(EntityNameEnum.ORDER); if (code == null) { throw new ViolationError(subcontractedTaskDataDTO.orderElementDTO.code, - "unable to generate the code for the new order, please try again later"); + "unable to generate the code for the new project, please try again later"); } order.setCode(code); @@ -236,7 +236,7 @@ public class SubcontractServiceREST implements ISubcontractService { order.generateOrderElementCodes(numberOfDigits); } catch (NonUniqueResultException e) { throw new ViolationError("", - "There are several active order sequences"); + "There are several active project sequences"); } catch (InstanceNotFoundException e) { throw new ViolationError("", "It does not exist any activated code sequence."); @@ -254,7 +254,7 @@ public class SubcontractServiceREST implements ISubcontractService { order.useSchedulingDataFor(version); order.add(orderElement); - order.setName(_("Order from client")); + order.setName(_("Project from client")); order.setInitDate(orderElement.getInitDate()); order.setDeadline(orderElement.getDeadline()); order.setCalendar(getDefaultCalendar()); @@ -284,4 +284,4 @@ public class SubcontractServiceREST implements ISubcontractService { Util.generateInstanceId(1, code), message); } -} \ No newline at end of file +} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java index 5ef641058..755d26cf3 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java @@ -92,7 +92,7 @@ public final class WorkReportConverter { } catch (InstanceNotFoundException e) { workReport.setOrderElement(null); throw new ValidationException( - _("There is no order element with this code")); + _("There is no task with this code")); } } @@ -164,7 +164,7 @@ public final class WorkReportConverter { } catch (InstanceNotFoundException e) { workReportLine.setOrderElement(null); throw new ValidationException( - _("There is no order element with this code")); + _("There is no task with this code")); } } @@ -459,7 +459,7 @@ public final class WorkReportConverter { workReport.setOrderElement(orderElement); } catch (InstanceNotFoundException e) { throw new ValidationException( - _("There is no order element with this code")); + _("There is no task with this code")); } } } @@ -522,7 +522,7 @@ public final class WorkReportConverter { workReportLine.setOrderElement(orderElement); } catch (InstanceNotFoundException e) { throw new ValidationException( - _("There is no order element with this code")); + _("There is no task with this code")); } /* Step 3.4: Update the type of work hours. */ diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul index 98568db00..90ad15ac0 100644 --- a/navalplanner-webapp/src/main/webapp/common/configuration.zul +++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul @@ -153,7 +153,7 @@ checked="@{configurationController.expandCompanyPlanningViewCharts}" onCheck="configurationController.reloadGeneralConfiguration();" /> diff --git a/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul b/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul index 4563f224c..46e576554 100644 --- a/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul +++ b/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul @@ -130,7 +130,7 @@ tooltiptext="Select/deselect all"/> - + diff --git a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul index 81184601d..430feca40 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul @@ -30,7 +30,7 @@ macroURI="/orders/components/_listOrderElementMaterials.zul"?> - diff --git a/navalplanner-webapp/src/main/webapp/orders/_list.zul b/navalplanner-webapp/src/main/webapp/orders/_list.zul index c64a6e417..dabde354f 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_list.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_list.zul @@ -18,7 +18,7 @@ along with this program. If not, see . --> - + - \ No newline at end of file + diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul index 4b1edb3e2..7a513c596 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul @@ -107,7 +107,7 @@ - @@ -118,7 +118,7 @@