X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=e53d52a35125150b7a0ed6687a04bd748512ee1a;hb=0e9e4cf4f01431531dfed299bb501955bb0818ed;hp=dde986674c2e7cfc7315cfb429aa0bcbcade74af;hpb=1f791242a00fa0766f0452ba68024c45490c2960;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index dde98667..e53d52a3 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -110,6 +110,10 @@ function print_sales_orders()
 		$result = get_sales_order_details($i, ST_SALESORDER);
 		$SubTotal = 0;
 		$items = $prices = array();
+		if ($myrow["ship_via"]) {
+			$items[] = $myrow["ship_via"];
+			$prices[] = $myrow["freight_cost"];
+		}
 		while ($myrow2=db_fetch($result))
 		{
 			$Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
@@ -138,17 +142,16 @@ 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,19 +159,20 @@ 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);
 			$rep->TextCol(6, 7,	$DisplayTotal, -2);
 			$rep->NewLine();
 		}
-
-		$tax_items = get_tax_for_items($items, $prices, $myrow["freight_cost"],
-		  $myrow['tax_group_id'], $myrow['tax_included'],  null);
+		$tax_items = get_tax_for_items(ST_SALESINVOICE, $items, $prices, $myrow['tax_group_id'], $myrow['tax_included']);
 		$first = true;
 		foreach($tax_items as $tax_item)
 		{
@@ -185,7 +189,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);