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 508e5ac23..62c6a9428 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
@@ -55,6 +55,10 @@ public class Configuration extends BaseEntity {
 
     private Boolean generateCodeForUnitTypes = false;
 
+    private Boolean expandCompanyPlanningViewCharts = true;
+
+    private Boolean expandOrderPlanningViewCharts = true;
+
     public void setDefaultCalendar(BaseCalendar defaultCalendar) {
         this.defaultCalendar = defaultCalendar;
     }
@@ -143,4 +147,22 @@ public class Configuration extends BaseEntity {
         return generateCodeForUnitTypes;
     }
 
+    public void setExpandCompanyPlanningViewCharts(
+            Boolean expandCompanyPlanningViewCharts) {
+        this.expandCompanyPlanningViewCharts = expandCompanyPlanningViewCharts;
+    }
+
+    public Boolean isExpandCompanyPlanningViewCharts() {
+        return expandCompanyPlanningViewCharts;
+    }
+
+    public void setExpandOrderPlanningViewCharts(
+            Boolean expandOrderPlanningViewCharts) {
+        this.expandOrderPlanningViewCharts = expandOrderPlanningViewCharts;
+    }
+
+    public Boolean isExpandOrderPlanningViewCharts() {
+        return expandOrderPlanningViewCharts;
+    }
+
 }
\ 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 865e5f57e..0fb93f284 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
@@ -24,6 +24,8 @@
         <property name="generateCodeForTypesOfWorkHours" not-null="true" />
         <property name="generateCodeForMaterialCategories" not-null="true" />
         <property name="generateCodeForUnitTypes" not-null="true" />
+        <property name="expandCompanyPlanningViewCharts" not-null="true" />
+        <property name="expandOrderPlanningViewCharts" not-null="true" />
 
     </class>