From 4397d4313348457c3953a3fb3a2b960e8a83d9f6 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 7 Nov 2012 14:59:21 +0100 Subject: [PATCH] Disable constraints combo in tasks updated from timesheets FEA: ItEr77S12AdaptPlanningAccordingTimesheets --- .../web/planner/taskedition/TaskPropertiesController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java index ad475fb10..ea07b713e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java @@ -138,7 +138,8 @@ public class TaskPropertiesController extends GenericForwardComposer { disabledConstraintsAndAllocations = currentTaskElement .isSubcontractedAndWasAlreadySent() - || currentTaskElement.isLimitingAndHasDayAssignments(); + || currentTaskElement.isLimitingAndHasDayAssignments() + || currentTaskElement.isUpdatedFromTimesheets(); if (!disabledConstraintsAndAllocations && (currentTaskElement.isTask())) { disabledConstraintsAndAllocations = ((Task) currentTaskElement) .isManualAnyAllocation();