Feature 5388: Print Invoices (documents) list gets too long. Fixed by default 180...

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

diff --git a/reporting/rep401.php b/reporting/rep401.php
index a65f35e9190640eeafddfd390ceb9027cfe7eaa5..ddb9692fba1defb90c51b204d8a5b5cd1a6a85fb 100644 (file)
--- a/reporting/rep401.php
+++ b/reporting/rep401.php
@@ -30,21 +30,21 @@ 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 >= ".db_escape($from)."
-               AND ".TB_PREF."bom.parent <= ".db_escape($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");
 }
@@ -77,7 +77,7 @@ function print_bill_of_material()
 
     $rep = new FrontReport(_('Bill of Material Listing'), "BillOfMaterial", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
-       $rep->recalculate_cols($cols);
+       recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -105,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']);
@@ -117,4 +115,3 @@ function print_bill_of_material()
     $rep->End();
 }
 
-?>
\ No newline at end of file