X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep209.php;h=5a08217168009fb8a0c8c933aef3be4daa16bdf5;hb=0ce53780d575e7bf4eefaa1b7edc0603131cc2b3;hp=0e83fc0103da5d532dc00cbe2cfe9f0532976c2e;hpb=f44132511cc91b83f20f91af0625d4b112b4c26e;p=fa-stable.git

diff --git a/reporting/rep209.php b/reporting/rep209.php
index 0e83fc01..5a082171 100644
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -31,7 +31,7 @@ include_once($path_to_root . "/taxes/tax_calc.inc");
 print_po();
 
 //----------------------------------------------------------------------------------------------------
-function get_po($order_no)
+function get_supp_po($order_no)
 {
    	$sql = "SELECT po.*, supplier.supp_name, supplier.supp_account_no,supplier.tax_included,
    		supplier.gst_no AS tax_id,
@@ -91,7 +91,7 @@ function print_po()
 
 	for ($i = $from; $i <= $to; $i++)
 	{
-		$myrow = get_po($i);
+		$myrow = get_supp_po($i);
 		if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
 			continue;
 		}
@@ -156,7 +156,7 @@ function print_po()
 		if ($myrow['comments'] != "")
 		{
 			$rep->NewLine();
-			$rep->TextColLines(1, 5, $myrow['comments'], -2);
+			$rep->TextColLines(1, 4, $myrow['comments'], -2);
 		}
 		$DisplaySubTot = number_format2($SubTotal,$dec);
 
@@ -176,10 +176,7 @@ function print_po()
 				continue;
 			$DisplayTax = number_format2($tax_item['Value'], $dec);
 
-			if ($SysPrefs->suppress_tax_rates() == 1)
-				$tax_type_name = $tax_item['tax_type_name'];
-			else
-				$tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
+			$tax_type_name = $tax_item['tax_type_name'];
 
 			if ($myrow['tax_included'])
 			{
@@ -188,7 +185,7 @@ function print_po()
 					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);