X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep204.php;h=c0efd03486be42fd19ed6a4554ebd22b163e835d;hb=ad96cd0abbfd826592b851b8e0cb6d89e450fdf4;hp=6f63e3b62b07a34279070e63b62d48c277050628;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/reporting/rep204.php b/reporting/rep204.php
index 6f63e3b6..c0efd034 100644
--- a/reporting/rep204.php
+++ b/reporting/rep204.php
@@ -25,7 +25,6 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_outstanding_GRN();
 
 function getTransactions($fromsupp)
@@ -63,10 +62,13 @@ function print_outstanding_GRN()
 {
     global $path_to_root;
 
-    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
     $fromsupp = $_POST['PARAM_0'];
     $comments = $_POST['PARAM_1'];
+	$destination = $_POST['PARAM_2'];
+	if ($destination)
+		include_once($path_to_root . "/reporting/includes/excel_report.inc");
+	else
+		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
 	if ($fromsupp == reserved_words::get_all_numeric())
 		$from = _('All');
@@ -84,7 +86,7 @@ function print_outstanding_GRN()
     $params =   array( 	0 => $comments,
     				    1 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''));
 
-    $rep = new FrontReport(_('Outstanding GRNs Report'), "OutstandingGRN.pdf", user_pagesize());
+    $rep = new FrontReport(_('Outstanding GRNs Report'), "OutstandingGRN", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -104,7 +106,7 @@ function print_outstanding_GRN()
 			{
 				$rep->NewLine(2);
 				$rep->TextCol(0, 7, _('Total'));
-				$rep->TextCol(7, 8, number_format2($SuppTot_Val, $dec));
+				$rep->AmountCol(7, 8, $SuppTot_Val, $dec);
 				$rep->Line($rep->row - 2);
 				$rep->NewLine(3);
 				$SuppTot_Val = 0;
@@ -116,13 +118,13 @@ function print_outstanding_GRN()
 		$rep->TextCol(0, 1, $GRNs['id']);
 		$rep->TextCol(1, 2, $GRNs['order_no']);
 		$rep->TextCol(2, 3, $GRNs['item_code'] . '-' . $GRNs['description']);
-		$rep->TextCol(3, 4, number_format2($GRNs['qty_recd'], $dec2));
-		$rep->TextCol(4, 5, number_format2($GRNs['quantity_inv'], $dec2));
+		$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'];
-		$rep->TextCol(5, 6, number_format2($QtyOstg, $dec2));
-		$rep->TextCol(6, 7, number_format2($GRNs['std_cost_unit'], $dec));
-		$rep->TextCol(7, 8, number_format2($Value, $dec));
+		$rep->AmountCol(5, 6, $QtyOstg, $dec2);
+		$rep->AmountCol(6, 7, $GRNs['std_cost_unit'], $dec);
+		$rep->AmountCol(7, 8, $Value, $dec);
 		$Tot_Val += $Value;
 		$SuppTot_Val += $Value;
 
@@ -132,15 +134,16 @@ function print_outstanding_GRN()
 	{
 		$rep->NewLine();
 		$rep->TextCol(0, 7, _('Total'));
-		$rep->TextCol(7, 8, number_format2($SuppTot_Val, $dec));
+		$rep->AmountCol(7, 8, $SuppTot_Val, $dec);
 		$rep->Line($rep->row - 2);
 		$rep->NewLine(3);
 		$SuppTot_Val = 0;
 	}
 	$rep->NewLine(2);
 	$rep->TextCol(0, 7, _('Grand Total'));
-	$rep->TextCol(7, 8, number_format2($Tot_Val, $dec));
+	$rep->AmountCol(7, 8, $Tot_Val, $dec);
 	$rep->Line($rep->row - 2);
+	$rep->NewLine();
     $rep->End();
 }