Merged changes from main CVS up to 2.1.5

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

diff --git a/reporting/rep301.php b/reporting/rep301.php
index 96424ec31ce02371ecda73890e1bb7f0efa54304..2b18d24b2cc477ee0d8068fe610cd932c28e5d88 100644 (file)
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -26,7 +26,6 @@ include_once($path_to_root . "/inventory/includes/db/items_category_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_inventory_valuation_report();
 
 function getTransactions($category, $location)
@@ -74,15 +73,9 @@ function print_inventory_valuation_report()
     $comments = $_POST['PARAM_3'];
        $destination = $_POST['PARAM_4'];
        if ($destination)
-       {
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
-               $filename = "InventoryValReport.xml";
-       }       
        else
-       {
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-               $filename = "InventoryValReport.pdf";
-       }
 
     $dec = user_price_dec();
 
@@ -110,7 +103,7 @@ function print_inventory_valuation_report()
                                    1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''),
                                    2 => array('text' => _('Location'), 'from' => $loc, 'to' => ''));
 
-    $rep = new FrontReport(_('Inventory Valuation Report'), $filename, user_pagesize());
+    $rep = new FrontReport(_('Inventory Valuation Report'), "InventoryValReport", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);