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; + } } }