diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java index 5699c51ab..2e3b760e6 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java @@ -1662,4 +1662,8 @@ public abstract class OrderElement extends IntegrationEntity implements return effort.toFormattedString(); } + public boolean isConvertedToContainer() { + return false; + } + } diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java index fac42a838..854f3a347 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java @@ -88,6 +88,8 @@ public class OrderLine extends OrderElement { private Integer lastHoursGroupSequenceCode = 0; + private boolean convertedToContainer = false; + @Override public Integer getWorkHours() { return hoursGroupOrderLineHandler.calculateTotalHours(hoursGroups); @@ -156,6 +158,7 @@ public class OrderLine extends OrderElement { result.setName(getName()); setCode(""); setName(""); + convertedToContainer = true; return result; } @@ -392,4 +395,9 @@ public class OrderLine extends OrderElement { return budget; } + @Override + public boolean isConvertedToContainer() { + return convertedToContainer; + } + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java index 50df9803f..450b3b19e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java @@ -71,7 +71,7 @@ public class OrderElementPredicate implements IPredicate { if (orderElement == null) { return false; } - if (orderElement.isNewObject()) { + if (orderElement.isNewObject() || orderElement.isConvertedToContainer()) { return true; } if (acceptFilters(orderElement) && acceptFiltersDates(orderElement)