Unable to void a sales invoice. Fixed by @BraaathWaate.

[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 5da5cc5632d4c4bc0acbe316bc1177da4395a97a..9d43fb3af94b8427c5cc9cb3d2da0f8e9ba81beb 100644 (file)
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -89,6 +89,8 @@ function delete_sales_order($order_no, $trans_type)
        begin_transaction();
        hook_db_prevoid($trans_type, $order_no);
 
+       $order = get_sales_order_header($order_no, $trans_type);
+       
        $sql = "DELETE FROM ".TB_PREF."sales_orders WHERE order_no=" . db_escape($order_no) 
                . " AND trans_type=".db_escape($trans_type);
 
@@ -98,7 +100,7 @@ function delete_sales_order($order_no, $trans_type)
                .db_escape($order_no) . " AND trans_type=".db_escape($trans_type);
        db_query($sql, "order Detail Delete");
 
-       add_audit_trail($trans_type, $order_no, Today(), _("Deleted."));
+       add_audit_trail($trans_type, $order_no, sql2date($order['ord_date']), _("Deleted."));
        commit_transaction();
 }
 
@@ -464,6 +466,10 @@ function get_branch_to_order($customer_id, $branch_id) {
 function get_sql_for_sales_orders_view($trans_type, $trans_no, $filter, 
        $stock_item='', $from='', $to='', $ref='', $location=ALL_TEXT, $customer_id=ALL_TEXT)
 {
+    if ($filter=='OutstandingOnly')
+        $order_value = 'Sum(line.unit_price*(line.quantity-line.qty_sent)*(1-line.discount_percent))+freight_cost';
+    else
+        $order_value = 'Sum(line.unit_price*line.quantity*(1-line.discount_percent))+freight_cost';
 
        $sql = "SELECT 
                        sorder.order_no,
@@ -476,7 +482,7 @@ function get_sql_for_sales_orders_view($trans_type, $trans_no, $filter,
                        ."sorder.ord_date,
                        sorder.delivery_date,
                        sorder.deliver_to,
-                       Sum(line.unit_price*line.quantity*(1-line.discount_percent))+freight_cost AS OrderValue,
+                       $order_value AS OrderValue,
                        sorder.type,
                        debtor.curr_code,
                        Sum(line.qty_sent) AS TotDelivered,
@@ -557,7 +563,8 @@ function get_sql_for_sales_orders_view($trans_type, $trans_no, $filter,
                                        sorder.branch_code,
                                        sorder.customer_ref,
                                        sorder.ord_date,
-                                       sorder.deliver_to";
+                                       sorder.deliver_to
+                               ORDER BY sorder.order_no DESC";
        return $sql;
 }
 
@@ -639,6 +646,6 @@ function last_sales_order_detail($order, $field)
 
         $last_query=db_query($sql, "Could not retrieve last order detail");
         $row = db_fetch_row($last_query);
-        return $row[0];
+        return $row == false ? false : $row[0];
 }