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

Bug #1494: Use deadline as delivery date for subcontracted tasks, if present,

Browse source 
or use task end date otherwise.

FEA: ItEr76S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-07-11 16:57:44 +02:00
parent d8f66d554f
commit 1a60df1110
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java
View file

@ -86,7 +86,12 @@ public class SubcontractModel implements ISubcontractModel {
if (subcontractedTaskData == null) {
this.subcontractedTaskData = SubcontractedTaskData.create(task);
this.addDeliverDate(getEndDate());
if (task.getDeadline() != null) {
this.addDeliverDate(task.getDeadline().toDateMidnight()
.toDate());
} else {
this.addDeliverDate(getEndDate());
}
} else {
subcontractedTaskDataDAO.reattach(subcontractedTaskData);
loadRequiredDeliveringDates(subcontractedTaskData);