X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep209.php;h=55153ee09ecf94dc2e9e07c16303c5fbf09192e4;hb=508b54ee5cef13ac64f1532dfedfb7b242aa9077;hp=9015a1b2564b35525de8bca02450a0f504e00788;hpb=e29ab37ef51f39c200c3772e07eeceef0ce39214;p=fa-stable.git

diff --git a/reporting/rep209.php b/reporting/rep209.php
index 9015a1b2..55153ee0 100644
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -9,7 +9,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     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
@@ -60,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;
@@ -75,10 +76,8 @@ 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)
@@ -92,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)
 		{
@@ -104,7 +105,7 @@ function print_po()
 		}
 		else
 			$rep->title = _('PURCHASE ORDER');
-		$rep->Header2($myrow, null, $myrow, $baccount, 8);
+		$rep->Header2($myrow, null, $myrow, $baccount, ST_PURCHORDER);
 
 		$result = get_po_details($i);
 		$SubTotal = 0;
@@ -138,7 +139,7 @@ function print_po()
 			$rep->TextCol(6, 7,	$DisplayNet, -2);
 			$rep->NewLine(1);
 			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-				$rep->Header2($myrow, $branch, $myrow, $baccount, 8);
+				$rep->Header2($myrow, $branch, $myrow, $baccount, ST_PURCHORDER);
 		}
 		if ($myrow['comments'] != "")
 		{
@@ -149,7 +150,7 @@ function print_po()
 
 		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 		$linetype = true;
-		$doctype = 8;
+		$doctype = ST_PURCHORDER;
 		if ($rep->currency != $myrow['curr_code'])
 		{
 			include($path_to_root . "/reporting/includes/doctext2.inc");
@@ -166,13 +167,20 @@ function print_po()
 		$rep->Font('bold');
 		$rep->TextCol(3, 6, $doc_TOTAL_PO, - 2);
 		$rep->TextCol(6, 7,	$DisplayTotal, -2);
+		$words = price_in_words($SubTotal, ST_PURCHORDER);
+		if ($words != "")
+		{
+			$rep->NewLine(1);
+			$rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
+		}	
 		$rep->Font();
 		if ($email == 1)
 		{
 			$myrow['contact_email'] = $myrow['email'];
 			$myrow['DebtorName'] = $myrow['supp_name'];
 			if ($myrow['contact'] != '') $myrow['DebtorName'] = $myrow['contact'];
-			$myrow['reference'] = $myrow['order_no'];
+			if ($myrow['reference'] == "")
+				$myrow['reference'] = $myrow['order_no'];
 			$rep->End($email, $doc_Order_no . " " . $myrow['reference'], $myrow);
 		}
 	}