diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java index 67ee89939..dd5a86db2 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java @@ -763,11 +763,13 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { @Override public EffortDuration asDurationOn(PartialDay day, ResourcesPerDay amount) { Capacity capacity = findCapacityAt(day.getDate()); - EffortDuration workableDuration = day.limitDuration(capacity - .getStandardEffort()); - EffortDuration asDuration = amount - .asDurationGivenWorkingDayOf(workableDuration); - return multiplyByCalendarUnits(capacity).limitDuration(asDuration); + EffortDuration oneResourcePerDayWorkingDuration = day + .limitDuration(capacity.getStandardEffort()); + EffortDuration amountRequestedDuration = amount + .asDurationGivenWorkingDayOf(oneResourcePerDayWorkingDuration); + + return multiplyByCalendarUnits(capacity).limitDuration( + amountRequestedDuration); } /**