Merged changes from main CVS up to 2.1.5

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

diff --git a/reporting/rep401.php b/reporting/rep401.php
index 7db56ed35ba8b31591b717cd8bfa6e0b44e62a33..8ae240e353ddcd682b970db7a3d7887b791281fb 100644 (file)
--- a/reporting/rep401.php
+++ b/reporting/rep401.php
@@ -26,7 +26,6 @@ include_once($path_to_root . "/inventory/includes/db/items_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_bill_of_material();
 
 function getTransactions($from, $to)
@@ -56,11 +55,14 @@ function print_bill_of_material()
 {
     global $path_to_root;
 
-    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
     $frompart = $_POST['PARAM_0'];
     $topart = $_POST['PARAM_1'];
     $comments = $_POST['PARAM_2'];
+       $destination = $_POST['PARAM_3'];
+       if ($destination)
+               include_once($path_to_root . "/reporting/includes/excel_report.inc");
+       else
+               include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
        $cols = array(0, 50, 305, 375, 445,     515);
 
@@ -71,7 +73,7 @@ function print_bill_of_material()
     $params =   array(         0 => $comments,
                                    1 => array('text' => _('Component'), 'from' => $frompart, 'to' => $topart));
 
-    $rep = new FrontReport(_('Bill of Material Listing'), "BillOfMaterial.pdf", user_pagesize());
+    $rep = new FrontReport(_('Bill of Material Listing'), "BillOfMaterial", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -104,9 +106,10 @@ function print_bill_of_material()
                $wc = get_work_centre($trans['workcentre_added']);
                $rep->TextCol(2, 3, get_location_name($trans['loc_code']));
                $rep->TextCol(3, 4, $wc['name']);
-               $rep->TextCol(4, 5, number_format2($trans['quantity'], $dec));
+               $rep->AmountCol(4, 5, $trans['quantity'], $dec);
        }
        $rep->Line($rep->row - 4);
+       $rep->NewLine();
     $rep->End();
 }