diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java index 8945e1ecc..d94ba7829 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java @@ -72,7 +72,8 @@ public class DetailsOrderElementController extends } private boolean isSubcontracted() { - if (orderElementModel.getOrderElement() == null) { + if (orderElementModel.getOrderElement() == null + || orderElementModel.getOrderElement().getTaskSource() == null) { return false; } return orderElementModel.getOrderElement().getTaskSource().getTask() diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java index 45af8c565..f4d1d7f8e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java @@ -484,8 +484,9 @@ public class OrderElementTreeController extends TreeController { currentOrderElement.setDeadline(value); } }); - if (readOnly || currentOrderElement.getTaskSource(). - getTask().isSubcontracted()) { + if (readOnly + || (currentOrderElement.getTaskSource() != null && currentOrderElement + .getTaskSource().getTask().isSubcontracted())) { dinamicDatebox.setDisabled(true); } addDateCell(dinamicDatebox, _("end"));