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 2fc0d7f72..508e5ac23 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
@@ -53,6 +53,8 @@ public class Configuration extends BaseEntity {
 
     private Boolean generateCodeForMaterialCategories = false;
 
+    private Boolean generateCodeForUnitTypes = false;
+
     public void setDefaultCalendar(BaseCalendar defaultCalendar) {
         this.defaultCalendar = defaultCalendar;
     }
@@ -133,4 +135,12 @@ public class Configuration extends BaseEntity {
         return generateCodeForMaterialCategories;
     }
 
+    public void setGenerateCodeForUnitTypes(Boolean generateCodeForUnitTypes) {
+        this.generateCodeForUnitTypes = generateCodeForUnitTypes;
+    }
+
+    public Boolean getGenerateCodeForUnitTypes() {
+        return generateCodeForUnitTypes;
+    }
+
 }
\ 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 8e9d99969..865e5f57e 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
@@ -23,6 +23,7 @@
         <property name="generateCodeForResources" not-null="true" />
         <property name="generateCodeForTypesOfWorkHours" not-null="true" />
         <property name="generateCodeForMaterialCategories" not-null="true" />
+        <property name="generateCodeForUnitTypes" 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 df4d4f491..f1952d696 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
@@ -183,6 +183,16 @@ public class ConfigurationController extends GenericForwardComposer {
                 generateCodeForMaterialCategories);
     }
 
+    public Boolean getGenerateCodeForUnitTypes() {
+        return configurationModel.getGenerateCodeForUnitTypes();
+    }
+
+    public void setGenerateCodeForUnitTypes(
+            Boolean generateCodeForUnitTypes) {
+        configurationModel.setGenerateCodeForUnitTypes(
+                generateCodeForUnitTypes);
+    }
+
     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 b90e15177..bfe1f8707 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
@@ -302,6 +302,22 @@ public class ConfigurationModel implements IConfigurationModel {
         }
     }
 
+    @Override
+    public Boolean getGenerateCodeForUnitTypes() {
+        if (configuration == null) {
+            return null;
+        }
+        return configuration.getGenerateCodeForUnitTypes();
+    }
+
+    @Override
+    public void setGenerateCodeForUnitTypes(Boolean generateCodeForUnitTypes) {
+            if (configuration != null) {
+                configuration.setGenerateCodeForUnitTypes(
+                        generateCodeForUnitTypes);
+            }
+    }
+
     @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 3848c8255..e7a1eee00 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
@@ -82,4 +82,8 @@ public interface IConfigurationModel {
     void confirm();
     void cancel();
 
+    Boolean getGenerateCodeForUnitTypes();
+
+    void setGenerateCodeForUnitTypes(Boolean generateCodeForUnitTypes);
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index 66d3ed187..a8e5733dd 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -85,6 +85,10 @@
                             <label value="${i18n:_('Generate code for Material categories')}" />
                             <checkbox checked="@{configurationController.generateCodeForMaterialCategories}" />
                         </row>
+                        <row>
+                            <label value="${i18n:_('Generate code for Unit Types')}" />
+                            <checkbox checked="@{configurationController.generateCodeForUnitTypes}" />
+                        </row>
                     </rows>
                 </grid>