Overhead and labour cost changed to define standard costs.

[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 9c378f77fb8617d4e17512cde51b046fc51e6ae6..3f8ffc87dad5e50342e4e3185c11fb762e19f615 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -24,6 +24,9 @@ function write_sales_delivery(&$delivery,$bo_policy)
        hook_db_prewrite($delivery, ST_CUSTDELIVERY);
 
        $customer = get_customer($delivery->customer_id);
+
+       add_new_exchange_rate($customer['curr_code'], $delivery->document_date, $delivery->ex_rate);
+
        $delivery_items_total = $delivery->get_items_total_dispatch();
        $freight_tax = $delivery->get_shipping_tax();
 
@@ -51,12 +54,14 @@ function write_sales_delivery(&$delivery,$bo_policy)
        if ($trans_no == 0) {
                $delivery->trans_no = array($delivery_no=>0);
        } else {
+               move_trans_attachments(ST_CUSTDELIVERY, $trans_no, $delivery_no);
                void_gl_trans(ST_CUSTDELIVERY, $delivery_no, true);
                void_stock_move(ST_CUSTDELIVERY, $delivery_no);
                void_trans_tax_details(ST_CUSTDELIVERY, $delivery_no);
                delete_comments(ST_CUSTDELIVERY, $delivery_no);
        }
 
+
        // for prepaid delivery repost income from deffered account
        if ($delivery->is_prepaid())
        {
@@ -73,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_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,
@@ -89,14 +93,22 @@ 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));
+
+                       $mb_flag = get_mb_flag($delivery_line->stock_id);
+
+                       if (is_fixed_asset($mb_flag)) {
+                               $sql = "UPDATE ".TB_PREF."stock_master SET inactive=1
+                                       WHERE stock_id=".db_escape($delivery_line->stock_id);
+                               db_query($sql,"The cost details for the fixed asset could not be updated");
+                       }
 
                        $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"]));
@@ -115,8 +127,12 @@ function write_sales_delivery(&$delivery,$bo_policy)
 
                                /*first the cost of sales entry*/
 
+                               $delivery_gl_code = $stock_gl_code["cogs_account"];
+                               if ($delivery->fixed_asset)
+                                       $delivery_gl_code = $stock_gl_code["adjustment_account"];
+
                                add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no,
-                                       $delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "",
+                                       $delivery->document_date, $delivery_gl_code, $dim, $dim2, "",
                                        $delivery_line->standard_cost * $delivery_line->qty_dispatched,
                                        PT_CUSTOMER, $delivery->customer_id,
                                        "The cost of sales GL posting could not be inserted");
@@ -152,7 +168,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);
                }
        }
 
@@ -161,8 +177,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();
 
@@ -218,4 +232,4 @@ function void_sales_delivery($type, $type_no, $transactions=true)
        if ($transactions)
                commit_transaction();
 }
-?>
\ No newline at end of file
+