Index: /trunk/grails-app/services/InventoryReportService.groovy
===================================================================
--- /trunk/grails-app/services/InventoryReportService.groovy	(revision 668)
+++ /trunk/grails-app/services/InventoryReportService.groovy	(revision 669)
@@ -199,7 +199,5 @@
                     'left join fetch inventoryItem.inventoryLocation as inventoryLocation',
                     'left join fetch inventoryLocation.inventoryStore as inventoryStore',
-                    'left join fetch inventoryItem.unitOfMeasure as unitOfMeasure',
-                    'left join fetch inventoryItem.picture as picture',
-                    'left join fetch picture.images as Image'
+                    'left join fetch inventoryItem.unitOfMeasure as unitOfMeasure'
             where 'inventoryItem.isActive = true'
                 namedParams.siteId = result.site.id
@@ -226,5 +224,6 @@
                 break
             }
-            result.inventoryItemTotalValue += inventoryItem.estimatedUnitPriceAmount * inventoryItem.unitsInStock
+            if(inventoryItem.estimatedUnitPriceAmount && inventoryItem.unitsInStock) // Some items have null estimatedUnitPriceAmount.
+                result.inventoryItemTotalValue += inventoryItem.estimatedUnitPriceAmount * inventoryItem.unitsInStock
         } // for
 
Index: /trunk/web-app/reports/inventoryValue.jrxml
===================================================================
--- /trunk/web-app/reports/inventoryValue.jrxml	(revision 668)
+++ /trunk/web-app/reports/inventoryValue.jrxml	(revision 669)
@@ -6,6 +6,6 @@
 	<property name="ireport.x" 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"/>
@@ -70,5 +70,4 @@
 		<field name="unitsInStock" class="java.lang.Integer"/>
 		<field name="inventoryLocation" class="java.lang.Object"/>
-		<field name="picture" class="java.lang.Object"/>
 		<field name="unitOfMeasure" class="java.lang.Object"/>
 		<field name="description" class="java.lang.String"/>
@@ -146,9 +145,12 @@
 							</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>
+						<jr:detailCell style="table_TD" height="24" rowSpan="1">
+							<textField>
+								<reportElement x="0" y="2" width="117" height="20"/>
+								<textElement verticalAlignment="Middle">
+									<font fontName="Serif"/>
+								</textElement>
+								<textFieldExpression class="java.lang.String"><![CDATA[$F{name}]]></textFieldExpression>
+							</textField>
 						</jr:detailCell>
 					</jr:column>
@@ -160,19 +162,12 @@
 									<font fontName="Serif" size="10" isBold="true"/>
 								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA["Name/Description"]]></textFieldExpression>
-							</textField>
-						</jr:columnHeader>
-						<jr:detailCell style="table_TD" height="51" rowSpan="1">
-							<textField isStretchWithOverflow="true">
-								<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="237" height="25" isPrintWhenDetailOverflows="true"/>
-								<textElement verticalAlignment="Top">
-									<font fontName="Serif" size="8"/>
-								</textElement>
-								<textFieldExpression class="java.lang.String"><![CDATA[$F{name}]]></textFieldExpression>
-							</textField>
-							<textField isStretchWithOverflow="true">
-								<reportElement stretchType="RelativeToTallestObject" x="0" y="25" width="237" height="25" isPrintWhenDetailOverflows="true"/>
-								<textElement>
-									<font fontName="Serif" size="8"/>
+								<textFieldExpression class="java.lang.String"><![CDATA["Description"]]></textFieldExpression>
+							</textField>
+						</jr:columnHeader>
+						<jr:detailCell style="table_TD" height="24" rowSpan="1">
+							<textField isStretchWithOverflow="true">
+								<reportElement stretchType="RelativeToTallestObject" x="0" y="2" width="237" height="20" isPrintWhenDetailOverflows="true"/>
+								<textElement verticalAlignment="Middle">
+									<font fontName="Serif"/>
 								</textElement>
 								<textFieldExpression class="java.lang.String"><![CDATA[$F{description}]]></textFieldExpression>
@@ -190,7 +185,7 @@
 							</staticText>
 						</jr:columnHeader>
-						<jr:detailCell style="table_TD" height="51" rowSpan="1">
-							<textField>
-								<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="90" height="51" isPrintWhenDetailOverflows="true"/>
+						<jr:detailCell style="table_TD" height="24" rowSpan="1">
+							<textField isStretchWithOverflow="true">
+								<reportElement stretchType="RelativeToTallestObject" x="0" y="2" width="90" height="20" isPrintWhenDetailOverflows="true"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font fontName="Serif" size="8"/>
@@ -210,5 +205,5 @@
 							</textField>
 						</jr:columnHeader>
-						<jr:detailCell style="table_TD" height="51" rowSpan="1">
+						<jr:detailCell style="table_TD" height="24" rowSpan="1">
 							<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
 								<leftPen lineWidth="0.0"/>
@@ -216,5 +211,5 @@
 							</box>
 							<textField isStretchWithOverflow="true">
-								<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="104" height="51" isPrintWhenDetailOverflows="true"/>
+								<reportElement stretchType="RelativeToTallestObject" x="0" y="2" width="104" height="20" isPrintWhenDetailOverflows="true"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font fontName="Serif" size="8"/>
@@ -234,7 +229,7 @@
 							</textField>
 						</jr:columnHeader>
-						<jr:detailCell style="table_TD" height="51" rowSpan="1">
+						<jr:detailCell style="table_TD" height="24" rowSpan="1">
 							<textField isStretchWithOverflow="true" pattern="# ##0.00">
-								<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="90" height="51" isPrintWhenDetailOverflows="true"/>
+								<reportElement stretchType="RelativeToTallestObject" x="0" y="2" width="90" height="20" isPrintWhenDetailOverflows="true"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font fontName="Serif" size="8"/>
@@ -254,11 +249,11 @@
 							</textField>
 						</jr:columnHeader>
-						<jr:detailCell style="table_TD" height="51" rowSpan="1">
+						<jr:detailCell style="table_TD" height="24" rowSpan="1">
 							<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
 								<leftPen lineWidth="0.0"/>
 								<rightPen lineWidth="0.0"/>
 							</box>
-							<textField pattern="# ##0.00">
-								<reportElement x="0" y="0" width="82" height="51"/>
+							<textField isStretchWithOverflow="true" pattern="# ##0.00">
+								<reportElement stretchType="RelativeToTallestObject" x="0" y="2" width="82" height="20" isPrintWhenDetailOverflows="true"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font fontName="Serif" size="8"/>
@@ -278,7 +273,7 @@
 							</textField>
 						</jr:columnHeader>
-						<jr:detailCell style="table_TD" height="51" rowSpan="1">
-							<textField>
-								<reportElement x="0" y="0" width="51" height="51"/>
+						<jr:detailCell style="table_TD" height="24" rowSpan="1">
+							<textField isStretchWithOverflow="true">
+								<reportElement stretchType="RelativeToTallestObject" x="0" y="2" width="51" height="20" isPrintWhenDetailOverflows="true"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font fontName="Serif" size="8"/>