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 f1952d696..12d0317fb 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
@@ -346,4 +346,24 @@ public class ConfigurationController extends GenericForwardComposer {
 
     }
 
+    public void setExpandCompanyPlanningViewCharts(
+            Boolean expandCompanyPlanningViewCharts) {
+        configurationModel
+                .setExpandCompanyPlanningViewCharts(expandCompanyPlanningViewCharts);
+    }
+
+    public Boolean isExpandCompanyPlanningViewCharts() {
+        return configurationModel.isExpandCompanyPlanningViewCharts();
+    }
+
+    public void setExpandOrderPlanningViewCharts(
+            Boolean expandOrderPlanningViewCharts) {
+        configurationModel
+                .setExpandOrderPlanningViewCharts(expandOrderPlanningViewCharts);
+    }
+
+    public Boolean isExpandOrderPlanningViewCharts() {
+        return configurationModel.isExpandOrderPlanningViewCharts();
+    }
+
 }
\ No newline at end of file
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 bfe1f8707..6cedbf46b 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
@@ -339,4 +339,38 @@ public class ConfigurationModel implements IConfigurationModel {
         orderSequences.remove(orderSequence);
     }
 
+    @Override
+    public void setExpandCompanyPlanningViewCharts(
+            Boolean expandCompanyPlanningViewCharts) {
+        if (configuration != null) {
+            configuration
+                    .setExpandCompanyPlanningViewCharts(expandCompanyPlanningViewCharts);
+        }
+    }
+
+    @Override
+    public Boolean isExpandCompanyPlanningViewCharts() {
+        if (configuration == null) {
+            return null;
+        }
+        return configuration.isExpandCompanyPlanningViewCharts();
+    }
+
+    @Override
+    public void setExpandOrderPlanningViewCharts(
+            Boolean expandOrderPlanningViewCharts) {
+        if (configuration != null) {
+            configuration
+                .setExpandOrderPlanningViewCharts(expandOrderPlanningViewCharts);
+        }
+    }
+
+    @Override
+    public Boolean isExpandOrderPlanningViewCharts() {
+        if (configuration == null) {
+            return null;
+        }
+        return configuration.isExpandOrderPlanningViewCharts();
+    }
+
 }
\ No newline at end of file
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 e7a1eee00..72a45bf17 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
@@ -76,6 +76,15 @@ public interface IConfigurationModel {
     void removeOrderSequence(OrderSequence orderSequence)
             throws IllegalArgumentException;
 
+    void setExpandCompanyPlanningViewCharts(
+            Boolean expandCompanyPlanningViewCharts);
+
+    Boolean isExpandCompanyPlanningViewCharts();
+
+    void setExpandOrderPlanningViewCharts(Boolean expandOrderPlanningViewCharts);
+
+    Boolean isExpandOrderPlanningViewCharts();
+
     /*
      * Final conversation steps
      */
diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index a8e5733dd..8eb6ee0d2 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -89,6 +89,14 @@
                             <label value="${i18n:_('Generate code for Unit Types')}" />
                             <checkbox checked="@{configurationController.generateCodeForUnitTypes}" />
                         </row>
+                        <row>
+                            <label value="${i18n:_('Expand company planning view charts')}" />
+                            <checkbox checked="@{configurationController.expandCompanyPlanningViewCharts}" />
+                        </row>
+                        <row>
+                            <label value="${i18n:_('Expand order planning view charts')}" />
+                            <checkbox checked="@{configurationController.expandOrderPlanningViewCharts}" />
+                        </row>
                     </rows>
                 </grid>