X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep209.php;h=ce15c150d07595f432bac261ea8d2dd6a975aa00;hb=d1de4b72e5fa6b5952c75b7c79479935bdd0d9d8;hp=31c82b0a9817a5a7cc226e0d4adc2e9fed697a35;hpb=3c73d05998cf50fed7fa5c0a568a1a911e7023e2;p=fa-stable.git

diff --git a/reporting/rep209.php b/reporting/rep209.php
index 31c82b0a..ce15c150 100644
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -31,26 +31,27 @@ include_once($path_to_root . "/taxes/tax_calc.inc");
 print_po();
 
 //----------------------------------------------------------------------------------------------------
-function get_po($order_no)
+function get_supp_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.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
-		WHERE ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."suppliers.supplier_id
-		AND ".TB_PREF."locations.loc_code = into_stock_location
-		AND ".TB_PREF."purch_orders.order_no = ".db_escape($order_no);
+   	$sql = "SELECT po.*, supplier.supp_name, supplier.supp_account_no,supplier.tax_included,
+   		supplier.gst_no AS tax_id,
+   		supplier.curr_code, supplier.payment_terms, loc.location_name,
+   		supplier.address, supplier.contact, supplier.tax_group_id
+		FROM ".TB_PREF."purch_orders po,"
+			.TB_PREF."suppliers supplier,"
+			.TB_PREF."locations loc
+		WHERE po.supplier_id = supplier.supplier_id
+		AND loc.loc_code = into_stock_location
+		AND po.order_no = ".db_escape($order_no);
    	$result = db_query($sql, "The order cannot be retrieved");
     return db_fetch($result);
 }
 
 function get_po_details($order_no)
 {
-	$sql = "SELECT ".TB_PREF."purch_order_details.*, units
-		FROM ".TB_PREF."purch_order_details
-		LEFT JOIN ".TB_PREF."stock_master
-		ON ".TB_PREF."purch_order_details.item_code=".TB_PREF."stock_master.stock_id
+	$sql = "SELECT poline.*, units, editable
+		FROM ".TB_PREF."purch_order_details poline
+			LEFT JOIN ".TB_PREF."stock_master item ON poline.item_code=item.stock_id
 		WHERE order_no =".db_escape($order_no)." ";
 	$sql .= " ORDER BY po_detail_item";
 	return db_query($sql, "Retreive order Line Items");
@@ -58,7 +59,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");
 
@@ -90,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;
 		}
@@ -103,13 +104,13 @@ function print_po()
 			$rep->title = _('PURCHASE ORDER');
 			$rep->filename = "PurchaseOrder" . $i . ".pdf";
 		}	
-		$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->SetHeaderType('Header2');
 		$rep->NewPage();
 
 		$result = get_po_details($i);
@@ -120,7 +121,8 @@ function print_po()
 			$data = get_purchase_data($myrow['supplier_id'], $myrow2['item_code']);
 			if ($data !== false)
 			{
-				if ($data['supplier_description'] != "")
+				if (!$myrow2['editable'] && $data['supplier_description'] != "" && 
+					$myrow2['description'] != $data['supplier_description']) // backward compatibility
 					$myrow2['description'] = $data['supplier_description'];
 				if ($data['suppliers_uom'] != "")
 					$myrow2['units'] = $data['suppliers_uom'];
@@ -138,7 +140,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
@@ -155,7 +157,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);
 
@@ -167,7 +169,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, TCA_LINES);
 		$first = true;
 		foreach($tax_items as $tax_item)
 		{
@@ -179,12 +181,12 @@ function print_po()
 
 			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)
 					{
 						$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);
@@ -228,4 +230,3 @@ function print_po()
 		$rep->End();
 }
 
-?>
\ No newline at end of file