X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep110.php;h=5924f88075c9652b5f3b58ba2beadb8ad5b061de;hb=HEAD;hp=6b0830973dafaace1db2563dfc2927344250d65f;hpb=95ff74b5722826544743a01daf527aa3c9efe11a;p=fa-stable.git

diff --git a/reporting/rep110.php b/reporting/rep110.php
index 6b083097..5924f880 100644
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -92,7 +92,7 @@ function print_deliveries()
 					$rep->filename = "Packing_slip" . $myrow['reference'] . ".pdf";
 				}
 			}
-			$rep->currency = $cur;
+			$rep->currency = ($cur == null ? "USD" : $cur);
 			$rep->Font();
 			$rep->Info($params, $cols, null, $aligns);
 
@@ -144,7 +144,7 @@ function print_deliveries()
 			if ($memo != "")
 			{
 				$rep->NewLine();
-				$rep->TextColLines(1, 5, $memo, -2);
+				$rep->TextColLines(1, 3, $memo, -2);
 			}
 
    			$DisplaySubTot = number_format2($SubTotal,$dec);
@@ -158,7 +158,7 @@ function print_deliveries()
 				$rep->NewLine();
 				if ($myrow['ov_freight'] != 0.0)
 				{
-					$DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
+					$DisplayFreight = number_format2($myrow["ov_freight"],$dec);
 					$rep->TextCol(3, 6, _("Shipping"), -2);
 					$rep->TextCol(6, 7,	$DisplayFreight, -2);
 					$rep->NewLine();