Merged changes in main trunk up to 2.0.6 (see CHANGELOG)

[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..2c80d46e89d3c67dbec454b093acc4c324d3297b 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -31,13 +31,14 @@ function write_sales_delivery(&$delivery,$bo_policy)
                $delivery->freight_cost,
                $delivery->tax_included ? 0 : $freight_tax,
                $delivery->sales_type, $delivery->order_no, 0,
-               $delivery->ship_via, $delivery->due_date);
+               $delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id, $delivery->dimension2_id);
 
        if ($trans_no == 0) {
                $delivery->trans_no = array($delivery_no=>0);
        } 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) {
@@ -77,8 +81,10 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                /*first the cost of sales entry*/
                                // 2008-08-01. If there is a Customer Dimension, then override with this,
                                // else take the Item Dimension (if any)
-                               $dim = ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]);
-                               $dim2 = ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]);
+                               $dim = ($delivery->dimension_id != $customer['dimension_id'] ? $delivery->dimension_id : 
+                                       ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
+                               $dim2 = ($delivery->dimension2_id != $customer['dimension2_id'] ? $delivery->dimension2_id : 
+                                       ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
 
                                add_gl_trans_std_cost(13, $delivery_no,
                                        $delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "",