diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java index 78d21422f..ef0ca638d 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java @@ -39,6 +39,7 @@ import org.navalplanner.business.advance.bootstrap.PredefinedAdvancedTypes; import org.navalplanner.business.advance.entities.AdvanceAssignment; import org.navalplanner.business.advance.entities.AdvanceType; import org.navalplanner.business.advance.entities.DirectAdvanceAssignment; +import org.navalplanner.business.advance.entities.IndirectAdvanceAssignment; import org.navalplanner.business.advance.exceptions.DuplicateAdvanceAssignmentForOrderElementException; import org.navalplanner.business.advance.exceptions.DuplicateValueTrueReportGlobalAdvanceException; import org.navalplanner.business.common.BaseEntity; @@ -497,6 +498,8 @@ public abstract class OrderElement extends BaseEntity implements public abstract BigDecimal getAdvancePercentage(LocalDate date); + public abstract Set getIndirectAdvanceAssignments(); + public List getAllChildren() { List children = getChildren(); List result = new ArrayList(children); diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java index aa7bc235b..580f15349 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java @@ -24,6 +24,7 @@ import static org.navalplanner.business.i18n.I18nHelper._; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -34,6 +35,7 @@ import org.hibernate.validator.Valid; import org.joda.time.LocalDate; import org.navalplanner.business.advance.entities.AdvanceType; import org.navalplanner.business.advance.entities.DirectAdvanceAssignment; +import org.navalplanner.business.advance.entities.IndirectAdvanceAssignment; import org.navalplanner.business.requirements.entities.CriterionRequirement; import org.navalplanner.business.requirements.entities.DirectCriterionRequirement; import org.navalplanner.business.templates.entities.OrderLineTemplate; @@ -542,4 +544,9 @@ public class OrderLine extends OrderElement { return OrderLineTemplate.create(this); } + @Override + public Set getIndirectAdvanceAssignments() { + return Collections.emptySet(); + } + } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java index e1d3b3b9d..ddab22cf7 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java @@ -673,6 +673,7 @@ public class OrderLineGroup extends OrderElement implements return result; } + @Override public Set getIndirectAdvanceAssignments() { return Collections.unmodifiableSet(indirectAdvanceAssignments); }