X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep209.php;h=9f9f012199610e60a780db1813d3f2f103ed5d73;hb=3b06c6c4718610a408cae2e9b76c3134ca30b84c;hp=c1632dfd1f1745f869ddff7d90c467af7055bbd8;hpb=40da959b32eb27fcb0422207a284eed13cc27d7e;p=fa-stable.git

diff --git a/reporting/rep209.php b/reporting/rep209.php
index c1632dfd..9f9f0121 100644
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -34,7 +34,7 @@ print_po();
 function get_po($order_no)
 {
    	$sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name,  "
-   		.TB_PREF."suppliers.supp_account_no,".TB_PREF."suppliers.tax_included,".TB_PREF."suppliers.gst_no AS tax_id,
+   		.TB_PREF."suppliers.supp_account_no,".TB_PREF."suppliers.tax_included,".TB_PREF."suppliers.tax_algorithm,".TB_PREF."suppliers.gst_no AS tax_id,
    		".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."locations.location_name,
    		".TB_PREF."suppliers.address, ".TB_PREF."suppliers.contact, ".TB_PREF."suppliers.tax_group_id
 		FROM ".TB_PREF."purch_orders, ".TB_PREF."suppliers, ".TB_PREF."locations
@@ -58,7 +58,7 @@ function get_po_details($order_no)
 
 function print_po()
 {
-	global $path_to_root, $show_po_item_codes;
+	global $path_to_root, $SysPrefs;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -135,7 +135,7 @@ function print_po()
 			$DisplayPrice = price_decimal_format($myrow2["unit_price"],$dec2);
 			$DisplayQty = number_format2($myrow2["quantity_ordered"],get_qty_dec($myrow2['item_code']));
 			$DisplayNet = number_format2($Net,$dec);
-			if ($show_po_item_codes) {
+			if ($SysPrefs->show_po_item_codes()) {
 				$rep->TextCol(0, 1,	$myrow2['item_code'], -2);
 				$rep->TextCol(1, 2,	$myrow2['description'], -2);
 			} else
@@ -164,7 +164,7 @@ function print_po()
 		$rep->NewLine();
 
 		$tax_items = get_tax_for_items($items, $prices, 0,
-		  $myrow['tax_group_id'], $myrow['tax_included'],  null);
+		  $myrow['tax_group_id'], $myrow['tax_included'],  null, $myrow['tax_algorithm']);
 		$first = true;
 		foreach($tax_items as $tax_item)
 		{
@@ -172,11 +172,14 @@ function print_po()
 				continue;
 			$DisplayTax = number_format2($tax_item['Value'], $dec);
 
-			$tax_type_name = $tax_item['tax_type_name'];
+			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']."%) ";
 
 			if ($myrow['tax_included'])
 			{
-				if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+				if ($SysPrefs->alternative_tax_include_on_docs() == 1)
 				{
 					if ($first)
 					{