Index: trunk/grails-app/controllers/ReportController.groovy
===================================================================
--- trunk/grails-app/controllers/ReportController.groovy	(revision 680)
+++ trunk/grails-app/controllers/ReportController.groovy	(revision 681)
@@ -161,8 +161,4 @@
         params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
         params.currentUser = authService.currentUser
-        if(params.section.id == 'all')
-            params.section = "All"
-        else
-            params.section = Section.get(params.section.id.toLong())
 
         def dataModel = assetReportService.getAssetRegister(params, RCU.getLocale(request))
Index: trunk/grails-app/services/AssetReportService.groovy
===================================================================
--- trunk/grails-app/services/AssetReportService.groovy	(revision 680)
+++ trunk/grails-app/services/AssetReportService.groovy	(revision 681)
@@ -24,4 +24,7 @@
         def result = [:]
 
+        result.section = Section.get(params.section.id.toLong())
+        result.site = result.section.site
+
         // Inner join used to return only attribTypes that are used by AssetExtendedAttributes.
         // So the result is only asset extendedAttributeTypes.
@@ -44,8 +47,6 @@
                     'left join asset.assetExtendedAttributes as attrib',
                     'left join attrib.extendedAttributeType as attribT'
-            if(params.section instanceof Section) {
-                namedParams.section = params.section
-                where 'asset.section = :section'
-            }
+            where 'asset.section = :section'
+                    namedParams.section = result.section
             order 'by asset.name asc, attribT.name asc'
         }
Index: trunk/grails-app/views/appCore/start.gsp
===================================================================
--- trunk/grails-app/views/appCore/start.gsp	(revision 680)
+++ trunk/grails-app/views/appCore/start.gsp	(revision 681)
@@ -156,6 +156,5 @@
                                                 <g:select optionKey="id"
                                                                     from="${Section.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
-                                                                    name="section.id"
-                                                                    noSelection="['all':/${g.message(code:'default.all.select.text')}/]">
+                                                                    name="section.id">
                                                 </g:select>
                                             </g:jasperReport>
Index: trunk/web-app/reports/assetRegister.jrxml
===================================================================
--- trunk/web-app/reports/assetRegister.jrxml	(revision 680)
+++ trunk/web-app/reports/assetRegister.jrxml	(revision 681)
@@ -5,5 +5,5 @@
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="15"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.y" value="729"/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
@@ -57,5 +57,4 @@
 	<parameter name="currentUser" class="java.lang.String"/>
 	<parameter name="logoUrl" class="java.lang.String"/>
-	<parameter name="section" class="java.lang.String"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
 		<defaultValueExpression><![CDATA["C:\\Documents and Settings\\kromhoutg\\My Documents\\reports\\"]]></defaultValueExpression>
@@ -66,4 +65,6 @@
 	<field name="dataList" class="java.util.List"/>
 	<field name="attribTypes" class="java.util.List"/>
+	<field name="site" class="java.lang.Object"/>
+	<field name="section" class="java.lang.Object"/>
 	<background>
 		<band splitType="Stretch"/>
@@ -83,9 +84,9 @@
 			</image>
 			<textField>
-				<reportElement x="398" y="34" width="340" height="12"/>
+				<reportElement x="398" y="34" width="340" height="15" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center">
-					<font fontName="Serif" size="8"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Section: "+$P{section}]]></textFieldExpression>
+					<font fontName="Serif" size="10"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["Site: "+$F{site}.name+", "+"Section: "+$F{section}.name]]></textFieldExpression>
 			</textField>
 		</band>