Two smaller bugs [0000023],[0000026]

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

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index b50d418aef579b5880b2637bb226d26062c97e99..c216a572c6ff50a86aebb001807314b8e8655939 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -29,7 +29,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
                $delivery->tax_included ? 0 : $tax_total-$freight_tax,
                $delivery->freight_cost,
                $delivery->tax_included ? 0 : $freight_tax,
-               $delivery->default_sales_type, $delivery->order_no, 0,
+               $delivery->sales_type, $delivery->order_no, 0,
                $delivery->ship_via, $delivery->due_date);
 
        if ($trans_no == 0) {
@@ -128,15 +128,16 @@ function void_sales_delivery($type, $type_no)
 
        void_gl_trans($type, $type_no, true);
 
-       // for invoices and credits related to invoices,
        // reverse all the changes in the sales order
        $items_result = get_customer_trans_details($type, $type_no);
 
        $order = get_customer_trans_order($type, $type_no);
 
        if ($order) {
+               $order_items = get_sales_order_details($order);
                while ($row = db_fetch($items_result)) {
-                       update_parent_line(13, $row['id'], -$row['quantity']);
+                       $order_line = db_fetch($order_items);
+                       update_parent_line(13, $order_line['id'], -$row['quantity']);
                }
        }