Preparation for Excel Writer continued

[fa-stable.git] / reporting / rep204.php

diff --git a/reporting/rep204.php b/reporting/rep204.php
index 6f63e3b62b07a34279070e63b62d48c277050628..120bbbc0615c9f28de30e7d5113414ffcb7d06ff 100644 (file)
--- a/reporting/rep204.php
+++ b/reporting/rep204.php
@@ -63,10 +63,19 @@ 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");
+               $filename = "OutstandingGRN.xml";
+       }       
+       else
+       {
+               include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+               $filename = "OutstandingGRN.pdf";
+       }
 
        if ($fromsupp == reserved_words::get_all_numeric())
                $from = _('All');
@@ -84,7 +93,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'), $filename, user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -104,7 +113,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 +125,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 +141,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();
 }