Bug 5722: Canceled Sales Orders Show Up In Sales Order Inquiry. Fixed.

[fa-stable.git] / sales / includes / db / sales_order_db.inc

diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index 9d43fb3af94b8427c5cc9cb3d2da0f8e9ba81beb..d144995d7a70881b1bfcdc25b1b5652942dd66f4 100644 (file)
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -285,6 +285,7 @@ function get_sales_order_details($order_no, $trans_type) {
                                line.quantity,
                                discount_percent,
                                qty_sent as qty_done,
+                               item.long_description,
                                item.units,
                                item.mb_flag,
                                item.material_cost
@@ -464,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';
@@ -493,7 +494,8 @@ function get_sql_for_sales_orders_view($trans_type, $trans_no, $filter,
                        allocs.ord_payments,
                        inv.inv_payments,
                        sorder.total,
-                       sorder.trans_type
+                       sorder.trans_type,
+                       sorder.debtor_no
                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
@@ -563,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;
 }