X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_order_db.inc;fp=sales%2Fincludes%2Fdb%2Fsales_order_db.inc;h=d144995d7a70881b1bfcdc25b1b5652942dd66f4;hp=3b146bf4ce7deae4b0ebbef39ee6800f421010ac;hb=80061be53f5f8d6415801e6e411a3891efc128c4;hpb=4e6c60dfc8ab630d72010941b00f65b9659fe0b3 diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc index 3b146bf4..d144995d 100644 --- a/sales/includes/db/sales_order_db.inc +++ b/sales/includes/db/sales_order_db.inc @@ -465,7 +465,7 @@ function get_branch_to_order($customer_id, $branch_id) { PrepaidOrders */ function get_sql_for_sales_orders_view($trans_type, $trans_no, $filter, - $stock_item='', $from='', $to='', $ref='', $location=ALL_TEXT, $customer_id=ALL_TEXT) + $stock_item='', $from='', $to='', $ref='', $location=ALL_TEXT, $customer_id=ALL_TEXT, $show_voided = 0) { if ($filter=='OutstandingOnly') $order_value = 'Sum(line.unit_price*(line.quantity-line.qty_sent)*(1-line.discount_percent))+freight_cost'; @@ -565,8 +565,10 @@ function get_sql_for_sales_orders_view($trans_type, $trans_no, $filter, sorder.branch_code, sorder.customer_ref, sorder.ord_date, - sorder.deliver_to - ORDER BY sorder.order_no DESC"; + sorder.deliver_to"; + if ($show_voided == 0) + $sql .= " HAVING OrderValue != 0"; + $sql .= " ORDER BY sorder.order_no DESC"; return $sql; }