RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr58S19CUDesconsolidacion: Fixing bug, consolidation was not been removed.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-05-27 10:14:27 +02:00 • committed by Javier Moran Rua
parent af65a684bd
commit dcc337ad73
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java
View file

@ -279,11 +279,6 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
dto.getConsolidatedValue());
}
if (consolidation.getConsolidatedValues().isEmpty()) {
consolidation = null;
task.setConsolidation(consolidation);
}
LocalDate firstDayNotConsolidated = task
.getFirstDayNotConsolidated();
for (DayAssignment dayAssignment : task.getDayAssignments()) {
@ -303,7 +298,7 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
.setOnDayAssignmentRemoval(new DetachDayAssignmentOnRemoval());
Integer pendingHours = resourceAllocation
.getOriginalTotalAssigment();
if (consolidation != null) {
if (!consolidation.getConsolidatedValues().isEmpty()) {
BigDecimal lastConslidation = task.getConsolidation()
.getConsolidatedValues().last().getValue();
pendingHours = BigDecimal.ONE.subtract(