From 6db6f3d79e9e46a2480a5b47f8f6c632e71ed5f8 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Tue, 13 Oct 2009 09:16:49 +0200
Subject: [PATCH]  ItEr30S17ValidacionEProbasFuncionais: Showing proper error
 information creating an order. Fixing Bug #5.

---
 .../org/navalplanner/web/orders/OrderCRUDController.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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 fc0df1e01..8a8b7fca8 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
@@ -108,8 +108,13 @@ public class OrderCRUDController extends GenericForwardComposer {
                                 if (invalidValue.getBean() instanceof OrderElement) {
                                     Label result = new Label();
 
-                                    String orderElementName = ((OrderElement) invalidValue
-                                            .getBean()).getName();
+                                    String orderElementName;
+                                    if (invalidValue.getBean() instanceof Order) {
+                                        orderElementName = _("Order");
+                                    } else {
+                                        orderElementName = ((OrderElement) invalidValue
+                                                .getBean()).getName();
+                                    }
 
                                     result.setValue(orderElementName + " "
                                             + invalidValue.getPropertyName()