From 760a61d3f1e752f843b8eeb07238286338a0f7a4 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 27 Jun 2012 12:22:02 +0200
Subject: [PATCH] Bug #1369: Fix problems with dates from template in new
 project pop-up

FEA: ItEr76S04BugFixing
---
 .../web/orders/ProjectDetailsController.java    | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
index 6a5869b32..55521de38 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
@@ -257,12 +257,23 @@ public class ProjectDetailsController extends GenericForwardComposer {
     }
 
     public void calculateProjectDates(OrderTemplate template) {
-        initDate.setValue(new LocalDate().plusDays(template.getStartAsDaysFromBeginning()).toDateTimeAtStartOfDay().toDate());
+        LocalDate initLocalDate = new LocalDate()
+                .plusDays(template.getStartAsDaysFromBeginning());
+        Date initDate = initLocalDate.toDateTimeAtStartOfDay().toDate();
+        getOrder().setInitDate(initDate);
+        this.initDate.setValue(initDate);
+
         if (template.getDeadlineAsDaysFromBeginning() != null ) {
-            deadline.setValue( new LocalDate(initDate.getValue()).plusDays(template.getDeadlineAsDaysFromBeginning()).toDateTimeAtStartOfDay().toDate());
+            LocalDate deadlineLocalDate = initLocalDate.plusDays(template
+                    .getDeadlineAsDaysFromBeginning());
+            Date deadline = deadlineLocalDate.toDateTimeAtStartOfDay().toDate();
+            getOrder().setDeadline(deadline);
+            this.deadline.setValue(deadline);
         } else {
-            deadline.setText("");
+            getOrder().setDeadline(null);
+            this.deadline.setValue(null);
         }
+
     }
 
     public OrderTemplate getTemplate() {