Merged changes from stable branch up to 2.3.23.

[fa-stable.git] / manufacturing / includes / db / work_orders_db.inc

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index 12332c785e763ba1b39b9313beb5be49ddb0f264..3ed8126da9e2e80b703aa6546655de289dad7e48 100644 (file)
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -297,7 +297,7 @@ function void_work_order($woid)
        commit_transaction();
 }
 
-function get_sql_for_work_orders($outstanding_only, $stock_id, $location = ALL_TEXT, $order = '', $overdue = false)
+function get_sql_for_work_orders($outstanding_only, $stock_id, $location = ALL_TEXT, $oredr_no='', $order_ref = '', $overdue = false)
 {
        $sql = "SELECT
                workorder.id,
@@ -332,12 +332,17 @@ function get_sql_for_work_orders($outstanding_only, $stock_id, $location = ALL_T
                $sql .= " AND workorder.loc_code=".db_escape($location);
        }
 
-       if ($order != '')
+       if ($order_no != '')
        {
-               $sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$order.'%');
+               $sql .= " AND workorder.id LIKE ".db_escape('%'.$order_no.'%');
        }
 
-       if ($stock_id != '')
+       if ($order_ref != '')
+       {
+               $sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$order_ref.'%');
+       }
+
+       if ($stock_id != ALL_TEXT)
        {
                $sql .= " AND workorder.stock_id=".db_escape($stock_id);
        }