X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_db.inc;h=0d80d1633fa245bf9cf2f748bd64ebdfde1dc35c;hb=9a1b3abd5371ad7f6315db1d56f8356587444314;hp=a2c302b6fe4021964070aa90c13832c66b312cdf;hpb=1b9351ae81a67726e757eba55895a4f059c7f128;p=fa-stable.git diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc index a2c302b6..0d80d163 100644 --- 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, $order_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); } @@ -379,4 +384,3 @@ function get_gl_wo_cost($woid, $cost_type) return $cost; } -?> \ No newline at end of file