X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep209.php;h=9f9f012199610e60a780db1813d3f2f103ed5d73;hb=13367be8aaf5175295f7aab7160370458dad1824;hp=1d297de54d503f21c47c780e9e1cbeb6a853fef9;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/reporting/rep209.php b/reporting/rep209.php
index 1d297de5..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.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;
+	global $path_to_root, $SysPrefs;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -67,11 +67,11 @@ function print_po()
 	$currency = $_POST['PARAM_2'];
 	$email = $_POST['PARAM_3'];
 	$comments = $_POST['PARAM_4'];
+	$orientation = $_POST['PARAM_5'];
 
-	if ($from == null)
-		$from = 0;
-	if ($to == null)
-		$to = 0;
+	if (!$from || !$to) return;
+
+	$orientation = ($orientation ? 'L' : 'P');
 	$dec = user_price_dec();
 
 	$cols = array(4, 60, 225, 300, 340, 385, 450, 515);
@@ -84,13 +84,9 @@ function print_po()
 	$cur = get_company_Pref('curr_default');
 
 	if ($email == 0)
-	{
-		$rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk", user_pagesize());
-		$rep->SetHeaderType('Header2');
-		$rep->currency = $cur;
-		$rep->Font();
-		$rep->Info($params, $cols, null, $aligns);
-	}
+		$rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+    	recalculate_cols($cols);
 
 	for ($i = $from; $i <= $to; $i++)
 	{
@@ -100,16 +96,15 @@ function print_po()
 
 		if ($email == 1)
 		{
-			$rep = new FrontReport("", "", user_pagesize());
-			$rep->SetHeaderType('Header2');
-			$rep->currency = $cur;
-			$rep->Font();
+			$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
 			$rep->title = _('PURCHASE ORDER');
 			$rep->filename = "PurchaseOrder" . $i . ".pdf";
-			$rep->Info($params, $cols, null, $aligns);
-		}
-		else
-			$rep->title = _('PURCHASE ORDER');
+		}	
+		$rep->SetHeaderType('Header2');
+		$rep->currency = $cur;
+		$rep->Font();
+		$rep->Info($params, $cols, null, $aligns);
+
 		$contacts = get_supplier_contacts($myrow['supplier_id'], 'order');
 		$rep->SetCommonData($myrow, null, $myrow, $baccount, ST_PURCHORDER, $contacts);
 		$rep->NewPage();
@@ -140,8 +135,11 @@ 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);
-			//$rep->TextCol(0, 1,	$myrow2['item_code'], -2);
-			$rep->TextCol(0, 2,	$myrow2['description'], -2);
+			if ($SysPrefs->show_po_item_codes()) {
+				$rep->TextCol(0, 1,	$myrow2['item_code'], -2);
+				$rep->TextCol(1, 2,	$myrow2['description'], -2);
+			} else
+				$rep->TextCol(0, 2,	$myrow2['description'], -2);
 			$rep->TextCol(2, 3,	sql2date($myrow2['delivery_date']), -2);
 			$rep->TextCol(3, 4,	$DisplayQty, -2);
 			$rep->TextCol(4, 5,	$myrow2['units'], -2);
@@ -159,29 +157,29 @@ function print_po()
 		$DisplaySubTot = number_format2($SubTotal,$dec);
 
 		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
-		$linetype = true;
 		$doctype = ST_PURCHORDER;
-		include($path_to_root . "/reporting/includes/doctext.inc");
 
-		$rep->TextCol(3, 6, $doc_Sub_total, -2);
+		$rep->TextCol(3, 6, _("Sub-total"), -2);
 		$rep->TextCol(6, 7,	$DisplaySubTot, -2);
 		$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)
 		{
+			if ($tax_item['Value'] == 0)
+				continue;
 			$DisplayTax = number_format2($tax_item['Value'], $dec);
 
-			if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
+			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)
 					{
@@ -194,7 +192,7 @@ function print_po()
 					$first = false;
 				}
 				else
-					$rep->TextCol(3, 7, $doc_Included . " " . $tax_type_name . $doc_Amount . ": " . $DisplayTax, -2);
+					$rep->TextCol(3, 7, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2);
 			}
 			else
 			{
@@ -208,7 +206,7 @@ function print_po()
 		$rep->NewLine();
 		$DisplayTotal = number_format2($SubTotal, $dec);
 		$rep->Font('bold');
-		$rep->TextCol(3, 6, $doc_TOTAL_PO, - 2);
+		$rep->TextCol(3, 6, _("TOTAL PO"), - 2);
 		$rep->TextCol(6, 7,	$DisplayTotal, -2);
 		$words = price_in_words($SubTotal, ST_PURCHORDER);
 		if ($words != "")
@@ -223,7 +221,7 @@ function print_po()
 
 			if ($myrow['reference'] == "")
 				$myrow['reference'] = $myrow['order_no'];
-			$rep->End($email, $doc_Order_no . " " . $myrow['reference'], $myrow);
+			$rep->End($email);
 		}
 	}
 	if ($email == 0)