New tax system implementation.

[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 273de917756c42006b4f25c4f47be154f3b3084e..f1ae7a8acceeb5dfb0b78347776e4d1ada277e7a 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -70,21 +70,22 @@ function write_sales_delivery(&$delivery,$bo_policy)
        }
        foreach ($delivery->line_items as $line_no => $delivery_line) {
 
+               $qty = $delivery_line->qty_dispatched;
                $line_price = $delivery_line->line_price();
-               $line_taxfree_price = get_tax_free_price_for_item($delivery_line->stock_id,
-                       $delivery_line->price, 0, $delivery->tax_included,
+               $line_taxfree_price = get_tax_free_price_for_item(ST_CUSTDELIVERY, $delivery_line->stock_id,
+                       $delivery_line->price*$qty, $delivery->tax_group_id, $delivery->tax_included,
                        $delivery->tax_group_array);
 
-               $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;
+               $line_tax = get_full_price_for_item(ST_CUSTDELIVERY, $delivery_line->stock_id,
+                               $delivery_line->price * $qty, 0, $delivery->tax_included, $delivery->tax_group_array) - $line_taxfree_price;
 
-               $delivery_line->standard_cost = get_unit_cost($delivery_line->stock_id);
+               $delivery_line->unit_cost = get_unit_cost($delivery_line->stock_id);
 
                /* add delivery details for all lines */
                write_customer_trans_detail_item(ST_CUSTDELIVERY, $delivery_no, $delivery_line->stock_id,
                        $delivery_line->item_description, $delivery_line->qty_dispatched,
-                       $delivery_line->line_price(), $line_tax,
-                       $delivery_line->discount_percent, $delivery_line->standard_cost, $delivery_line->src_id,
+                       $delivery_line->line_price(), $qty ? $line_tax/$qty : 0,
+                       $delivery_line->discount_percent, $delivery_line->unit_cost, $delivery_line->src_id,
                        $trans_no ? $delivery_line->id : 0);
 
        // Now update sales_order_details for the quantity delivered
@@ -95,7 +96,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
                if ($delivery_line->qty_dispatched != 0) {
                        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,
+                               -$delivery_line->qty_dispatched, $delivery_line->unit_cost,
                                 $line_price*(1-$delivery_line->discount_percent));
 
                        $mb_flag = get_mb_flag($delivery_line->stock_id);
@@ -119,8 +120,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                $sales_account = ($branch_data['sales_account'] != "" ? $branch_data['sales_account'] : $stock_gl_code['sales_account']);
 
                                $total += add_gl_trans_customer(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $sales_account, $dim, $dim2,
-                                       -$line_taxfree_price*$delivery_line->qty_dispatched, // FIXME - calculation order should be exactly like in invoice to minimalize roundings
-                                       $delivery->customer_id, "The sales price GL posting could not be inserted");
+                                       -$line_taxfree_price, $delivery->customer_id, "The sales price GL posting could not be inserted");
                        }
                        /* insert gl_trans to credit stock and debit cost of sales at standard cost*/
                        
@@ -128,7 +128,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                // Fixed Assets
                                if ($delivery->fixed_asset) {
                                    $fa_purchase_cost = get_purchase_cost($delivery_line->stock_id);
-                                       $fa_depreciation = $fa_purchase_cost - $delivery_line->standard_cost;
+                                       $fa_depreciation = $fa_purchase_cost - $delivery_line->unit_cost;
                                        /*first remove depreciation*/
                                        add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no,
                                                $delivery->document_date, $stock_gl_code["adjustment_account"], $dim, $dim2, "",
@@ -143,24 +143,24 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                                "The stock side of the cost of sales GL posting could not be inserted");
                                        /*finally adjust sales account with the remaining*/
                                        add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
-                                               $stock_gl_code["sales_account"], 0, 0, "",
+                                               $stock_gl_code["cogs_account"], 0, 0, "",
                                                ($fa_purchase_cost - $fa_depreciation),
                                                PT_CUSTOMER, $delivery->customer_id,
                                                "The stock side of the cost of sales GL posting could not be inserted");
                                }
                                // Invetory Items
-                               else if ($delivery_line->standard_cost != 0) {
+                               else if ($delivery_line->unit_cost != 0) {
                                        /*first the cost of sales entry*/
                                        add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no,
                                                $delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "",
-                                               $delivery_line->standard_cost * $delivery_line->qty_dispatched,
+                                               $delivery_line->unit_cost * $delivery_line->qty_dispatched,
                                                PT_CUSTOMER, $delivery->customer_id,
                                                "The cost of sales GL posting could not be inserted");
 
                                        /*now the stock entry*/
                                        add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
                                                $stock_gl_code["inventory_account"], 0, 0, "",
-                                               (-$delivery_line->standard_cost * $delivery_line->qty_dispatched),
+                                               (-$delivery_line->unit_cost * $delivery_line->qty_dispatched),
                                                PT_CUSTOMER, $delivery->customer_id,
                                                "The stock side of the cost of sales GL posting could not be inserted");
                                }                               
@@ -188,7 +188,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, null);
+                               $taxitem['Net'], $ex_rate, $delivery->document_date, $delivery->reference, null, $delivery->tax_group_id);
                }
        }