[0005214] Stock Check Sheet: changed option name to less confusing for shortages...

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

diff --git a/reporting/rep401.php b/reporting/rep401.php
index 3c8fed88b1ecb407a4c5df9e364262a546a49b27..ddb9692fba1defb90c51b204d8a5b5cd1a6a85fb 100644 (file)
--- a/reporting/rep401.php
+++ b/reporting/rep401.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+$page_security = 'SA_BOMREP';
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
 // Creator:    Joe Hunt
@@ -26,26 +26,25 @@ include_once($path_to_root . "/inventory/includes/db/items_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_bill_of_material();
 
 function getTransactions($from, $to)
 {
-       $sql = "SELECT ".TB_PREF."bom.parent,
-                       ".TB_PREF."bom.component,
-                       ".TB_PREF."stock_master.description as CompDescription,
-                       ".TB_PREF."bom.quantity,
-                       ".TB_PREF."bom.loc_code,
-                       ".TB_PREF."bom.workcentre_added
-               FROM
-                       ".TB_PREF."stock_master,
-                       ".TB_PREF."bom
-               WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.component
-               AND ".TB_PREF."bom.parent >= '$from'
-               AND ".TB_PREF."bom.parent <= '$to'
+       $sql = "SELECT bom.parent,
+                       bom.component,
+                       item.description as CompDescription,
+                       bom.quantity,
+                       bom.loc_code,
+                       bom.workcentre_added
+               FROM "
+                       .TB_PREF."stock_master item,"
+                       .TB_PREF."bom bom
+               WHERE item.stock_id=bom.component
+               AND bom.parent >= ".db_escape($from)."
+               AND bom.parent <= ".db_escape($to)."
                ORDER BY
-                       ".TB_PREF."bom.parent,
-                       ".TB_PREF."bom.component";
+                       bom.parent,
+                       bom.component";
 
     return db_query($sql,"No transactions were returned");
 }
@@ -59,18 +58,14 @@ function print_bill_of_material()
     $frompart = $_POST['PARAM_0'];
     $topart = $_POST['PARAM_1'];
     $comments = $_POST['PARAM_2'];
-       $destination = $_POST['PARAM_3'];
+       $orientation = $_POST['PARAM_3'];
+       $destination = $_POST['PARAM_4'];
        if ($destination)
-       {
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
-               $filename = "BillOfMaterial.xml";
-       }       
        else
-       {
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-               $filename = "BillOfMaterial.pdf";
-       }
 
+       $orientation = ($orientation ? 'L' : 'P');
        $cols = array(0, 50, 305, 375, 445,     515);
 
        $headers = array(_('Component'), _('Description'), _('Loc'), _('Wrk Ctr'), _('Quantity'));
@@ -80,11 +75,13 @@ function print_bill_of_material()
     $params =   array(         0 => $comments,
                                    1 => array('text' => _('Component'), 'from' => $frompart, 'to' => $topart));
 
-    $rep = new FrontReport(_('Bill of Material Listing'), $filename, user_pagesize());
+    $rep = new FrontReport(_('Bill of Material Listing'), "BillOfMaterial", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
        $res = getTransactions($frompart, $topart);
        $parent = '';
@@ -108,8 +105,6 @@ function print_bill_of_material()
                $dec = get_qty_dec($trans['component']);
                $rep->TextCol(0, 1, $trans['component']);
                $rep->TextCol(1, 2, $trans['CompDescription']);
-               //$rep->TextCol(2, 3, $trans['loc_code']);
-               //$rep->TextCol(3, 4, $trans['workcentre_added']);
                $wc = get_work_centre($trans['workcentre_added']);
                $rep->TextCol(2, 3, get_location_name($trans['loc_code']));
                $rep->TextCol(3, 4, $wc['name']);
@@ -120,4 +115,3 @@ function print_bill_of_material()
     $rep->End();
 }
 
-?>
\ No newline at end of file