X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep204.php;h=61034d3516ac1e86d3d20df493cc8c3f5f2eb04e;hb=4d3a86a9286de3f4d5552ad2aa237a91df6aa689;hp=120bbbc0615c9f28de30e7d5113414ffcb7d06ff;hpb=f50187b9c3095886d7fd847f635cd8763109a75e;p=fa-stable.git

diff --git a/reporting/rep204.php b/reporting/rep204.php
index 120bbbc0..61034d35 100644
--- a/reporting/rep204.php
+++ b/reporting/rep204.php
@@ -9,7 +9,7 @@
     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 = 'SA_SUPPLIERANALYTIC';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
@@ -25,7 +25,6 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_outstanding_GRN();
 
 function getTransactions($fromsupp)
@@ -49,8 +48,9 @@ function getTransactions($fromsupp)
 		AND ".TB_PREF."grn_batch.id = ".TB_PREF."grn_items.grn_batch_id
 		AND ".TB_PREF."grn_items.po_detail_item = ".TB_PREF."purch_order_details.po_detail_item
 		AND qty_recd-quantity_inv <>0 ";
-	if ($fromsupp != reserved_words::get_all_numeric())
-		$sql .= "AND ".TB_PREF."grn_batch.supplier_id ='" . $fromsupp . "' ";
+
+	if ($fromsupp != ALL_NUMERIC)
+		$sql .= "AND ".TB_PREF."grn_batch.supplier_id =".db_escape($fromsupp)." ";
 	$sql .= "ORDER BY ".TB_PREF."grn_batch.supplier_id,
 			".TB_PREF."grn_batch.id";
 
@@ -67,17 +67,11 @@ function print_outstanding_GRN()
     $comments = $_POST['PARAM_1'];
 	$destination = $_POST['PARAM_2'];
 	if ($destination)
-	{
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
-		$filename = "OutstandingGRN.xml";
-	}	
 	else
-	{
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-		$filename = "OutstandingGRN.pdf";
-	}
 
-	if ($fromsupp == reserved_words::get_all_numeric())
+	if ($fromsupp == ALL_NUMERIC)
 		$from = _('All');
 	else
 		$from = get_supplier_name($fromsupp);
@@ -86,18 +80,18 @@ function print_outstanding_GRN()
 	$cols = array(0, 40, 80, 190,	250, 320, 385, 450,	515);
 
 	$headers = array(_('GRN'), _('Order'), _('Item') . '/' . _('Description'), _('Qty Recd'), _('qty Inv'), _('Balance'),
-		_('Std Cost'), _('Value'));
+		_('Act Price'), _('Value'));
 
 	$aligns = array('left',	'left',	'left',	'right', 'right', 'right', 'right', 'right');
 
     $params =   array( 	0 => $comments,
     				    1 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''));
 
-    $rep = new FrontReport(_('Outstanding GRNs Report'), $filename, user_pagesize());
+    $rep = new FrontReport(_('Outstanding GRNs Report'), "OutstandingGRN", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
 	$Tot_Val=0;
 	$Supplier = '';
@@ -128,9 +122,9 @@ function print_outstanding_GRN()
 		$rep->AmountCol(3, 4, $GRNs['qty_recd'], $dec2);
 		$rep->AmountCol(4, 5, $GRNs['quantity_inv'], $dec2);
 		$QtyOstg = $GRNs['qty_recd'] - $GRNs['quantity_inv'];
-		$Value = ($GRNs['qty_recd'] - $GRNs['quantity_inv']) * $GRNs['std_cost_unit'];
+		$Value = ($GRNs['qty_recd'] - $GRNs['quantity_inv']) * $GRNs['act_price'];
 		$rep->AmountCol(5, 6, $QtyOstg, $dec2);
-		$rep->AmountCol(6, 7, $GRNs['std_cost_unit'], $dec);
+		$rep->AmountCol(6, 7, $GRNs['act_price'], $dec);
 		$rep->AmountCol(7, 8, $Value, $dec);
 		$Tot_Val += $Value;
 		$SuppTot_Val += $Value;