X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=5b049c111ce799fd0a4be400fe0b6a03ab392320;hb=31966256a900343308ce287a246fe3a52e9a613c;hp=07767415b169910e4c1e53a4314ed2a3efd38805;hpb=28e7dac267b65d8163ca41c452c42706d0ffb2dd;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 07767415..5b049c11 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -94,7 +94,7 @@ function print_sales_orders()
 		}
 		else
 			$rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
-		$rep->Header2($myrow, $branch, $myrow, $baccount, 9);
+		$rep->Header2($myrow, $branch, $myrow, $baccount, ST_SALESORDER);
 
 		$result = get_sales_order_details($i, ST_SALESORDER);
 		$SubTotal = 0;
@@ -123,7 +123,7 @@ function print_sales_orders()
 			$rep->row = $newrow;
 			//$rep->NewLine(1);
 			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-				$rep->Header2($myrow, $branch, $myrow, $baccount, 9);
+				$rep->Header2($myrow, $branch, $myrow, $baccount, ST_SALESORDER);
 		}
 		if ($myrow['comments'] != "")
 		{
@@ -135,7 +135,7 @@ function print_sales_orders()
 
 		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 		$linetype = true;
-		$doctype = 9;
+		$doctype = ST_SALESORDER;
 		if ($rep->currency != $myrow['curr_code'])
 		{
 			include($path_to_root . "/reporting/includes/doctext2.inc");
@@ -153,7 +153,10 @@ function print_sales_orders()
 		$rep->NewLine();
 		$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
 		$rep->Font('bold');
-		$rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
+		if ($myrow['tax_included'] == 0)
+			$rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
+		else	
+			$rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
 		$rep->TextCol(6, 7,	$DisplayTotal, -2);
 		$rep->Font();
 		if ($email == 1)