=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryForm.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryForm.java	2012-06-04 16:20:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryForm.java	2013-01-01 19:53:04 +0000
@@ -53,6 +53,8 @@
     public static final String STYLE_COMPACT = "compact";
     public static final String STYLE_NONE = "none";
     
+    public static final int CURRENT_FORMAT = 2;
+    
     /**
      * Determines if a de-serialized file is compatible with this class.
      */
@@ -80,6 +82,11 @@
      * HTML Code of DataEntryForm
      */
     private String htmlCode;
+    
+    /**
+     * The format of the DataEntryForm.
+     */
+    private int format;
 
     // -------------------------------------------------------------------------
     // Contructors
@@ -244,4 +251,17 @@
     {
         this.htmlCode = htmlCode;
     }
+
+    @JsonProperty
+    @JsonView( {DetailedView.class, ExportView.class} )
+    @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE )
+    public int getFormat()
+    {
+        return format;
+    }
+
+    public void setFormat( int format )
+    {
+        this.format = format;
+    }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2012-12-30 16:23:41 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2013-01-01 19:53:04 +0000
@@ -52,7 +52,6 @@
 {
     private static final String VALUE_HEADER_NAME = "Value";
     
-    //TODO average operator aggregation
     //TODO indicator aggregation
     //TODO category sub-totals and totals
     

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java	2012-09-23 07:25:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java	2013-01-01 19:53:04 +0000
@@ -60,8 +60,7 @@
 /**
  * The expression is a string describing a formula containing data element ids
  * and category option combo ids. The formula can potentially contain references
- * to category totals (also called sub-totals) and data element totals (also
- * called totals).
+ * to data element totals.
  * 
  * @author Margrethe Store
  * @author Lars Helge Overland

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2012-12-04 15:27:28 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-01-01 19:53:04 +0000
@@ -449,6 +449,7 @@
 
         executeSql( "update users set selfregistered = false where selfregistered is null" );
         executeSql( "update users set disabled = false where disabled is null" );
+        executeSql( "update dataentryform set format = 1 where format is null" );
         
         // report, reporttable, chart groups
         

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataentryform/hibernate/DataEntryForm.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataentryform/hibernate/DataEntryForm.hbm.xml	2012-06-04 16:20:41 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataentryform/hibernate/DataEntryForm.hbm.xml	2013-01-01 19:53:04 +0000
@@ -15,6 +15,8 @@
     <property name="style" length="40" />
 
     <property name="htmlCode" column="htmlcode" type="text" />
+    
+    <property name="format" />
 
   </class>
 </hibernate-mapping>