Overhead and labour cost changed to define standard costs.

[fa-stable.git] / inventory / includes / db / items_trans_db.inc

diff --git a/inventory/includes/db/items_trans_db.inc b/inventory/includes/db/items_trans_db.inc
index b1a7f0e8ceb08381d40de9a0b7f4a6ba484dfdc3..58d7722ddb70f1b8c2d23222dd15fa02d451d182 100644 (file)
--- a/inventory/includes/db/items_trans_db.inc
+++ b/inventory/includes/db/items_trans_db.inc
@@ -12,37 +12,32 @@
 //-------------------------------------------------------------------------------------------------------------
 
 function stock_cost_update($stock_id, $material_cost, $labour_cost, $overhead_cost,
-       $last_cost)
+       $last_cost, $refline, $memo_)
 {
        $mb_flag = get_mb_flag($stock_id);
-    
+
        $update_no = -1;
 
     if (is_service($mb_flag))
     {
-       //display_db_error("Cannot do cost update for Service item : $stock_id", "");   
-               
-               //Chaitanya
                $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)."
                WHERE stock_id=".db_escape($stock_id);
-               
+
                db_query($sql,"The cost details for the inventory item could not be updated");
-               
+
                return $update_no;
-               
-    }          
-       
+    }
+
        begin_transaction();
-       
+
        $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost).", 
-               labour_cost=".db_escape($labour_cost).", 
-               overhead_cost=".db_escape($overhead_cost).", 
-               last_cost=".db_escape($last_cost)." 
+               labour_cost=".db_escape($labour_cost).",
+               overhead_cost=".db_escape($overhead_cost)."
                WHERE stock_id=".db_escape($stock_id);
        db_query($sql,"The cost details for the inventory item could not be updated");
 
        $qoh = get_qoh_on_date($stock_id);
-       
+
        $date_ = Today();
        if (!is_date_in_fiscalyear($date_))
                $date_ = end_fiscalyear();
@@ -55,16 +50,20 @@ function stock_cost_update($stock_id, $material_cost, $labour_cost, $overhead_co
 
                if ($value_of_change != 0)
                {
+                       global $Refs;
                        $stock_gl_code = get_stock_gl_code($stock_id);
 
                        $cart = new items_cart(ST_COSTUPDATE);
                        $cart->tran_date = $cart->doc_date = $cart->event_date = $date_;
                        if (!is_date_in_fiscalyear($cart->tran_date))
                                $cart->tran_date = end_fiscalyear();
-                       $cart->reference = $Refs->get_next(ST_COSTUPDATE, null, $cart->tran_date, $date_);
-
-                       $cart->memo_ = sprintf(_("Cost was %s changed to %s x quantity on hand of %s"),
-                               number_format2($last_cost, 2), number_format2($new_cost), $qoh);
+                       $cart->reference = $Refs->get_next(ST_COSTUPDATE, $refline, $cart->tran_date, $date_);
+ 
+                       if (empty($memo_))
+                               $cart->memo_ = sprintf(_("Cost was %s changed to %s x quantity on hand of %s"),
+                                       number_format2($last_cost, 2), number_format2($new_cost), $qoh);
+                       else
+                               $cart->memo_ = $memo_;
 
                        $cart->add_gl_item($stock_gl_code["adjustment_account"],
                                $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], -$value_of_change);
@@ -88,6 +87,6 @@ function change_stock_moves_std_cost($stock_id, $date, $diff_cost)
 {
        $date = date2sql($date);
        $sql = "UPDATE ".TB_PREF."stock_moves SET standard_cost = standard_cost + ".db_escape($diff_cost). " WHERE stock_id = "
-       .       db_escape($stock_id)." AND tran_date <= '$date' AND qty <> 0 AND standard_cost > 0.001 AND type <> ".ST_LOCTRANSFER;
+                       .db_escape($stock_id)." AND tran_date <= '$date' AND qty <> 0 AND standard_cost > 0.001 AND type <> ".ST_LOCTRANSFER;
        db_query($sql,"The stock moves cost details for the inventory item could not be updated");
 }