=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java 2013-12-17 19:18:45 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java 2013-12-17 19:50:35 +0000 @@ -318,9 +318,12 @@ if ( displayMode.equals( DataSet.TYPE_DEFAULT ) ) { - DataSet newDataSet = new DataSet(); - newDataSet.mergeWith( dataSet ); - dataSet = newDataSet; + DataSet dataSetCopy = new DataSet(); + dataSetCopy.setName( dataSet.getName() ); + dataSetCopy.setShortName( dataSet.getShortName() ); + dataSetCopy.setRenderAsTabs( dataSet.isRenderAsTabs() ); + dataSetCopy.setRenderHorizontally( dataSet.isRenderHorizontally() ); + dataSet = dataSetCopy; for ( int i = 0; i < orderedCategoryCombos.size(); i++ ) {