From 1a60df111028cdb01b9c1dbe6016266adea44c40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Wed, 11 Jul 2012 16:57:44 +0200
Subject: [PATCH] Bug #1494: Use deadline as delivery date for subcontracted
 tasks, if present, or use task end date otherwise.

FEA: ItEr76S04BugFixing
---
 .../org/libreplan/web/planner/order/SubcontractModel.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java
index 1d7e1cdb8..c0499d69b 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java
@@ -86,7 +86,12 @@ public class SubcontractModel implements ISubcontractModel {
 
         if (subcontractedTaskData == null) {
             this.subcontractedTaskData = SubcontractedTaskData.create(task);
-            this.addDeliverDate(getEndDate());
+            if (task.getDeadline() != null) {
+                this.addDeliverDate(task.getDeadline().toDateMidnight()
+                        .toDate());
+            } else {
+                this.addDeliverDate(getEndDate());
+            }
         } else {
             subcontractedTaskDataDAO.reattach(subcontractedTaskData);
             loadRequiredDeliveringDates(subcontractedTaskData);