From db9a8a5510ccd0ea3aabdf00c2f4e0b7962ff6e5 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 27 Jun 2012 12:26:47 +0200
Subject: [PATCH] Bug #1369: Fix problem when a template defines a calendar in
 new project pop-up

Use the calendar from the combo as they are already properly loaded.

FEA: ItEr76S04BugFixing
---
 .../web/orders/ProjectDetailsController.java         | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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 55521de38..e5c17d7f6 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
@@ -292,7 +292,17 @@ public class ProjectDetailsController extends GenericForwardComposer {
                     .setTooltiptext(_("Code has to be autogenerated to create a new project from templates"));
             generateCode.setChecked(true);
             calculateProjectDates(template);
-            setBaseCalendar(template.getCalendar());
+            setCalendarFromTemplate(template);
+        }
+    }
+
+    private void setCalendarFromTemplate(OrderTemplate template) {
+        BaseCalendar calendar = template.getCalendar();
+        for (BaseCalendar each : getBaseCalendars()) {
+            if (calendar.getId().equals(each.getId())) {
+                setBaseCalendar(each);
+                return;
+            }
         }
     }