Preparation for Excel Writer continued

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

diff --git a/reporting/rep303.php b/reporting/rep303.php
index 285dd7269ca768b43adc448e867975fc546ff4ac..302051f19f8dc1afbc079f853d0dc3db4d01d138 100644 (file)
--- a/reporting/rep303.php
+++ b/reporting/rep303.php
@@ -107,13 +107,22 @@ function print_stock_check()
 {
     global $comp_path, $path_to_root, $pic_height, $pic_width;
 
-    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
     $category = $_POST['PARAM_0'];
     $location = $_POST['PARAM_1'];
     $pictures = $_POST['PARAM_2'];
     $check    = $_POST['PARAM_3'];
     $comments = $_POST['PARAM_4'];
+       $destination = $_POST['PARAM_5'];
+       if ($destination)
+       {
+               include_once($path_to_root . "/reporting/includes/excel_report.inc");
+               $filename = "StockCheckSheet.xml";
+       }       
+       else
+       {
+               include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+               $filename = "StockCheckSheet.pdf";
+       }
 
        if ($category == reserved_words::get_all_numeric())
                $category = 0;
@@ -152,7 +161,7 @@ function print_stock_check()
        else
                $user_comp = "";
 
-    $rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet.pdf", user_pagesize());
+    $rep = new FrontReport(_('Stock Check Sheets'), $filename, user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -184,17 +193,17 @@ function print_stock_check()
                $dec = get_qty_dec($trans['stock_id']);
                $rep->TextCol(0, 1, $trans['stock_id']);
                $rep->TextCol(1, 2, $trans['description']);
-               $rep->TextCol(2, 3, number_format2($trans['QtyOnHand'], $dec));
+               $rep->AmountCol(2, 3, $trans['QtyOnHand'], $dec);
                if ($check)
                {
                        $rep->TextCol(3, 4, "_________");
-                       $rep->TextCol(4, 5, number_format2($demandqty, $dec));
-                       $rep->TextCol(5, 6, number_format2($trans['QtyOnHand'] - $demandqty, $dec));
+                       $rep->AmountCol(4, 5, $demandqty, $dec);
+                       $rep->AmountCol(5, 6, $trans['QtyOnHand'] - $demandqty, $dec);
                }
                else
                {
-                       $rep->TextCol(3, 4, number_format2($demandqty, $dec));
-                       $rep->TextCol(4, 5, number_format2($trans['QtyOnHand'] - $demandqty, $dec));
+                       $rep->AmountCol(3, 4, $demandqty, $dec);
+                       $rep->AmountCol(4, 5, $trans['QtyOnHand'] - $demandqty, $dec);
                }
                if ($pictures)
                {
@@ -211,6 +220,7 @@ function print_stock_check()
                }
        }
        $rep->Line($rep->row - 4);
+       $rep->NewLine();
     $rep->End();
 }