X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=ba6c86ce17d7fdee6c2996d43b0f6b3a121ddb31;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=52df0b7cece00410dcc636afc82efec888859968;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 52df0b7c..ba6c86ce 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -53,7 +53,7 @@ function print_sales_orders()
 	// $headers in doctext.inc
 	$aligns = array('left',	'left',	'right', 'left', 'right', 'right', 'right');
 
-	$params = array('comments' => $comments);
+	$params = array('comments' => $comments, 'print_quote' => $print_as_quote);
 
 	$cur = get_company_Pref('curr_default');
 
@@ -138,17 +138,15 @@ function print_sales_orders()
 				$rep->TextCol(6, 7,	$DisplayNet, -2);
 			}
 			$rep->row = $newrow;
-			//$rep->NewLine(1);
 			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
 				$rep->NewPage();
 		}
 		if ($myrow['comments'] != "")
 		{
 			$rep->NewLine();
-			$rep->TextColLines(1, 5, $myrow['comments'], -2);
+			$rep->TextColLines(1, 3, $myrow['comments'], -2);
 		}
 		$DisplaySubTot = number_format2($SubTotal,$dec);
-		$DisplayFreight = number_format2($myrow["freight_cost"],$dec);
 
 		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 		$doctype = ST_SALESORDER;
@@ -156,10 +154,13 @@ function print_sales_orders()
 		$rep->TextCol(3, 6, _("Sub-total"), -2);
 		$rep->TextCol(6, 7,	$DisplaySubTot, -2);
 		$rep->NewLine();
-		$rep->TextCol(3, 6, _("Shipping"), -2);
-		$rep->TextCol(6, 7,	$DisplayFreight, -2);
-		$rep->NewLine();
-
+		if ($myrow['freight_cost'] != 0.0)
+		{
+			$DisplayFreight = number_format2($myrow["freight_cost"],$dec);
+			$rep->TextCol(3, 6, _("Shipping"), -2);
+			$rep->TextCol(6, 7,	$DisplayFreight, -2);
+			$rep->NewLine();
+		}	
 		$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
 		if ($myrow['tax_included'] == 0) {
 			$rep->TextCol(3, 6, _("TOTAL ORDER EX VAT"), - 2);
@@ -185,7 +186,7 @@ function print_sales_orders()
 					if ($first)
 					{
 						$rep->TextCol(3, 6, _("Total Tax Excluded"), -2);
-						$rep->TextCol(6, 7,	number_format2($sign*$tax_item['net_amount'], $dec), -2);
+						$rep->TextCol(6, 7,	number_format2($tax_item['net_amount'], $dec), -2);
 						$rep->NewLine();
 					}
 					$rep->TextCol(3, 6, $tax_type_name, -2);