From 70a8013eb951464b779001c7054970f162c368a4 Mon Sep 17 00:00:00 2001 From: Oscar Gonzalez Fernandez Date: Tue, 1 Apr 2014 18:22:42 +0200 Subject: [PATCH] Fix bug #1642 When checking the condition `isOnlyChildAndParentAlreadyInUseByHoursOrExpenses` the parent might be a new object. In that case the check if false and no further querying must be done in the parent. --- .../src/main/java/org/libreplan/web/orders/OrderModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java index e57e0d932..b875269f6 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java @@ -931,7 +931,8 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel { OrderElement orderElement) { try { OrderLineGroup parent = orderElement.getParent(); - if (!parent.isOrder() && parent.getChildren().size() == 1) { + if (!parent.isOrder() && !parent.isNewObject() + && parent.getChildren().size() == 1) { if (orderElementDAO.isAlreadyInUse(parent)) { return true; }