From 4e21c74f87eb8001258ae2772d667f9ef639da46 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Mon, 12 Apr 2010 14:09:27 +0200
Subject: [PATCH]  ItEr54S04ValidacionEProbasFuncionaisItEr53S04: [Bug #406]
 Fixed problem related with popup asking for confirmation due to day
 assignments.

---
 .../navalplanner/web/planner/order/SubcontractController.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java
index ad67fa3f9..8c3a1babc 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java
@@ -70,7 +70,8 @@ public class SubcontractController extends GenericForwardComposer {
 
     public void accept() throws ValidationException {
         int status = Messagebox.YES;
-        if (subcontractModel.hasResourceAllocations()) {
+        if (subcontractModel.hasResourceAllocations()
+                && (subcontractModel.getSubcontractedTaskData() != null)) {
             try {
                 status = Messagebox
                         .show(