From f9a3e3069411ab6c89d4c9f20235c435352f5304 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 26 Jul 2012 11:57:08 +0200 Subject: [PATCH] Bug #1521: Avoid update task end date when changing delivery date FEA: ItEr76S04BugFixing --- .../libreplan/web/planner/order/SubcontractModel.java | 9 --------- .../webapp/planner/taskpanels/_tabPanelSubcontract.zul | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java index d3f27b0da..9eff04272 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java @@ -219,20 +219,11 @@ public class SubcontractModel implements ISubcontractModel { subcontractedTaskData .addRequiredDeliveringDates(subcontractorDeliverDate); - //update the end date of the task - updateEndDateWithDeliverDate(); - //update the state of the subcontracted task data updateStateToPendingUpdateDeliveringDate(); } } - private void updateEndDateWithDeliverDate(){ - SubcontractorDeliverDate lastDeliverDate = this - .getSubcontractedTaskData().getRequiredDeliveringDates().last(); - task.setEndDate(lastDeliverDate.getSubcontractorDeliverDate()); - } - private void updateStateToPendingUpdateDeliveringDate(){ if ((subcontractedTaskData.getState() != null) && (subcontractedTaskData.getState() diff --git a/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul b/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul index c87efadc3..7a8d62b81 100644 --- a/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul +++ b/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul @@ -93,7 +93,7 @@