From 626ba85f8f6e22ad90db410336882aca7bae703d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 21 Feb 2011 19:31:33 +0100
Subject: [PATCH] [Bug #861] Fix bug

Deleting the order elements without parents after the task sources
have been synchronized.

When an OrderElement is removed it's left behind whithout parent. The
method deleteOrderElementWithoutParent is responsible of deleting
them.  If this is done before doing the tasks synchronization, the
associated TaskGroup to the OrderGroup removed has as children the
moved task. This causes said task to be processed twice, from two
differnet possitions: at the OrderGroup removed and at the position it
was added.

Now deleteOrderElementWithoutParent it's done after the
synchronization, so the associated TaskGroup doesn't have the moved
task.

FEA: ItEr71S04BugFixing
---
 .../src/main/java/org/navalplanner/web/orders/OrderModel.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
index 438809758..ad13498fa 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
@@ -530,7 +530,6 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
         calculateAndSetTotalHours();
         orderDAO.save(order);
         reattachCurrentTaskSources();
-        deleteOrderElementWithoutParent();
         if (newOrderVersionNeeded) {
             OrderVersion newVersion = OrderVersion
                     .createInitialVersion(currentScenario);
@@ -549,6 +548,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
         }
         saveDerivedScenarios();
         calculateAdvancePercentageIncludingChildren(order);
+        deleteOrderElementWithoutParent();
     }
 
     private void calculateAdvancePercentageIncludingChildren(OrderElement order) {