X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep209.php;h=785420c9218cd7223133f931bf517b139942c0b8;hb=2916061723b7db16539237b22abf487066cfbf36;hp=6639d7c4a67f8481fa7f2ea01ad99a2c469afce7;hpb=f7c756dac5a70f01550b1fceb99c6858e232faf2;p=fa-stable.git

diff --git a/reporting/rep209.php b/reporting/rep209.php
index 6639d7c4..785420c9 100644
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -1,15 +1,17 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+
+$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
+	'SA_SUPPTRANSVIEW' : 'SA_SUPPBULKREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
@@ -24,7 +26,6 @@ include_once($path_to_root . "/includes/data_checks.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_po();
 
 //----------------------------------------------------------------------------------------------------
@@ -32,7 +33,7 @@ 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.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."locations.location_name,
-   		".TB_PREF."suppliers.email, ".TB_PREF."suppliers.address
+   		".TB_PREF."suppliers.email, ".TB_PREF."suppliers.address, ".TB_PREF."suppliers.contact
 		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
@@ -61,9 +62,8 @@ function print_po()
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
 	$currency = $_POST['PARAM_2'];
-	$bankaccount = $_POST['PARAM_3'];
-	$email = $_POST['PARAM_4'];
-	$comments = $_POST['PARAM_5'];
+	$email = $_POST['PARAM_3'];
+	$comments = $_POST['PARAM_4'];
 
 	if ($from == null)
 		$from = 0;
@@ -76,15 +76,13 @@ function print_po()
 	// $headers in doctext.inc
 	$aligns = array('left',	'left',	'left', 'right', 'left', 'right', 'right');
 
-	$params = array('comments' => $comments,
-					'bankaccount' => $bankaccount);
+	$params = array('comments' => $comments);
 
-	$baccount = get_bank_account($params['bankaccount']);
 	$cur = get_company_Pref('curr_default');
 
 	if ($email == 0)
 	{
-		$rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk.pdf", user_pagesize());
+		$rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk", user_pagesize());
 		$rep->currency = $cur;
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
@@ -93,6 +91,8 @@ function print_po()
 	for ($i = $from; $i <= $to; $i++)
 	{
 		$myrow = get_po($i);
+		$baccount = get_default_bank_account($myrow['curr_code']);
+		$params['bankaccount'] = $baccount['id'];
 
 		if ($email == 1)
 		{
@@ -120,14 +120,14 @@ function print_po()
 					$myrow2['units'] = $data['suppliers_uom'];
 				if ($data['conversion_factor'] != 1)
 				{
-					$myrow2['unit_price'] = round($myrow2['unit_price'] / $data['conversion_factor'], user_price_dec());
-					$myrow2['quantiry_ordered'] = round($myrow2['quantiry_ordered'] / $data['conversion_factor'], user_qty_dec());
+					$myrow2['unit_price'] = round2($myrow2['unit_price'] * $data['conversion_factor'], user_price_dec());
+					$myrow2['quantity_ordered'] = round2($myrow2['quantity_ordered'] / $data['conversion_factor'], user_qty_dec());
 				}
 			}	
-			$Net = round2(($myrow2["unit_price"] * $myrow2["quantity_ordered"]),
-			  user_price_dec());
+			$Net = round2(($myrow2["unit_price"] * $myrow2["quantity_ordered"]), user_price_dec());
 			$SubTotal += $Net;
-			$DisplayPrice = number_format2($myrow2["unit_price"],$dec);
+			$dec2 = 0;
+			$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);
@@ -172,6 +172,7 @@ function print_po()
 		{
 			$myrow['contact_email'] = $myrow['email'];
 			$myrow['DebtorName'] = $myrow['supp_name'];
+			if ($myrow['contact'] != '') $myrow['DebtorName'] = $myrow['contact'];
 			$myrow['reference'] = $myrow['order_no'];
 			$rep->End($email, $doc_Order_no . " " . $myrow['reference'], $myrow);
 		}