PrepaidOrders
*/
function get_sql_for_sales_orders_view($trans_type, $trans_no, $filter,
- $stock_item=null, $from='', $to='', $ref='', $location='', $customer_id=ALL_TEXT)
+ $stock_item='', $from='', $to='', $ref='', $location=ALL_TEXT, $customer_id=ALL_TEXT)
{
$sql = "SELECT
prep_amount,
allocs.ord_payments,
inv.inv_payments,
- sorder.total
+ sorder.total,
+ sorder.trans_type
FROM ".TB_PREF."sales_orders as sorder
LEFT JOIN (SELECT trans_no_to, sum(amt) ord_payments FROM ".TB_PREF."cust_allocations WHERE trans_type_to=".ST_SALESORDER." GROUP BY trans_no_to)
allocs ON sorder.trans_type=".ST_SALESORDER." AND allocs.trans_no_to=sorder.order_no
elseif ($ref != "")
{
// search orders with reference like
- $number_like = "%".$ref."%";
- $sql .= " AND sorder.reference LIKE ".db_escape($number_like);
+ $sql .= " AND sorder.reference LIKE ".db_escape('%' . $ref . '%');
// ." GROUP BY sorder.order_no";
}
else // ... or select inquiry constraints
//if ($selected_customer != -1)
// $sql .= " AND sorder.debtor_no=".db_escape($selected_customer);
- if (isset($stock_item))
+ if ($stock_item != ALL_TEXT)
$sql .= " AND line.stk_code=".db_escape($stock_item);
- if ($location)
+ if ($location != ALL_TEXT)
$sql .= " AND sorder.from_stk_loc = ".db_escape($location);
if ($filter=='OutstandingOnly')