From 3f875ac898b55ea14c91eba9071c2d5bf3098824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Fri, 15 Apr 2011 17:36:11 +0200
Subject: [PATCH] Usability improvement on calendar's work week edition

When marking a work day as not inhereting, the initial value is the
parent's calendar value.

FEA: ItEr74S04BugFixing
---
 .../org/navalplanner/web/calendars/BaseCalendarModel.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
index 26e0af72e..a12baa892 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
@@ -317,9 +317,10 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
     @Override
     public void unsetDefault(Days day) {
         if (getBaseCalendar() != null) {
-            getBaseCalendar().setCapacityAt(day,
-                    Capacity.zero().overAssignableWithoutLimit(true),
-                    selectedDate);
+            Capacity previousCapacity = getBaseCalendar()
+                    .getCapacityConsideringCalendarDatasOn(selectedDate, day);
+            getBaseCalendar()
+                    .setCapacityAt(day, previousCapacity, selectedDate);
         }
     }