diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
index 551176d7e..4fa0543fa 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
@@ -18,6 +18,19 @@ import org.navalplanner.business.planner.entities.TaskElement;
  */
 public class Order extends BaseEntity implements IOrderLineGroup, IValidable {
 
+    public static Order create() {
+        Order order = new Order();
+        order.setNewObject(true);
+        return order;
+    }
+
+    /**
+     * Constructor for hibernate. Do not use!
+     */
+    public Order() {
+
+    }
+
     private static Date copy(Date date) {
         return date != null ? new Date(date.getTime()) : date;
     }
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssigmentsToOrderElementTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssigmentsToOrderElementTest.java
index 01bfda206..8ca30f9a6 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssigmentsToOrderElementTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssigmentsToOrderElementTest.java
@@ -64,7 +64,7 @@ public class AddAdvanceAssigmentsToOrderElementTest {
     }
 
     private static Order createValidOrder() {
-        Order order = new Order();
+        Order order = Order.create();
         order.setDescription("description");
         order.setCustomer("blabla");
         order.setInitDate(CriterionSatisfactionDAOTest.year(2000));
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderTest.java
index 3b4eb5da4..9a93e8605 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderTest.java
@@ -17,7 +17,7 @@ public class OrderTest {
 
     @Test
     public void testAddingOrderElement() throws Exception {
-        Order order = new Order();
+        Order order = Order.create();
         OrderLineGroup container = OrderLineGroup.create();
         OrderLine leaf = OrderLine.create();
         container.add(leaf);
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java
index 152c6fb61..a05657e51 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java
@@ -70,7 +70,7 @@ public class TaskElementDAOTest {
         orderLine.setName("bla");
         orderLine.setCode("000000000");
         orderLine.addHoursGroup(new HoursGroup());
-        Order order = new Order();
+        Order order = Order.create();
         order.setName("bla");
         order.setInitDate(new Date());
         order.add(orderLine);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
index 1014c328a..cbf42312d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
@@ -107,7 +107,7 @@ public class OrderModel implements IOrderModel {
     public void prepareForCreate() {
         loadCriterions();
 
-        this.order = new Order();
+        this.order = Order.create();
         this.orderElementTreeModel = new OrderElementTreeModel(this.order);
         this.order.setInitDate(new Date());
     }
diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java
index 759d71161..eb27f6268 100644
--- a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java
+++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java
@@ -64,7 +64,7 @@ public class OrderModelTest {
     }
 
     private static Order createValidOrder() {
-        Order order = new Order();
+        Order order = Order.create();
         order.setDescription("description");
         order.setCustomer("blabla");
         order.setInitDate(year(2000));