From cd4a3d056447e07f70d332f759939f9976cee1cd Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smpedreira@gmail.com>
Date: Fri, 12 Feb 2010 08:54:12 +0100
Subject: [PATCH]  ItEr47S08RFNavegacionOrganizacionTraballoItEr46S09 : Fixes a
 bug in the loading of the advances of the current order on demand.

---
 .../java/org/navalplanner/web/orders/OrderCRUDController.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 8e16f5f6b..741ac2349 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
@@ -431,7 +431,8 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private boolean save() {
 
-        if (!manageOrderElementAdvancesController.save()) {
+        if ((manageOrderElementAdvancesController != null)
+                && (!manageOrderElementAdvancesController.save())) {
             selectTab("tabAdvances");
         }
         if (!assignedCriterionRequirementController.close()) {