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 b50d418aef579b5880b2637bb226d26062c97e99..11aa2f665c0cc57525320e3f8b87824c3d3a39b3 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -10,6 +10,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 
        begin_transaction();
 
+       $customer = get_customer($delivery->customer_id);
        $delivery_items_total = $delivery->get_items_total_dispatch();
        $freight_tax = $delivery->get_shipping_tax();
 
@@ -29,7 +30,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) {
@@ -37,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);
        }
 
@@ -49,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,
@@ -58,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) {
@@ -74,9 +79,13 @@ function write_sales_delivery(&$delivery,$bo_policy)
                        if ($delivery_line->standard_cost != 0) {
 
                                /*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"]);
+
                                add_gl_trans_std_cost(13, $delivery_no,
-                               $delivery->document_date, $stock_gl_code["cogs_account"],
-                                       $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], "",
+                                       $delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "",
                                        $delivery_line->standard_cost * $delivery_line->qty_dispatched,
                                        payment_person_types::customer(), $delivery->customer_id,
                                        "The cost of sales GL posting could not be inserted");
@@ -128,15 +137,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']);
                }
        }