From f9a9ef6d02fd5fcc6106cc3b18594a82e58e95f7 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 16 Nov 2012 13:49:20 +0100 Subject: [PATCH] Remove TIMESHEETS progress in tasks that are not updated from timesheets This is needed when you for example remove a timesheet for task, and the task was previously updated and marked as finished with the information from the timesheet. If you adapt the planning again you need to remove the TIMESHEETS progress accordingly. FEA: ItEr77S12AdaptPlanningAccordingTimesheets --- .../web/planner/adaptplanning/AdaptPlanningCommand.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java index 89e4d50c6..41c53d400 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java @@ -106,6 +106,8 @@ public class AdaptPlanningCommand implements IAdaptPlanningCommand { } taskElement.setUpdatedFromTimesheets(true); + } else { + removeTimesheetsProgressIfAny(orderElement); } } for (TaskElement taskElement : taskElements) {