X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Finventory_db.inc;h=fa465ba7b62f9560f77e9cac2b66410275c33386;hb=7b429726b63cd0ad02c5bd32a344e2764758e31a;hp=5a5dda4b24485f1b58043b445306bad8eef856f4;hpb=2f85dd59adb080270e39d0e52edc8af9a60175b1;p=fa-stable.git

diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc
index 5a5dda4b..fa465ba7 100644
--- a/includes/db/inventory_db.inc
+++ b/includes/db/inventory_db.inc
@@ -166,19 +166,19 @@ function get_deliveries_between($stock_id, $from, $to)
 function get_deliveries_from_trans($stock_id, $from)
 {
 	// -ve qty is delivery either by ST_CUSTDELIVERY or inventory adjustment
-    //Price for GRN and SUPPCREDIT and std_cost for other trans_types
-    $sql = "SELECT SUM(-qty), SUM(-qty*IF(type=".ST_SUPPRECEIVE." OR type=".ST_SUPPCREDIT.", price, standard_cost))
-        FROM ".TB_PREF."stock_moves
-        WHERE stock_id=".db_escape($stock_id)." AND qty < 0 AND
+    //Price for GRN and SUPPCREDIT and std_cost for other trans_types
+    $sql = "SELECT SUM(-qty), SUM(-qty*IF(type=".ST_SUPPRECEIVE." OR type=".ST_SUPPCREDIT.", price, standard_cost))
+        FROM ".TB_PREF."stock_moves
+        WHERE stock_id=".db_escape($stock_id)." AND qty < 0 AND
             trans_id>='$from' GROUP BY stock_id";
 	$result = db_query($sql, "The deliveries could not be updated");
 	$row = db_fetch_row($result);
 	
-    $sql = "SELECT IF(type=".ST_SUPPRECEIVE." OR type=".ST_SUPPCREDIT.", price, standard_cost)
-        FROM ".TB_PREF."stock_moves
-        WHERE stock_id=".db_escape($stock_id)
-            ." AND trans_id ='$from'";
-    $result = db_query($sql, "The deliveries could not be updated");
+    $sql = "SELECT IF(type=".ST_SUPPRECEIVE." OR type=".ST_SUPPCREDIT.", price, standard_cost)
+        FROM ".TB_PREF."stock_moves
+        WHERE stock_id=".db_escape($stock_id)
+            ." AND trans_id ='$from'";
+    $result = db_query($sql, "The deliveries could not be updated");
     $cost = db_fetch_row($result);
 	
 	// Adjusting QOH valuation 
@@ -188,7 +188,7 @@ function get_deliveries_from_trans($stock_id, $from)
 	$result = db_query($sql, "The deliveries could not be updated");
 	$qoh = db_fetch_row($result);
 	
-	$qty = $row[0] - $qoh[0]; //QOH prior to -ve stock is subtracted
+	$qty = $row[0] - $qoh[0]; //QOH prior to -ve stock is subtracted
 	$final_cost = $row[1] - $qoh[0]*$cost[0];
 	
 	return array($qty,$final_cost); 
@@ -248,8 +248,9 @@ function adjust_deliveries($stock_id, $material_cost, $to)
 		$dec = user_price_dec();
 		$old_cost = -round2($old_sales_cost-$old_purchase_cost,$dec);
 		$new_cost = -round2($new_sales_cost-$new_purchase_cost,$dec);
-		
-		$memo_ = _("Cost was ") . $old_cost. _(" changed to ") . $new_cost . _(" for item ")."'$stock_id'";
+
+		$memo_ = sprintf(_("Cost was %s changed to %s x quantity on hand for item '%s'"),
+			number_format2($old_cost, 2), number_format2($new_cost, 2), $stock_id);
 		add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $to, $stock_gl_code["cogs_account"], 
 			$stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], $memo_, $diff);	   
 
@@ -271,10 +272,10 @@ function get_stock_gl_code($stock_id)
 }
 
 //-----------------------------------------------------------------------------------------
-
+
 function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_)
 {
-	//If negative adjustment result in negative or zero inventory 
+	//If negative adjustment result in negative or zero inventory
 	//then difference should be adjusted
 	$qoh = get_qoh_on_date($stock_id);
 
@@ -381,17 +382,16 @@ function get_stock_moves($type, $type_no, $visible=false)
 
 function void_stock_move($type, $type_no)
 {
-   
     $sql = "SELECT * from ".TB_PREF."stock_moves WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
     $result = db_query($sql, "Could not void stock moves");
     while ($row = db_fetch($result))
     {
 		//Skip cost averaging of service items
 		if (is_inventory_item($row["stock_id"]))
-		{        
+		{
 			// The cost has to be adjusted.
-			// Transaction rates are stored either as price or standard_cost depending on types
-			$types = array(ST_SUPPCREDIT);
+			// Transaction rates are stored either as price or standard_cost depending on types
+			$types = array(ST_SUPPCREDIT, ST_SUPPRECEIVE);
 			if (in_array($type,$types))
 				$trans_rate = $row["price"];
 			else
@@ -400,13 +400,11 @@ function void_stock_move($type, $type_no)
 			update_average_material_cost(0, $row["stock_id"],
 				$trans_rate, -$row["qty"], sql2date($row["tran_date"]));
 		}
-		
-		//Post stock move for service items also
-        add_stock_move($type, $row["stock_id"], $type_no, $row["loc_code"],
-    		sql2date($row["tran_date"]), $row["reference"], -$row["qty"]
-			, $row["standard_cost"], $row["person_id"], $row["visible"],
-    		$row["price"], $row["discount_percent"]);
+
     }
+	$sql = "DELETE FROM ".TB_PREF."stock_moves WHERE type=".db_escape($type)
+		."	AND trans_no=".db_escape($type_no);
+	db_query($sql, "The stock movement cannot be delated");
 }
 
 //--------------------------------------------------------------------------------------------------