X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep209.php;h=6ae258303147d1c9e62b557c352930eaa966237d;hb=412b79dc32855f813d03a8a6dd9debd45bb308f5;hp=32108d5ab4c3d550565dc0e28c5f4e75a882fad3;hpb=d6ccc05f1d97979ee67c33451fdfd9cf5f124bb9;p=fa-stable.git

diff --git a/reporting/rep209.php b/reporting/rep209.php
index 32108d5a..6ae25830 100644
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -22,12 +22,12 @@ print_po();
 //----------------------------------------------------------------------------------------------------
 function get_po($order_no)
 {
-   	$sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name, 
+   	$sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name,
    		".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."locations.location_name,
-   		".TB_PREF."suppliers.email, ".TB_PREF."suppliers.address 
-		FROM ".TB_PREF."purch_orders, ".TB_PREF."suppliers, ".TB_PREF."locations 
+   		".TB_PREF."suppliers.email, ".TB_PREF."suppliers.address
+		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."locations.loc_code = into_stock_location
 		AND ".TB_PREF."purch_orders.order_no = " . $order_no;
    	$result = db_query($sql, "The order cannot be retrieved");
     return db_fetch($result);
@@ -35,10 +35,10 @@ function get_po($order_no)
 
 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 ".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
 		WHERE order_no =$order_no ";
 	$sql .= " ORDER BY po_detail_item";
 	return db_query($sql, "Retreive order Line Items");
@@ -47,33 +47,33 @@ function get_po_details($order_no)
 function print_po()
 {
 	global $path_to_root;
-	
+
 	include_once($path_to_root . "reporting/includes/pdf_report.inc");
-	
+
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
 	$currency = $_POST['PARAM_2'];
 	$bankaccount = $_POST['PARAM_3'];
-	$email = $_POST['PARAM_4'];	
+	$email = $_POST['PARAM_4'];
 	$comments = $_POST['PARAM_5'];
 
 	if ($from == null)
 		$from = 0;
 	if ($to == null)
 		$to = 0;
-	$dec =user_price_dec();
-	
-	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
+	$dec = user_price_dec();
+
+	$cols = array(4, 60, 225, 300, 340, 385, 450, 515);
+
+	// $headers in doctext.inc
+	$aligns = array('left',	'left',	'left', 'right', 'left', 'right', 'right');
 
-	// $headers in doctext.inc	
-	$aligns = array('left',	'left',	'left', 'left', 'right', 'right', 'right');
-	
 	$params = array('comments' => $comments,
 					'bankaccount' => $bankaccount);
-	
+
 	$baccount = get_bank_account($params['bankaccount']);
 	$cur = get_company_Pref('curr_default');
-	
+
 	if ($email == 0)
 	{
 		$rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk.pdf", user_pagesize());
@@ -103,10 +103,11 @@ function print_po()
 		$SubTotal = 0;
 		while ($myrow2=db_fetch($result))
 		{
-			$Net = ($myrow2["unit_price"] * $myrow2["quantity_ordered"]);
+			$Net = round(($myrow2["unit_price"] * $myrow2["quantity_ordered"]),
+			  user_price_dec());
 			$SubTotal += $Net;
 			$DisplayPrice = number_format2($myrow2["unit_price"],$dec);
-			$DisplayQty = number_format2($myrow2["quantity_ordered"],user_qty_dec());
+			$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);
@@ -116,14 +117,14 @@ function print_po()
 			$rep->TextCol(5, 6,	$DisplayPrice, -2);
 			$rep->TextCol(6, 7,	$DisplayNet, -2);
 			$rep->NewLine(1);
-			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight)) 
+			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
 				$rep->Header2($myrow, $branch, $sales_order, $baccount);
 		}
 		if ($myrow['comments'] != "")
 		{
 			$rep->NewLine();
 			$rep->TextColLines(1, 5, $myrow['comments'], -2);
-		}	
+		}
 		$DisplaySubTot = number_format2($SubTotal,$dec);
 
 		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
@@ -131,28 +132,28 @@ function print_po()
 		$doctype = 8;
 		if ($rep->currency != $myrow['curr_code'])
 		{
-			include($path_to_root . "reporting/includes/doctext2.inc");			
-		}	
+			include($path_to_root . "reporting/includes/doctext2.inc");
+		}
 		else
 		{
-			include($path_to_root . "reporting/includes/doctext.inc");			
-		}	
+			include($path_to_root . "reporting/includes/doctext.inc");
+		}
 
 		$rep->TextCol(3, 6, $doc_Sub_total, -2);
 		$rep->TextCol(6, 7,	$DisplaySubTot, -2);
 		$rep->NewLine();
 		$DisplayTotal = number_format2($SubTotal, $dec);
-		$rep->Font('bold');	
+		$rep->Font('bold');
 		$rep->TextCol(3, 6, $doc_TOTAL_PO, - 2);
 		$rep->TextCol(6, 7,	$DisplayTotal, -2);
-		$rep->Font();	
+		$rep->Font();
 		if ($email == 1)
 		{
 			$myrow['contact_email'] = $myrow['email'];
 			$myrow['DebtorName'] = $myrow['supp_name'];
 			$myrow['reference'] = $myrow['order_no'];
 			$rep->End($email, $doc_Order_no . " " . $myrow['reference'], $myrow);
-		}	
+		}
 	}
 	if ($email == 0)
 		$rep->End();