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 977783682..ea32d244c 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
@@ -49,6 +49,8 @@ public class Configuration extends BaseEntity {
 
     private Boolean generateCodeForResources = false;
 
+    private Boolean generateCodeForTypesOfWorkHours = false;
+
     public void setDefaultCalendar(BaseCalendar defaultCalendar) {
         this.defaultCalendar = defaultCalendar;
     }
@@ -111,4 +113,13 @@ public class Configuration extends BaseEntity {
         return generateCodeForResources;
     }
 
+    public void setGenerateCodeForTypesOfWorkHours(
+            Boolean generateCodeForTypesOfWorkHours) {
+        this.generateCodeForTypesOfWorkHours = generateCodeForTypesOfWorkHours;
+    }
+
+    public Boolean getGenerateCodeForTypesOfWorkHours() {
+        return generateCodeForTypesOfWorkHours;
+    }
+
 }
\ 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 2cff4e596..5d78d6c06 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
@@ -21,6 +21,7 @@
         <property name="generateCodeForLabel" not-null="true" />
         <property name="generateCodeForWorkReport" not-null="true" />
         <property name="generateCodeForResources" not-null="true" />
+        <property name="generateCodeForTypesOfWorkHours" not-null="true" />
 
     </class>
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
index 980559369..65ed0c771 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
@@ -163,6 +163,16 @@ public class ConfigurationController extends GenericForwardComposer {
         configurationModel.setGenerateCodeForResources(generateCodeForResources);
     }
 
+    public Boolean getGenerateCodeForTypesOfWorkHours() {
+        return configurationModel.getGenerateCodeForTypesOfWorkHours();
+    }
+
+    public void setGenerateCodeForTypesOfWorkHours(
+            Boolean generateCodeForTypesOfWorkHours) {
+        configurationModel.setGenerateCodeForTypesOfWorkHours(
+                generateCodeForTypesOfWorkHours);
+    }
+
     public List<OrderSequence> getOrderSequences() {
         return configurationModel.getOrderSequences();
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
index d5c8eee5d..6dfcc4269 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
@@ -268,6 +268,23 @@ public class ConfigurationModel implements IConfigurationModel {
         }
     }
 
+    @Override
+    public Boolean getGenerateCodeForTypesOfWorkHours() {
+        if (configuration == null) {
+            return null;
+        }
+        return configuration.getGenerateCodeForTypesOfWorkHours();
+    }
+
+    @Override
+    public void setGenerateCodeForTypesOfWorkHours(
+            Boolean generateCodeForTypesOfWorkHours) {
+        if (configuration != null) {
+            configuration.setGenerateCodeForTypesOfWorkHours(
+                    generateCodeForTypesOfWorkHours);
+        }
+    }
+
     @Override
     public List<OrderSequence> getOrderSequences() {
         return Collections.unmodifiableList(orderSequences);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
index d2b0b458e..f347e1d01 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
@@ -63,6 +63,10 @@ public interface IConfigurationModel {
     Boolean getGenerateCodeForResources();
     void setGenerateCodeForResources(Boolean generateCodeForResources);
 
+    Boolean getGenerateCodeForTypesOfWorkHours();
+    void setGenerateCodeForTypesOfWorkHours(
+            Boolean generateCodeForTypesOfWorkHours);
+
     List<OrderSequence> getOrderSequences();
     void addOrderSequence();
     void removeOrderSequence(OrderSequence orderSequence)
diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index 23d4a4f3e..c4da231ba 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -77,6 +77,10 @@
                             <label value="${i18n:_('Generate code for Resources')}" />
                             <checkbox checked="@{configurationController.generateCodeForResources}" />
                         </row>
+                        <row>
+                            <label value="${i18n:_('Generate code for Types of work hours')}" />
+                            <checkbox checked="@{configurationController.generateCodeForTypesOfWorkHours}" />
+                        </row>
                     </rows>
                 </grid>