Index: trunk/web-app/reports/stockTakeByLocation.jrxml
===================================================================
--- trunk/web-app/reports/stockTakeByLocation.jrxml	(revision 547)
+++ trunk/web-app/reports/stockTakeByLocation.jrxml	(revision 550)
@@ -5,7 +5,7 @@
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.y" value="144"/>
+	<import value="java.util.*"/>
 	<import value="net.sf.jasperreports.engine.*"/>
-	<import value="java.util.*"/>
 	<import value="net.sf.jasperreports.engine.data.*"/>
 	<style name="Crosstab Data Text" isDefault="false" hAlign="Center"/>
@@ -73,9 +73,5 @@
 	<parameter name="currentUser" class="java.lang.String"/>
 	<parameter name="logoUrl" class="java.lang.String"/>
-	<parameter name="startDateString" class="java.lang.String"/>
-	<parameter name="endDateString" 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>
-	</parameter>
+	<parameter name="locationString" class="java.lang.String"/>
 	<queryString language="SQL">
 		<![CDATA[]]>
@@ -85,5 +81,6 @@
 	<field name="inventoryItemCount" class="java.lang.Integer"/>
 	<field name="locations" class="java.lang.String"/>
-	<field name="countWarning" class="java.lang.String"/>
+	<field name="errorMessage" class="java.lang.String"/>
+	<field name="locationCount" class="java.lang.Integer"/>
 	<background>
 		<band splitType="Stretch"/>
@@ -105,14 +102,14 @@
 				<reportElement x="0" y="75" width="340" height="17"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" markup="none"/>
-				<textFieldExpression class="java.lang.String"><![CDATA["Inventory Items: "+$F{inventoryItemCount}+", Locations: "+$F{locations}+"."]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA["Total - Items: "+$F{inventoryItemCount}+", Locations: "+$F{locationCount}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement mode="Opaque" x="400" y="4" width="382" height="46" isPrintWhenDetailOverflows="true" forecolor="#FF0000" backcolor="#FFCCCC">
-					<printWhenExpression><![CDATA[$F{countWarning} != null ? true:false]]></printWhenExpression>
+					<printWhenExpression><![CDATA[$F{errorMessage} != null ? true:false]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{countWarning}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{errorMessage}]]></textFieldExpression>
 			</textField>
 		</band>
@@ -132,6 +129,6 @@
 						<jr:groupHeader groupName="group1">
 							<jr:cell height="20" rowSpan="1">
-								<textField>
-									<reportElement x="0" y="0" width="127" height="20"/>
+								<textField isStretchWithOverflow="true">
+									<reportElement x="0" y="0" width="117" height="20"/>
 									<textElement verticalAlignment="Middle">
 										<font size="12" isBold="true"/>
@@ -141,8 +138,16 @@
 							</jr:cell>
 						</jr:groupHeader>
-						<jr:columnHeader style="table_CH" height="20" rowSpan="1"/>
-						<jr:detailCell style="table_TD" height="51" rowSpan="1">
-							<image>
-								<reportElement x="39" y="0" width="88" height="51"/>
+						<jr:columnHeader style="table_CH" height="20" rowSpan="1">
+							<textField isStretchWithOverflow="true">
+								<reportElement x="0" y="0" width="117" height="20"/>
+								<textElement verticalAlignment="Middle">
+									<font isBold="true"/>
+								</textElement>
+								<textFieldExpression class="java.lang.String"><![CDATA[$F{inventoryLocation}.name]]></textFieldExpression>
+							</textField>
+						</jr:columnHeader>
+						<jr:detailCell style="table_TD" height="51" rowSpan="1">
+							<image hAlign="Center" vAlign="Middle">
+								<reportElement x="29" y="0" width="88" height="51"/>
 								<imageExpression class="java.awt.Image"><![CDATA[net.sf.jasperreports.engine.util.JRImageLoader.loadImage($F{picture}.images.first().data)]]></imageExpression>
 							</image>
@@ -151,5 +156,5 @@
 					<jr:column width="237">
 						<jr:columnHeader style="table_CH" height="20" rowSpan="1">
-							<textField>
+							<textField isStretchWithOverflow="true">
 								<reportElement x="0" y="0" width="237" height="20"/>
 								<textElement verticalAlignment="Middle">
@@ -174,5 +179,5 @@
 					<jr:column width="104">
 						<jr:columnHeader style="table_CH" height="20" rowSpan="1">
-							<textField>
+							<textField isStretchWithOverflow="true">
 								<reportElement x="0" y="0" width="104" height="20"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -196,5 +201,5 @@
 					<jr:column width="90">
 						<jr:columnHeader style="table_CH" height="20" rowSpan="1">
-							<textField>
+							<textField isStretchWithOverflow="true">
 								<reportElement x="0" y="0" width="90" height="20"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -206,5 +211,5 @@
 						<jr:detailCell style="table_TD" height="51" rowSpan="1">
 							<rectangle>
-								<reportElement x="5" y="8" width="80" height="35"/>
+								<reportElement x="5" y="11" width="80" height="30"/>
 							</rectangle>
 						</jr:detailCell>
@@ -232,5 +237,5 @@
 					<jr:column width="139">
 						<jr:columnHeader style="table_CH" height="20" rowSpan="1">
-							<textField>
+							<textField isStretchWithOverflow="true">
 								<reportElement x="0" y="0" width="139" height="20"/>
 								<textElement verticalAlignment="Middle">
@@ -326,8 +331,28 @@
 				<textFieldExpression class="java.lang.String"><![CDATA["Summary"]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="0" y="60" width="782" height="309"/>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="0" y="60" width="782" height="18"/>
 				<textElement/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{summaryOfCalculationMethod}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd-MMM-yyyy" isBlankWhenNull="true">
+				<reportElement x="0" y="125" width="782" height="17"/>
+				<textElement verticalAlignment="Middle" markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA["Locations found: "]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd-MMM-yyyy" isBlankWhenNull="true">
+				<reportElement x="14" y="143" width="768" height="17"/>
+				<textElement verticalAlignment="Middle" markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{locations}+"."]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd-MMM-yyyy" isBlankWhenNull="true">
+				<reportElement x="14" y="101" width="768" height="17"/>
+				<textElement verticalAlignment="Middle" markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{locationString}]]></textFieldExpression>
+			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd-MMM-yyyy" isBlankWhenNull="true">
+				<reportElement x="0" y="84" width="782" height="17"/>
+				<textElement verticalAlignment="Middle" markup="none"/>
+				<textFieldExpression class="java.lang.String"><![CDATA["Locations requested ('e.g:' is ignored and '%' is a wild card): "]]></textFieldExpression>
 			</textField>
 		</band>