X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_trans_db.inc;h=c97be95c1861c115c18c512c4d34acfc89cc7c65;hb=07737913eea4abbc7a8604a286852facb2134540;hp=c0dff65cc34613e55d5dc0daa6274e908fb291f6;hpb=f44132511cc91b83f20f91af0625d4b112b4c26e;p=fa-stable.git

diff --git a/inventory/includes/db/items_trans_db.inc b/inventory/includes/db/items_trans_db.inc
index c0dff65c..c97be95c 100644
--- a/inventory/includes/db/items_trans_db.inc
+++ b/inventory/includes/db/items_trans_db.inc
@@ -12,7 +12,7 @@
 //-------------------------------------------------------------------------------------------------------------
 
 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);
 
@@ -20,9 +20,6 @@ function stock_cost_update($stock_id, $material_cost, $labour_cost, $overhead_co
 
     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);
 
@@ -36,7 +33,7 @@ function stock_cost_update($stock_id, $material_cost, $labour_cost, $overhead_co
 	$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)." 
+		last_cost=".db_escape($last_cost)."
 		WHERE stock_id=".db_escape($stock_id);
 	db_query($sql,"The cost details for the inventory item could not be updated");
 
@@ -54,16 +51,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);
@@ -87,6 +88,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");
 }