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 57df9bb32..6191bdc45 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 @@ -265,8 +265,7 @@ public class OrderLineGroup extends OrderElement implements } } - if (indirectAdvanceAssignments.isEmpty() - && !orderElement.getAllDirectAdvanceAssignments().isEmpty()) { + if (!indirectAdvanceAssignments.isEmpty()) { addChildrenAdvanceOrderLineGroup(); } } diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java index be48a1423..32b8f33c2 100644 --- a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java +++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java @@ -690,11 +690,13 @@ public class OrderElementTreeModelTest { model.indent(element2); assertTrue(order.getDirectAdvanceAssignments().isEmpty()); + assertThat(order.getIndirectAdvanceAssignments().size(), equalTo(2)); assertNotNull(order.getIndirectAdvanceAssignment(advanceType)); assertTrue(order.getCriterionRequirements().isEmpty()); OrderLineGroup container = (OrderLineGroup) order.getChildren().get(0); assertTrue(container.getDirectAdvanceAssignments().isEmpty()); + assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(2)); assertNotNull(container.getIndirectAdvanceAssignment(advanceType)); assertTrue(container.getCriterionRequirements().isEmpty());