diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java
index e79b9cc82..a491f866e 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java
@@ -41,6 +41,14 @@ public class Configuration extends BaseEntity {
 
     private String companyCode;
 
+    private Boolean generateCodeForCriterion;
+
+    private Boolean generateCodeForLabel;
+
+    private Boolean generateCodeForWorkReport;
+
+    private Boolean generateCodeForResources;
+
     public void setDefaultCalendar(BaseCalendar defaultCalendar) {
         this.defaultCalendar = defaultCalendar;
     }
@@ -71,4 +79,36 @@ public class Configuration extends BaseEntity {
         return !companyCode.contains(" ");
     }
 
+    public void setGenerateCodeForCriterion(Boolean generateCodeForCriterion) {
+        this.generateCodeForCriterion = generateCodeForCriterion;
+    }
+
+    public Boolean getGenerateCodeForCriterion() {
+        return generateCodeForCriterion;
+    }
+
+    public void setGenerateCodeForLabel(Boolean generateCodeForLabel) {
+        this.generateCodeForLabel = generateCodeForLabel;
+    }
+
+    public Boolean getGenerateCodeForLabel() {
+        return generateCodeForLabel;
+    }
+
+    public void setGenerateCodeForWorkReport(Boolean generateCodeForWorkReport) {
+        this.generateCodeForWorkReport = generateCodeForWorkReport;
+    }
+
+    public Boolean getGenerateCodeForWorkReport() {
+        return generateCodeForWorkReport;
+    }
+
+    public void setGenerateCodeForResources(Boolean generateCodeForResources) {
+        this.generateCodeForResources = generateCodeForResources;
+    }
+
+    public Boolean getGenerateCodeForResources() {
+        return generateCodeForResources;
+    }
+
 }
\ No newline at end of file
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml
index 2dca0b125..d3898cd0b 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml
@@ -17,6 +17,11 @@
 
         <property name="companyCode" />
 
+        <property name="generateCodeForCriterion" />
+        <property name="generateCodeForLabel" />
+        <property name="generateCodeForWorkReport" />
+        <property name="generateCodeForResources" />
+
     </class>
 
 </hibernate-mapping>
\ No newline at end of file