From db60766295165f73f519bb7d46ebcba95778d183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Fri, 29 Oct 2010 15:12:18 +0200 Subject: [PATCH] Ensuring the start is after the consolidated assignments FEA: ItEr62OTS04PlanificacionHaciaAtras --- .../business/planner/entities/ResourceAllocation.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java index f0f2e4d0b..2a55ef398 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java @@ -611,7 +611,9 @@ public abstract class ResourceAllocation extends private void allocate(IntraDayDate startInclusive, IntraDayDate endExclusive, EffortDuration durationToAssign) { - List assignmentsCreated = createAssignments(startInclusive, + IntraDayDate afterConsolidated = getStartAfterConsolidated(); + List assignmentsCreated = createAssignments( + IntraDayDate.max(afterConsolidated, startInclusive), endExclusive, durationToAssign); resetAssignmentsTo(assignmentsCreated, startInclusive, endExclusive); updateResourcesPerDay();