Global fixes in SQL queries aimed to make them more readible and easier for maintence.

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

diff --git a/reporting/rep401.php b/reporting/rep401.php
index 0471486b577d68f7bbdbb132fa10e4b5c20098af..faab857a5f948c70e57ee816d88405f5929c139f 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");
 }
@@ -117,4 +117,3 @@ function print_bill_of_material()
     $rep->End();
 }
 
-?>
\ No newline at end of file