Cleanup comments. Small bugfixes. Final run

[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 290a3f2dffda99856f2627f5899207b20ed1c12b..1b0912d4b336e42e8c47b3d3234058ea3120e833 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -78,8 +78,7 @@ 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. This condition is removed after experience by Chaitanya
-                       $delivery_line->standard_cost = get_standard_cost($delivery_line->stock_id);
+               $delivery_line->standard_cost = get_standard_cost($delivery_line->stock_id);
 
                /* add delivery details for all lines */
                write_customer_trans_detail_item(ST_CUSTDELIVERY, $delivery_no, $delivery_line->stock_id,
@@ -94,14 +93,14 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                $delivery_line->qty_dispatched-$delivery_line->qty_old);
 
                if ($delivery_line->qty_dispatched != 0) {
-                       add_stock_move_customer(ST_CUSTDELIVERY, $delivery_line->stock_id, $delivery_no,
+                       add_stock_move(ST_CUSTDELIVERY, $delivery_line->stock_id, $delivery_no,
                                $delivery->Location, $delivery->document_date, $delivery->reference,
-                               -$delivery_line->qty_dispatched, $delivery_line->standard_cost,1,
-                               $line_price, $delivery_line->discount_percent);
+                               -$delivery_line->qty_dispatched, $delivery_line->standard_cost,
+                                $line_price*(1-$delivery_line->discount_percent));
 
                        $stock_gl_code = get_stock_gl_code($delivery_line->stock_id);
 
-                       // 2008-08-01. If there is a Customer Dimension, then override with this,
+                       // If there is a Customer Dimension, then override with this,
                        // else take the Item Dimension (if any)
                        $dim = ($delivery->dimension_id != $customer['dimension_id'] ? $delivery->dimension_id : 
                                ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
@@ -157,7 +156,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                $ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($delivery->customer_id), $delivery->document_date);
                    add_trans_tax_details(ST_CUSTDELIVERY, $delivery_no, $taxitem['tax_type_id'],
                                $taxitem['rate'], $delivery->tax_included, $taxitem['Value'],
-                               $taxitem['Net'], $ex_rate, $delivery->document_date, $delivery->reference );
+                               $taxitem['Net'], $ex_rate, $delivery->document_date, $delivery->reference, null);
                }
        }
 
@@ -166,8 +165,6 @@ function write_sales_delivery(&$delivery,$bo_policy)
        if ($trans_no == 0) {
                        $Refs->save(ST_CUSTDELIVERY, $delivery_no, $delivery->reference);
        }
-//_vd(get_gl(ST_CUSTDELIVERY, $delivery_no));
-//exit;
        hook_db_postwrite($delivery, ST_CUSTDELIVERY);
        commit_transaction();