Merged bugfixes upto [0000072] (version 2.0.3).

[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 7c24cb12a8adb359e85d126b787f3f004b68c9ce..11aa2f665c0cc57525320e3f8b87824c3d3a39b3 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -38,6 +38,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
        } else {
                void_gl_trans(13, $delivery_no, true);
                void_stock_move(13, $delivery_no);
+               void_customer_trans_tax_details(13, $delivery_no);
                delete_comments(13, $delivery_no);
        }
 
@@ -50,6 +51,9 @@ function write_sales_delivery(&$delivery,$bo_policy)
                $line_tax = get_full_price_for_item($delivery_line->stock_id, $delivery_line->price,
                        0, $delivery->tax_included, $delivery->tax_group_array) - $line_taxfree_price;
 
+               if ($trans_no != 0) // Inserted 2008-09-25 Joe Hunt
+                       $delivery_line->standard_cost = get_standard_cost($delivery_line->stock_id);
+
                /* add delivery details for all lines */
                write_customer_trans_detail_item(13, $delivery_no, $delivery_line->stock_id,
                        $delivery_line->item_description, $delivery_line->qty_dispatched,
@@ -59,7 +63,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 
        // Now update sales_order_details for the quantity delivered
                if ($delivery_line->qty_old != $delivery_line->qty_dispatched)
-                       update_parent_line(13, $delivery_line->id,
+                       update_parent_line(13, $delivery_line->src_id,
                                $delivery_line->qty_dispatched-$delivery_line->qty_old);
 
                if ($delivery_line->qty_dispatched != 0) {