diff --git a/src/main/resources/jasperTemplates/requisition.jrxml b/src/main/resources/jasperTemplates/requisition.jrxml
index bcc88eb6e..542fa5ace 100755
--- a/src/main/resources/jasperTemplates/requisition.jrxml
+++ b/src/main/resources/jasperTemplates/requisition.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="requisition" pageWidth="1000" pageHeight="595" orientation="Landscape" whenNoDataType="BlankPage" columnWidth="1000" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" uuid="a0a4e861-0726-422f-b3d5-54b1aefe96ce">
+<!-- Created with Jaspersoft Studio version 6.20.5.final using JasperReports Library version 6.20.5-3efcf2e67f959db3888d79f73dde2dbd7acb4f8e  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="requisition" pageWidth="1140" pageHeight="595" orientation="Landscape" whenNoDataType="BlankPage" columnWidth="1000" leftMargin="0" rightMargin="0" topMargin="20" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" uuid="a0a4e861-0726-422f-b3d5-54b1aefe96ce">
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="9"/>
 	<property name="ireport.y" value="0"/>
@@ -73,7 +73,7 @@
 				<textFieldExpression><![CDATA[MessageFormat.format("Report and Requisition for: {0} ({1})", $F{requisition}.getProgram().getName(), $F{requisition}.getFacility().getType().getName())]]></textFieldExpression>
 			</textField>
 			<rectangle>
-				<reportElement mode="Opaque" x="10" y="35" width="919" height="50" backcolor="#C0C0C0" uuid="65fe1d4d-8334-48d2-b383-ee533c8d5742"/>
+				<reportElement mode="Opaque" x="10" y="35" width="1100" height="50" backcolor="#C0C0C0" uuid="65fe1d4d-8334-48d2-b383-ee533c8d5742"/>
 				<graphicElement>
 					<pen lineWidth="0.0"/>
 				</graphicElement>
@@ -206,7 +206,7 @@
 	<detail>
 		<band height="80">
 			<subreport>
-				<reportElement key="fullSupplySubreport" x="0" y="0" width="990" height="40" uuid="4475ef7c-a24a-4301-812c-f41869743f79">
+				<reportElement key="fullSupplySubreport" x="0" y="0" width="1120" height="40" uuid="4475ef7c-a24a-4301-812c-f41869743f79">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
 				</reportElement>
 				<subreportParameter name="template">
@@ -234,7 +234,7 @@
 				<subreportExpression><![CDATA[JasperCompileManager.compileReport($P{subreport})]]></subreportExpression>
 			</subreport>
 			<subreport>
-				<reportElement key="nonFullSupplySubreport" positionType="Float" x="0" y="40" width="990" height="40" uuid="c5a8dc95-8635-4a3c-9fca-38e46ac77ab8">
+				<reportElement key="nonFullSupplySubreport" positionType="Float" x="0" y="40" width="1120" height="40" uuid="c5a8dc95-8635-4a3c-9fca-38e46ac77ab8">
 					<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
 					<printWhenExpression><![CDATA[!$F{nonFullSupply}.isEmpty()]]></printWhenExpression>
 				</reportElement>
diff --git a/src/main/resources/jasperTemplates/requisitionLines.jrxml b/src/main/resources/jasperTemplates/requisitionLines.jrxml
index 8de0783b7..fec36d9cf 100644
--- a/src/main/resources/jasperTemplates/requisitionLines.jrxml
+++ b/src/main/resources/jasperTemplates/requisitionLines.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1  -->
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="requisitionLines" pageWidth="960" pageHeight="595" orientation="Landscape" whenNoDataType="BlankPage" columnWidth="960" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" uuid="8eeca41d-cefe-475b-b89b-f898f69a4087">
+<!-- Created with Jaspersoft Studio version 6.20.5.final using JasperReports Library version 6.20.5-3efcf2e67f959db3888d79f73dde2dbd7acb4f8e  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="requisitionLines" pageWidth="1110" pageHeight="595" orientation="Landscape" whenNoDataType="BlankPage" columnWidth="960" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" uuid="8eeca41d-cefe-475b-b89b-f898f69a4087">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
@@ -28,101 +28,55 @@
 	<parameter name="dateFormat" class="java.lang.String" isForPrompting="false"/>
 	<parameter name="decimalFormat" class="java.text.DecimalFormat" isForPrompting="false"/>
 	<parameter name="currencyDecimalFormat" class="java.text.NumberFormat" isForPrompting="false"/>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="adjustedConsumption" class="java.lang.Integer">
-		<fieldDescription><![CDATA[adjustedConsumption]]></fieldDescription>
-	</field>
-	<field name="averageConsumption" class="java.lang.Integer">
-		<fieldDescription><![CDATA[averageConsumption]]></fieldDescription>
-	</field>
-	<field name="calculatedOrderQuantity" class="java.lang.Integer">
-		<fieldDescription><![CDATA[calculatedOrderQuantity]]></fieldDescription>
-	</field>
-	<field name="numberOfNewPatientsAdded" class="java.lang.Integer">
-		<fieldDescription><![CDATA[numberOfNewPatientsAdded]]></fieldDescription>
-	</field>
-	<field name="orderable" class="org.openlmis.requisition.dto.OrderableDto">
-		<fieldDescription><![CDATA[orderable]]></fieldDescription>
-	</field>
-	<field name="beginningBalance" class="java.lang.Integer">
-		<fieldDescription><![CDATA[beginningBalance]]></fieldDescription>
-	</field>
-	<field name="stockAdjustments" class="java.util.List">
-		<fieldDescription><![CDATA[stockAdjustments]]></fieldDescription>
-	</field>
-	<field name="totalLossesAndAdjustments" class="java.lang.Integer">
-		<fieldDescription><![CDATA[totalLossesAndAdjustments]]></fieldDescription>
-	</field>
-	<field name="totalStockoutDays" class="java.lang.Integer">
-		<fieldDescription><![CDATA[totalStockoutDays]]></fieldDescription>
-	</field>
-	<field name="packsToShip" class="java.lang.Long">
-		<fieldDescription><![CDATA[packsToShip]]></fieldDescription>
-	</field>
-	<field name="approvedQuantity" class="java.lang.Integer">
-		<fieldDescription><![CDATA[approvedQuantity]]></fieldDescription>
-	</field>
-	<field name="skipped" class="java.lang.Boolean">
-		<fieldDescription><![CDATA[skipped]]></fieldDescription>
-	</field>
-	<field name="totalReceivedQuantity" class="java.lang.Integer">
-		<fieldDescription><![CDATA[totalReceivedQuantity]]></fieldDescription>
-	</field>
-	<field name="total" class="java.lang.Integer">
-		<fieldDescription><![CDATA[total]]></fieldDescription>
-	</field>
-	<field name="totalConsumedQuantity" class="java.lang.Integer">
-		<fieldDescription><![CDATA[totalConsumedQuantity]]></fieldDescription>
-	</field>
-	<field name="pricePerPack" class="org.joda.money.Money">
-		<fieldDescription><![CDATA[pricePerPack]]></fieldDescription>
-	</field>
-	<field name="requestedQuantity" class="java.lang.Integer">
-		<fieldDescription><![CDATA[requestedQuantity]]></fieldDescription>
-	</field>
-	<field name="requestedQuantityExplanation" class="java.lang.String">
-		<fieldDescription><![CDATA[requestedQuantityExplanation]]></fieldDescription>
-	</field>
-	<field name="stockOnHand" class="java.lang.Integer">
-		<fieldDescription><![CDATA[stockOnHand]]></fieldDescription>
-	</field>
-	<field name="id" class="java.util.UUID">
-		<fieldDescription><![CDATA[id]]></fieldDescription>
-	</field>
-	<field name="class" class="java.lang.Class">
-		<fieldDescription><![CDATA[class]]></fieldDescription>
-	</field>
-	<field name="remarks" class="java.lang.String">
-		<fieldDescription><![CDATA[remarks]]></fieldDescription>
-	</field>
-	<field name="totalCost" class="org.joda.money.Money">
-		<fieldDescription><![CDATA[totalCost]]></fieldDescription>
-	</field>
-	<field name="maximumStockQuantity" class="java.lang.Integer">
-		<fieldDescription><![CDATA[maximumStockQuantity]]></fieldDescription>
-	</field>
-	<field name="calculatedOrderQuantityIsa" class="java.lang.Integer">
-		<fieldDescription><![CDATA[calculatedOrderQuantityIsa]]></fieldDescription>
-	</field>
+	<field name="adjustedConsumption" class="java.lang.Integer"/>
+	<field name="averageConsumption" class="java.lang.Integer"/>
+	<field name="calculatedOrderQuantity" class="java.lang.Integer"/>
+	<field name="numberOfNewPatientsAdded" class="java.lang.Integer"/>
+	<field name="orderable" class="org.openlmis.requisition.dto.OrderableDto"/>
+	<field name="beginningBalance" class="java.lang.Integer"/>
+	<field name="stockAdjustments" class="java.util.List"/>
+	<field name="totalLossesAndAdjustments" class="java.lang.Integer"/>
+	<field name="totalStockoutDays" class="java.lang.Integer"/>
+	<field name="packsToShip" class="java.lang.Long"/>
+	<field name="approvedQuantity" class="java.lang.Integer"/>
+	<field name="skipped" class="java.lang.Boolean"/>
+	<field name="totalReceivedQuantity" class="java.lang.Integer"/>
+	<field name="total" class="java.lang.Integer"/>
+	<field name="totalConsumedQuantity" class="java.lang.Integer"/>
+	<field name="pricePerPack" class="org.joda.money.Money"/>
+	<field name="requestedQuantity" class="java.lang.Integer"/>
+	<field name="requestedQuantityExplanation" class="java.lang.String"/>
+	<field name="stockOnHand" class="java.lang.Integer"/>
+	<field name="id" class="java.util.UUID"/>
+	<field name="class" class="java.lang.Class"/>
+	<field name="remarks" class="java.lang.String"/>
+	<field name="totalCost" class="org.joda.money.Money"/>
+	<field name="maximumStockQuantity" class="java.lang.Integer"/>
+	<field name="calculatedOrderQuantityIsa" class="java.lang.Integer"/>
 	<field name="additionalQuantityRequired" class="java.lang.Integer"/>
-	<field name="idealStockAmount" class="java.lang.Integer">
-		<fieldDescription><![CDATA[idealStockAmount]]></fieldDescription>
-	</field>
+	<field name="idealStockAmount" class="java.lang.Integer"/>
+	<field name="numberOfPatientsOnTreatmentNextMonth" class="java.lang.Integer"/>
+	<field name="totalRequirement" class="java.lang.Integer"/>
+	<field name="totalQuantityNeededByHf" class="java.lang.Integer"/>
+	<field name="quantityToIssue" class="java.lang.Integer"/>
+	<field name="convertedQuantityToIssue" class="java.lang.Integer"/>
 	<group name="OrderableDisplayCategory">
 		<groupExpression><![CDATA[$F{orderable}.getProgramOrderable($P{programId}).getOrderableCategoryDisplayName()]]></groupExpression>
 		<groupHeader>
 			<band height="10">
 				<rectangle>
-					<reportElement x="9" y="0" width="943" height="10" backcolor="#CCCCCC" uuid="7079c950-9a76-43ee-954f-0349c39803cd">
-						<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
+					<reportElement x="9" y="0" width="1092" height="10" backcolor="#CCCCCC" uuid="7079c950-9a76-43ee-954f-0349c39803cd">
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 				</rectangle>
 				<textField>
-					<reportElement x="9" y="0" width="943" height="10" uuid="29f84432-f48e-467d-b3fb-fc018b725111">
+					<reportElement x="9" y="0" width="1092" height="10" uuid="29f84432-f48e-467d-b3fb-fc018b725111">
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<textElement textAlignment="Center">
 						<font size="8"/>
@@ -138,7 +92,7 @@
 	<title>
 		<band height="35">
 			<textField>
-				<reportElement x="10" y="10" width="882" height="20" uuid="aa195ebb-095a-48c3-a5de-18f63527c79a">
+				<reportElement x="9" y="10" width="1087" height="20" uuid="aa195ebb-095a-48c3-a5de-18f63527c79a">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
 				</reportElement>
 				<textElement>
@@ -149,11 +103,14 @@
 		</band>
 	</title>
 	<columnHeader>
-		<band height="25" splitType="Stretch">
+		<band height="35" splitType="Stretch">
 			<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 			<textField>
-				<reportElement key="orderable.fullProductName" mode="Opaque" x="39" y="0" width="60" height="25" backcolor="#CCCCCC" uuid="fa5f2091-ec02-4004-9546-971806d771f9">
+				<reportElement key="orderable.fullProductName" mode="Opaque" x="40" y="0" width="60" height="35" backcolor="#CCCCCC" uuid="fa5f2091-ec02-4004-9546-971806d771f9">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -167,7 +124,12 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("orderable.fullProductName").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="orderable.productCode" mode="Opaque" x="9" y="0" width="30" height="25" backcolor="#CCCCCC" uuid="aa050bad-b263-43fa-8d5e-9c9b506f2260"/>
+				<reportElement key="orderable.productCode" mode="Opaque" x="9" y="0" width="31" height="35" backcolor="#CCCCCC" uuid="aa050bad-b263-43fa-8d5e-9c9b506f2260">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -180,7 +142,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("orderable.productCode").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="beginningBalance" mode="Opaque" x="139" y="0" width="32" height="25" backcolor="#CCCCCC" uuid="ba36ed17-bea4-4f3c-9a77-1e1adb90aedb"/>
+				<reportElement key="beginningBalance" mode="Opaque" x="140" y="0" width="32" height="35" backcolor="#CCCCCC" uuid="ba36ed17-bea4-4f3c-9a77-1e1adb90aedb">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -193,9 +158,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("beginningBalance").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="totalReceivedQuantity" mode="Opaque" x="171" y="0" width="32" height="25" backcolor="#CCCCCC" uuid="925448c8-3d6b-4b79-93b2-38b441c379fa">
-					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+				<reportElement key="totalReceivedQuantity" mode="Opaque" x="172" y="0" width="32" height="35" backcolor="#CCCCCC" uuid="925448c8-3d6b-4b79-93b2-38b441c379fa">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -209,8 +175,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalReceivedQuantity").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="totalConsumedQuantity" mode="Opaque" x="203" y="0" width="32" height="25" backcolor="#CCCCCC" uuid="7b859dc6-720f-43e0-9092-886ad01a9d50">
+				<reportElement key="totalConsumedQuantity" mode="Opaque" x="204" y="0" width="32" height="35" backcolor="#CCCCCC" uuid="7b859dc6-720f-43e0-9092-886ad01a9d50">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -224,8 +192,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalConsumedQuantity").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="totalLossesAndAdjustments" mode="Opaque" x="235" y="0" width="38" height="25" backcolor="#CCCCCC" uuid="dc09a9f2-acf7-4dab-84ef-a500845dde6d">
+				<reportElement key="totalLossesAndAdjustments" mode="Opaque" x="236" y="0" width="38" height="35" backcolor="#CCCCCC" uuid="dc09a9f2-acf7-4dab-84ef-a500845dde6d">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -239,7 +209,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalLossesAndAdjustments").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="stockOnHand" mode="Opaque" x="273" y="0" width="32" height="25" backcolor="#CCCCCC" uuid="ff7df6d1-53e7-49c8-a94a-0e026f345a39"/>
+				<reportElement key="stockOnHand" mode="Opaque" x="274" y="0" width="32" height="35" backcolor="#CCCCCC" uuid="ff7df6d1-53e7-49c8-a94a-0e026f345a39">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -252,8 +225,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("stockOnHand").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="requestedQuantity" mode="Opaque" x="305" y="0" width="34" height="25" backcolor="#CCCCCC" uuid="39121943-899a-42d8-93c2-974a7b408fb0">
+				<reportElement key="requestedQuantity" mode="Opaque" x="306" y="0" width="34" height="35" backcolor="#CCCCCC" uuid="39121943-899a-42d8-93c2-974a7b408fb0">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -267,8 +242,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("requestedQuantity").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="requestedQuantityExplanation" mode="Opaque" x="339" y="0" width="70" height="25" backcolor="#CCCCCC" uuid="344870d7-8dd4-49a3-b597-d4b615a20eee">
+				<reportElement key="requestedQuantityExplanation" mode="Opaque" x="340" y="0" width="70" height="35" backcolor="#CCCCCC" uuid="344870d7-8dd4-49a3-b597-d4b615a20eee">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -282,7 +259,9 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("requestedQuantityExplanation").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="approvedQuantity" mode="Opaque" x="409" y="0" width="32" height="25" backcolor="#CCCCCC" uuid="5ca60a9a-32ae-47e4-b72f-6be575361d5c">
+				<reportElement key="approvedQuantity" mode="Opaque" x="410" y="0" width="32" height="35" backcolor="#CCCCCC" uuid="5ca60a9a-32ae-47e4-b72f-6be575361d5c">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<printWhenExpression><![CDATA[$P{requisitionStatus}.isAuthorized()]]></printWhenExpression>
 				</reportElement>
 				<box padding="2">
@@ -297,7 +276,9 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("approvedQuantity").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="remarks" mode="Opaque" x="441" y="0" width="68" height="25" backcolor="#CCCCCC" uuid="037372e2-a4c6-4675-9eb1-cd3d955c2961">
+				<reportElement key="remarks" mode="Opaque" x="442" y="0" width="68" height="35" backcolor="#CCCCCC" uuid="037372e2-a4c6-4675-9eb1-cd3d955c2961">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<printWhenExpression><![CDATA[$P{requisitionStatus}.isAuthorized()]]></printWhenExpression>
 				</reportElement>
 				<box padding="2">
@@ -312,7 +293,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("remarks").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="totalStockoutDays" mode="Opaque" x="509" y="0" width="30" height="25" backcolor="#CCCCCC" uuid="38ca3046-107c-49cf-ab32-b6b2a0ad659c"/>
+				<reportElement key="totalStockoutDays" mode="Opaque" x="510" y="0" width="30" height="35" backcolor="#CCCCCC" uuid="38ca3046-107c-49cf-ab32-b6b2a0ad659c">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -325,7 +309,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalStockoutDays").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="total" mode="Opaque" x="539" y="0" width="30" height="25" backcolor="#CCCCCC" uuid="be01de2b-4274-413e-bb50-9463735e2c87"/>
+				<reportElement key="total" mode="Opaque" x="540" y="0" width="30" height="35" backcolor="#CCCCCC" uuid="be01de2b-4274-413e-bb50-9463735e2c87">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -338,7 +325,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("total").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="orderable.dispensable.displayUnit" mode="Opaque" x="99" y="0" width="40" height="25" backcolor="#CCCCCC" uuid="88b07504-aa0a-4fb4-a4fc-71b3d8b091ef"/>
+				<reportElement key="orderable.dispensable.displayUnit" mode="Opaque" x="100" y="0" width="40" height="35" backcolor="#CCCCCC" uuid="88b07504-aa0a-4fb4-a4fc-71b3d8b091ef">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -351,7 +341,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("orderable.dispensable.displayUnit").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="packsToShip" mode="Opaque" x="569" y="0" width="30" height="25" backcolor="#CCCCCC" uuid="b7f0ed2c-71bf-47b6-a4cc-f74ab3a5688d"/>
+				<reportElement key="packsToShip" mode="Opaque" x="570" y="0" width="30" height="35" backcolor="#CCCCCC" uuid="b7f0ed2c-71bf-47b6-a4cc-f74ab3a5688d">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -364,8 +357,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("packsToShip").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="pricePerPack" mode="Opaque" x="599" y="0" width="45" height="25" backcolor="#CCCCCC" uuid="74eb88e0-bdb7-49df-8556-5ee3e4b78647">
+				<reportElement key="pricePerPack" mode="Opaque" x="600" y="0" width="45" height="35" backcolor="#CCCCCC" uuid="74eb88e0-bdb7-49df-8556-5ee3e4b78647">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -379,8 +374,9 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("pricePerPack").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="numberOfNewPatientsAdded" mode="Opaque" x="644" y="0" width="30" height="25" backcolor="#CCCCCC" uuid="326f1d21-fe28-4c47-a971-747e3b295acc">
-					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+				<reportElement key="numberOfNewPatientsAdded" mode="Opaque" x="645" y="0" width="30" height="35" backcolor="#CCCCCC" uuid="326f1d21-fe28-4c47-a971-747e3b295acc">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -394,8 +390,9 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("numberOfNewPatientsAdded").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="maximumStockQuantity" mode="Opaque" x="674" y="0" width="30" height="25" backcolor="#CCCCCC" uuid="c35d9bde-2a31-11e9-b210-d663bd873d93">
-					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
+				<reportElement key="maximumStockQuantity" mode="Opaque" x="675" y="0" width="30" height="35" backcolor="#CCCCCC" uuid="c35d9bde-2a31-11e9-b210-d663bd873d93">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -409,7 +406,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("maximumStockQuantity").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="totalCost" mode="Opaque" x="704" y="0" width="45" height="25" backcolor="#CCCCCC" uuid="4b173290-a1ae-4c11-bc47-dfb8fb4e1710"/>
+				<reportElement key="totalCost" mode="Opaque" x="705" y="0" width="45" height="35" backcolor="#CCCCCC" uuid="4b173290-a1ae-4c11-bc47-dfb8fb4e1710">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -422,7 +422,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalCost").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="adjustedConsumption" mode="Opaque" x="749" y="0" width="40" height="25" backcolor="#CCCCCC" uuid="856d2220-e43a-4111-8ec0-b630b1bdc0bb"/>
+				<reportElement key="adjustedConsumption" mode="Opaque" x="750" y="0" width="40" height="35" backcolor="#CCCCCC" uuid="856d2220-e43a-4111-8ec0-b630b1bdc0bb">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -435,7 +438,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("adjustedConsumption").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="averageConsumption" mode="Opaque" x="789" y="0" width="40" height="25" backcolor="#CCCCCC" uuid="86c38ec7-30e4-4a5d-98fc-a62d1149c2eb"/>
+				<reportElement key="averageConsumption" mode="Opaque" x="790" y="0" width="40" height="35" backcolor="#CCCCCC" uuid="86c38ec7-30e4-4a5d-98fc-a62d1149c2eb">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -448,8 +454,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("averageConsumption").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="calculatedOrderQuantity" mode="Opaque" x="829" y="0" width="30" height="25" backcolor="#CCCCCC" uuid="2eceb46c-22e9-4385-8c3d-645efa2c1d13">
+				<reportElement key="calculatedOrderQuantity" mode="Opaque" x="830" y="0" width="30" height="35" backcolor="#CCCCCC" uuid="2eceb46c-22e9-4385-8c3d-645efa2c1d13">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -463,8 +471,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("calculatedOrderQuantity").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="calculatedOrderQuantityIsa" mode="Opaque" x="859" y="0" width="34" height="25" backcolor="#CCCCCC" uuid="4f62f690-2c4b-11e9-b210-d663bd873d93">
+				<reportElement key="calculatedOrderQuantityIsa" mode="Opaque" x="860" y="0" width="34" height="35" backcolor="#CCCCCC" uuid="4f62f690-2c4b-11e9-b210-d663bd873d93">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -478,8 +488,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("calculatedOrderQuantityIsa").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="additionalQuantityRequired" isPrintRepeatedValues="false" mode="Opaque" x="893" y="0" width="29" height="25" backcolor="#CCCCCC" uuid="1163d192-510e-4b7b-9b8b-3563c779cdc3">
+				<reportElement key="additionalQuantityRequired" mode="Opaque" x="894" y="0" width="29" height="35" backcolor="#CCCCCC" uuid="1163d192-510e-4b7b-9b8b-3563c779cdc3">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -493,8 +505,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("additionalQuantityRequired").getLabel()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="idealStockAmount" isPrintRepeatedValues="false" mode="Opaque" x="922" y="0" width="29" height="25" backcolor="#CCCCCC" uuid="633a1c97-1c7e-44bd-a603-8df8edbba734">
+				<reportElement key="idealStockAmount" mode="Opaque" x="923" y="0" width="29" height="35" backcolor="#CCCCCC" uuid="633a1c97-1c7e-44bd-a603-8df8edbba734">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -507,19 +521,113 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("idealStockAmount").getLabel()]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement key="numberOfPatientsOnTreatmentNextMonth" mode="Opaque" x="952" y="0" width="29" height="35" backcolor="#CCCCCC" uuid="e5d32d95-a523-48e4-845f-b9bf0b7b1ae8">
+					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box padding="2">
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("numberOfPatientsOnTreatmentNextMonth").getLabel()]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement key="convertedQuantityToIssue" mode="Opaque" x="1068" y="0" width="28" height="35" backcolor="#CCCCCC" uuid="9eee353a-ae4e-4080-b94a-d1e3f6d5887c">
+					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box padding="2">
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("convertedQuantityToIssue").getLabel()]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement key="totalRequirement" mode="Opaque" x="981" y="0" width="29" height="35" backcolor="#CCCCCC" uuid="8bbe42c5-8a2f-4ad9-bc38-721aec76bded">
+					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box padding="2">
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalRequirement").getLabel()]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement key="totalQuantityNeededByHf" mode="Opaque" x="1010" y="0" width="29" height="35" backcolor="#CCCCCC" uuid="7bbb1e14-0c77-4a41-b46d-d79c1db1475b">
+					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box padding="2">
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalQuantityNeededByHf").getLabel()]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Group" evaluationGroup="OrderableDisplayCategory">
+				<reportElement key="quantityToIssue" mode="Opaque" x="1039" y="0" width="29" height="35" backcolor="#CCCCCC" uuid="a41526fc-1510-4e91-854e-5ddbde27ab6e">
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box padding="2">
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement>
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("quantityToIssue").getLabel()]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="20" splitType="Stretch">
+		<band height="25" splitType="Stretch">
+			<property name="com.jaspersoft.studio.unit.height" value="px"/>
 			<rectangle>
-				<reportElement x="9" y="0" width="943" height="20" backcolor="#DEDEDE" uuid="2a65185a-b9a9-41e7-92b5-f269c9622440">
-					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+				<reportElement x="9" y="0" width="1092" height="25" backcolor="#DEDEDE" uuid="2a65185a-b9a9-41e7-92b5-f269c9622440">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<printWhenExpression><![CDATA[$V{PAGE_COUNT}.intValue() % 2 == 0]]></printWhenExpression>
 				</reportElement>
 			</rectangle>
 			<textField isBlankWhenNull="true">
-				<reportElement key="orderable.fullProductName" x="39" y="0" width="60" height="20" uuid="c649aa2d-900a-4d7f-94f7-0d072c516c0a">
+				<reportElement key="orderable.fullProductName" x="40" y="0" width="60" height="25" uuid="c649aa2d-900a-4d7f-94f7-0d072c516c0a">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -533,8 +641,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("orderable.fullProductName").getIsDisplayed() ? $F{orderable}.getFullProductName() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="orderable.productCode" x="9" y="0" width="30" height="20" uuid="364650f2-c5ab-49b6-b74a-89aa733eeda5">
+				<reportElement key="orderable.productCode" x="9" y="0" width="31" height="25" uuid="364650f2-c5ab-49b6-b74a-89aa733eeda5">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -548,7 +658,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("orderable.productCode").getIsDisplayed() ? $F{orderable}.getProductCode() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="beginningBalance" x="139" y="0" width="32" height="20" uuid="a7672f9a-30bd-4bf9-96af-324baa7e2280"/>
+				<reportElement key="beginningBalance" x="140" y="0" width="32" height="25" uuid="a7672f9a-30bd-4bf9-96af-324baa7e2280">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -561,7 +674,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("beginningBalance").getIsDisplayed() && $F{beginningBalance} != null ? $P{decimalFormat}.format($F{beginningBalance}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="totalReceivedQuantity" x="171" y="0" width="32" height="20" uuid="547fa08c-24e6-4617-aa94-09384a952a19"/>
+				<reportElement key="totalReceivedQuantity" x="172" y="0" width="32" height="25" uuid="547fa08c-24e6-4617-aa94-09384a952a19">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -574,7 +690,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalReceivedQuantity").getIsDisplayed() && $F{totalReceivedQuantity} != null ? $P{decimalFormat}.format($F{totalReceivedQuantity}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="totalConsumedQuantity" x="203" y="0" width="32" height="20" uuid="a2c8fc54-7cdc-442a-9ced-608a01ef270b"/>
+				<reportElement key="totalConsumedQuantity" x="204" y="0" width="32" height="25" uuid="a2c8fc54-7cdc-442a-9ced-608a01ef270b">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -587,7 +706,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalConsumedQuantity").getIsDisplayed() && $F{totalConsumedQuantity} != null ? $P{decimalFormat}.format($F{totalConsumedQuantity}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="totalLossesAndAdjustments" x="235" y="0" width="38" height="20" uuid="86886d4d-e188-4bbf-bfc7-113325f40773"/>
+				<reportElement key="totalLossesAndAdjustments" x="236" y="0" width="38" height="25" uuid="86886d4d-e188-4bbf-bfc7-113325f40773">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -600,7 +722,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalLossesAndAdjustments").getIsDisplayed() && $F{totalLossesAndAdjustments} != null ? $P{decimalFormat}.format($F{totalLossesAndAdjustments}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="stockOnHand" x="273" y="0" width="32" height="20" uuid="0185ea38-1d83-4eed-929f-508e1ffe010c"/>
+				<reportElement key="stockOnHand" x="274" y="0" width="32" height="25" uuid="0185ea38-1d83-4eed-929f-508e1ffe010c">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -613,7 +738,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("stockOnHand").getIsDisplayed() && $F{stockOnHand} != null ? $P{decimalFormat}.format($F{stockOnHand}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="requestedQuantityExplanation" x="339" y="0" width="70" height="20" uuid="1e2e903d-a271-40f0-a2a3-ba25d101182f"/>
+				<reportElement key="requestedQuantityExplanation" x="340" y="0" width="70" height="25" uuid="1e2e903d-a271-40f0-a2a3-ba25d101182f">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -626,7 +754,9 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("requestedQuantityExplanation").getIsDisplayed() ? $F{requestedQuantityExplanation} : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="approvedQuantity" x="409" y="0" width="32" height="20" uuid="123d5789-9a0e-493b-9dcb-8fd89100a599">
+				<reportElement key="approvedQuantity" x="410" y="0" width="32" height="25" uuid="123d5789-9a0e-493b-9dcb-8fd89100a599">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<printWhenExpression><![CDATA[$P{requisitionStatus}.isAuthorized()]]></printWhenExpression>
 				</reportElement>
 				<box padding="2">
@@ -641,8 +771,10 @@
 				<textFieldExpression><![CDATA[($P{template}.viewColumns().get("approvedQuantity").getIsDisplayed() && $P{requisitionStatus}.isAuthorized() && $F{approvedQuantity} != null) ? $P{decimalFormat}.format($F{approvedQuantity}).toString() : ""]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="totalStockoutDays" x="509" y="0" width="30" height="20" uuid="0b535dc6-aa7d-41e4-bf5f-092d578c0ced">
+				<reportElement key="totalStockoutDays" x="510" y="0" width="30" height="25" uuid="0b535dc6-aa7d-41e4-bf5f-092d578c0ced">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -656,8 +788,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalStockoutDays").getIsDisplayed() && $F{totalStockoutDays} != null ? $P{decimalFormat}.format($F{totalStockoutDays}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="total" x="539" y="0" width="30" height="20" uuid="2aef1b8a-a7cb-4972-9506-22d1ccc2a945">
+				<reportElement key="total" x="540" y="0" width="30" height="25" uuid="2aef1b8a-a7cb-4972-9506-22d1ccc2a945">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -671,8 +805,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("total").getIsDisplayed() && $F{total} != null ? $P{decimalFormat}.format($F{total}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="orderable.dispensable.displayUnit" x="99" y="0" width="40" height="20" uuid="0e217f2e-f7ca-4c05-b9d2-f13ec6cf38db">
+				<reportElement key="orderable.dispensable.displayUnit" x="100" y="0" width="40" height="25" uuid="0e217f2e-f7ca-4c05-b9d2-f13ec6cf38db">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -686,8 +822,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("orderable.dispensable.displayUnit").getIsDisplayed() ? $F{orderable}.getDispensable().getDisplayUnit() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="packsToShip" x="569" y="0" width="30" height="20" uuid="97268fb4-abce-44f3-9162-3376a5e64000">
+				<reportElement key="packsToShip" x="570" y="0" width="30" height="25" uuid="97268fb4-abce-44f3-9162-3376a5e64000">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -701,8 +839,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("packsToShip").getIsDisplayed() && $F{packsToShip} != null ? $P{decimalFormat}.format($F{packsToShip}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="pricePerPack" x="599" y="0" width="45" height="20" uuid="8a78859d-6649-4ac8-9538-48ce2f44ad67">
+				<reportElement key="pricePerPack" x="600" y="0" width="45" height="25" uuid="8a78859d-6649-4ac8-9538-48ce2f44ad67">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -716,8 +856,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("pricePerPack").getIsDisplayed() ? $P{currencyDecimalFormat}.format(new BigDecimal($F{pricePerPack}.toString().replaceAll("[^0-9?!\\.]+", ""))).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="numberOfNewPatientsAdded" x="644" y="0" width="30" height="20" uuid="fea4bade-1ea2-4739-83fa-93be949392a2">
+				<reportElement key="numberOfNewPatientsAdded" x="645" y="0" width="30" height="25" uuid="fea4bade-1ea2-4739-83fa-93be949392a2">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -731,8 +873,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("numberOfNewPatientsAdded").getIsDisplayed() && $F{numberOfNewPatientsAdded} != null ? $P{decimalFormat}.format($F{numberOfNewPatientsAdded}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="maximumStockQuantity" x="674" y="0" width="30" height="20" uuid="d8c3a7c4-5705-437e-ad7a-a1f90d2bbfce">
+				<reportElement key="maximumStockQuantity" x="675" y="0" width="30" height="25" uuid="d8c3a7c4-5705-437e-ad7a-a1f90d2bbfce">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -746,7 +890,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("maximumStockQuantity").getIsDisplayed() && $F{maximumStockQuantity} != null ? $P{decimalFormat}.format($F{maximumStockQuantity}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="totalCost" x="704" y="0" width="45" height="20" uuid="09db620a-d11c-40e3-9981-bb0aed1b3ad9"/>
+				<reportElement key="totalCost" x="705" y="0" width="45" height="25" uuid="09db620a-d11c-40e3-9981-bb0aed1b3ad9">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -759,8 +906,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalCost").getIsDisplayed() ? $P{currencyDecimalFormat}.format(new BigDecimal($F{totalCost}.toString().replaceAll("[^0-9?!\\.]+", ""))).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="averageConsumption" x="789" y="0" width="40" height="20" uuid="415e8964-fd1f-4c09-a7fe-7b34036549d9">
+				<reportElement key="averageConsumption" x="790" y="0" width="40" height="25" uuid="415e8964-fd1f-4c09-a7fe-7b34036549d9">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -774,7 +923,9 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("averageConsumption").getIsDisplayed() && $F{averageConsumption} != null ? $P{decimalFormat}.format($F{averageConsumption}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="remarks" x="441" y="0" width="68" height="20" uuid="b995a245-0802-4412-b304-d4dc8741b567">
+				<reportElement key="remarks" x="442" y="0" width="68" height="25" uuid="b995a245-0802-4412-b304-d4dc8741b567">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<printWhenExpression><![CDATA[$P{requisitionStatus}.isAuthorized()]]></printWhenExpression>
 				</reportElement>
 				<box padding="2">
@@ -789,8 +940,10 @@
 				<textFieldExpression><![CDATA[($P{template}.viewColumns().get("remarks").getIsDisplayed() && $P{requisitionStatus}.isAuthorized()) ? $F{remarks} : ""]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="adjustedConsumption" x="749" y="0" width="40" height="20" uuid="2a43948d-6150-4c4f-ba77-2ad782def76b">
+				<reportElement key="adjustedConsumption" x="750" y="0" width="40" height="25" uuid="2a43948d-6150-4c4f-ba77-2ad782def76b">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -804,8 +957,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("adjustedConsumption").getIsDisplayed() && $F{adjustedConsumption} != null ? $P{decimalFormat}.format($F{adjustedConsumption}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="requestedQuantity" x="305" y="0" width="34" height="20" uuid="e0b2c183-8945-4262-8a8a-5c892513d0ee">
+				<reportElement key="requestedQuantity" x="306" y="0" width="34" height="25" uuid="e0b2c183-8945-4262-8a8a-5c892513d0ee">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -819,8 +974,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("requestedQuantity").getIsDisplayed() && $F{requestedQuantity} != null ? $P{decimalFormat}.format($F{requestedQuantity}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="calculatedOrderQuantity" x="829" y="0" width="30" height="20" uuid="f4aa1080-4960-4760-a3f8-ad8a1fb5de81">
+				<reportElement key="calculatedOrderQuantity" x="830" y="0" width="30" height="25" uuid="f4aa1080-4960-4760-a3f8-ad8a1fb5de81">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -834,8 +991,10 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("calculatedOrderQuantity").getIsDisplayed() && $F{calculatedOrderQuantity} != null ? $P{decimalFormat}.format($F{calculatedOrderQuantity}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="calculatedOrderQuantityIsa" x="859" y="0" width="34" height="20" uuid="cf07e9e6-2c4b-11e9-b210-d663bd873d93">
+				<reportElement key="calculatedOrderQuantityIsa" x="860" y="0" width="34" height="25" uuid="cf07e9e6-2c4b-11e9-b210-d663bd873d93">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -849,8 +1008,9 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("calculatedOrderQuantityIsa").getIsDisplayed() && $F{calculatedOrderQuantityIsa} != null ? $P{decimalFormat}.format($F{calculatedOrderQuantityIsa}).toString() : null]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="additionalQuantityRequired" x="893" y="0" width="29" height="20" uuid="3125c641-4c2c-4ecf-9e4e-399eb11f7404">
-					<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
+				<reportElement key="additionalQuantityRequired" x="894" y="0" width="29" height="25" uuid="3125c641-4c2c-4ecf-9e4e-399eb11f7404">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -864,8 +1024,9 @@
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("additionalQuantityRequired").getIsDisplayed() && $F{additionalQuantityRequired} != null ? $P{decimalFormat}.format($F{additionalQuantityRequired}).toString() : 0.0]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="idealStockAmount" x="922" y="0" width="29" height="20" uuid="1440d337-ee37-48ff-9dc9-a4ce4360fc13">
-					<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
+				<reportElement key="idealStockAmount" x="923" y="0" width="29" height="25" uuid="1440d337-ee37-48ff-9dc9-a4ce4360fc13">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box padding="2">
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -878,6 +1039,91 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("idealStockAmount").getIsDisplayed() && $F{idealStockAmount} != null ? $P{decimalFormat}.format($F{idealStockAmount}).toString() :  null]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement key="numberOfPatientsOnTreatmentNextMonth" x="952" y="0" width="29" height="25" uuid="afc498ca-274f-46e0-8b4c-efe95ae18e9a">
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box padding="2">
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("numberOfPatientsOnTreatmentNextMonth").getIsDisplayed() && $F{numberOfPatientsOnTreatmentNextMonth} != null ? $P{decimalFormat}.format($F{numberOfPatientsOnTreatmentNextMonth}).toString() :  null]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement key="totalRequirement" x="981" y="0" width="29" height="25" uuid="f7eb6312-f71b-43fa-bca9-71e7d549bf6b">
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box padding="2">
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalRequirement").getIsDisplayed() && $F{totalRequirement} != null ? $P{decimalFormat}.format($F{totalRequirement}).toString() :  null]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement key="totalQuantityNeededByHf" x="1010" y="0" width="29" height="25" uuid="c2816bc0-b4c9-4ba3-8586-fb56bfecac57">
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box padding="2">
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("totalQuantityNeededByHf").getIsDisplayed() && $F{totalQuantityNeededByHf} != null ? $P{decimalFormat}.format($F{totalQuantityNeededByHf}).toString() :  null]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement key="quantityToIssue" x="1039" y="0" width="29" height="25" uuid="86b55e50-ffc1-4a68-b3a6-480f65154791">
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box padding="2">
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("quantityToIssue").getIsDisplayed() && $F{quantityToIssue} != null ? $P{decimalFormat}.format($F{quantityToIssue}).toString() :  null]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement key="convertedQuantityToIssue" x="1068" y="0" width="28" height="25" uuid="95f41d8d-fe61-433c-9d9f-32763b0efb34">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box padding="2">
+					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Top">
+					<font size="6"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{template}.viewColumns().get("convertedQuantityToIssue").getIsDisplayed() && $F{convertedQuantityToIssue} != null ? $P{decimalFormat}.format($F{convertedQuantityToIssue}).toString() :  null]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 </jasperReport>