=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java 2013-10-04 13:17:41 +0000 @@ -572,7 +572,18 @@ */ public static String getValue( TagNode cell ) { - return cell.getFirstChild() != null ? cell.getFirstChild().getText().trim().replaceAll( " ", EMPTY ) : EMPTY; + String master = new String(EMPTY); + for (Node child : cell.getChildren().toNodeArray()) + { + if (child instanceof Span) { + master = master + ((Span)child).getStringText().trim().replaceAll( " ", EMPTY ); + } + else + { + master = master + child.getText().trim().replaceAll( " ", EMPTY ); + } + } + return master; } // -------------------------------------------------------------------------