diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractedTaskData.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractedTaskData.java index fc8a8105b..cc5abfeb6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractedTaskData.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractedTaskData.java @@ -58,7 +58,6 @@ public class SubcontractedTaskData extends BaseEntity { result.labelsExported = subcontractedTaskData.labelsExported; result.materialAssignmentsExported = subcontractedTaskData.materialAssignmentsExported; result.hoursGroupsExported = subcontractedTaskData.hoursGroupsExported; - result.criterionRequirementsExported = subcontractedTaskData.criterionRequirementsExported; return create(result); } @@ -79,7 +78,6 @@ public class SubcontractedTaskData extends BaseEntity { private Boolean labelsExported; private Boolean materialAssignmentsExported; private Boolean hoursGroupsExported; - private Boolean criterionRequirementsExported; /** * Constructor for hibernate. Do not use! @@ -187,21 +185,6 @@ public class SubcontractedTaskData extends BaseEntity { this.hoursGroupsExported = hoursGroupsExported; } - public Boolean isCriterionRequirementsExported() { - if (criterionRequirementsExported == null) { - return false; - } - return criterionRequirementsExported; - } - - public void setCriterionRequirementsExported( - Boolean criterionRequirementsExported) { - if (criterionRequirementsExported == null) { - criterionRequirementsExported = false; - } - this.criterionRequirementsExported = criterionRequirementsExported; - } - @NotNull(message = "subcontratation date not specified") public Date getSubcontratationDate() { return subcontratationDate; @@ -218,7 +201,6 @@ public class SubcontractedTaskData extends BaseEntity { this.labelsExported = subcontratedTask.labelsExported; this.materialAssignmentsExported = subcontratedTask.materialAssignmentsExported; this.hoursGroupsExported = subcontratedTask.hoursGroupsExported; - this.criterionRequirementsExported = subcontratedTask.criterionRequirementsExported; } @AssertTrue(message = "external company should be subcontractor") diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml index 92d7fb66b..57ecd883c 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml @@ -108,7 +108,6 @@ - diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul index 83682a33f..e30af0d51 100644 --- a/navalplanner-webapp/src/main/webapp/planner/order.zul +++ b/navalplanner-webapp/src/main/webapp/planner/order.zul @@ -259,8 +259,6 @@ checked="@{subController.subcontractedTaskData.materialAssignmentsExported}" /> -